[C] missing typecast in database.c
20 years
Marcus Crestani
Marcus Crestani
Committed.
--
Marcus
- 1 participants
- 0 comments
[AC] Makefile problem with PDUMP build
20 years
Michael Sperber
Michael Sperber
I've applied this one. Many thanks!
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
- 1 participants
- 0 comments
[PATCH] missing typecast in database.c
20 years
Marcus Crestani
Marcus Crestani
Compiling on FreeBSD 5.2.1 revealed this problem.
src/ChangeLog addition:
2005-03-09 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de>
* database.c (berkdb_map): Add typecasts.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/database.c
Index: src/database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.33
diff -u -r1.33 database.c
--- src/database.c 21 Jan 2005 20:07:06 -0000 1.33
+++ src/database.c 9 Mar 2005 14:36:15 -0000
＠＠ -510,9 +510,9 ＠＠
status == 0;
status = dbp->seq (dbp, &keydatum, &valdatum, R_NEXT))
{
- key = make_ext_string (keydatum.data, keydatum.size,
+ key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size,
db->coding_system);
- val = make_ext_string (valdatum.data, valdatum.size,
+ val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
db->coding_system);
call2 (func, key, val);
}
- 2 participants
- 1 comments
[PATCH] KKCC backtrace
20 years
Marcus Crestani
Marcus Crestani
I added some backtrace functionality to the KKCC mark algorithm. This
simplifies debugging of the gc mark phase.
For example, if an invalid memory description type occurs, a backtrace
like this is printed to stderr:
KKCC mark stack backtrace :
[62] ephemeron (addr: 0x88d4ce0, desc: 0x8281ea0, pos: 2)
[61] hash-table (addr: 0x88d2288, desc: 0x8281f60, pos: 2)
[60] keymap (addr: 0x88d2258, desc: 0x8297b20, pos: 2)
[59] symbol (addr: 0x88ce904, desc: 0x82a5e80, pos: 1)
[58] vector (addr: 0x88d3278, desc: 0x8277640, pos: 3)
[57] compiled-function (addr: 0x88d11a4, desc: 0x827b1e0, pos: 3)
... snip ...
[5] cons (addr: 0x87f79e8, desc: 0x8277520, pos: 0)
[4] cons (addr: 0x87f79f4, desc: 0x8277520, pos: 1)
[3] cons (addr: 0x87f7988, desc: 0x8277520, pos: 0)
[2] cons (addr: 0x87f7994, desc: 0x8277520, pos: 1)
[1] cons (addr: 0x87f79a0, desc: 0x8277520, pos: 4)
[0] symbol (addr: 0x872f3dc, desc: 0x82a5e80, root set)
I'll commit this in a few days, if no one objects.
src/ChangeLog addition:
2005-03-01 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de>
* alloc.c: Add functionality for backtracing the KKCC mark
algorithm.
* alloc.c (kkcc_backtrace): New.
* alloc.c (kkcc_bt_push): New.
* alloc.c (kkcc_gc_stack_push):
* alloc.c (kkcc_gc_stack_push_lisp_object):
* alloc.c (mark_object_maybe_checking_free):
* alloc.c (mark_struct_contents):
* alloc.c (kkcc_marking):
* alloc.c (mark_object):
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* lisp.h:
* profile.c (mark_profiling_info_maphash): Add level (current
depth of mark tree) and pos (position within description) as
additional arguments to KKCC mark functions.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/profile.c src/lisp.h src/elhash.c src/data.c src/alloc.c
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.106
diff -u -r1.106 alloc.c
--- src/alloc.c 3 Feb 2005 16:14:04 -0000 1.106
+++ src/alloc.c 2 Mar 2005 21:58:19 -0000
＠＠ -3091,6 +3091,10 ＠＠
default:
stderr_out ("Unsupported count type : %d (line = %d, code = %ld)\n",
idesc[line].type, line, (long) code);
+#ifdef USE_KKCC
+ if (gc_in_progress)
+ kkcc_backtrace ();
+#endif
#ifdef PDUMP
if (in_pdump)
pdump_backtrace ();
＠＠ -3307,6 +3311,8 ＠＠
{
void *data;
const struct memory_description *desc;
+ int level;
+ int pos;
} kkcc_gc_stack_entry;
static kkcc_gc_stack_entry *kkcc_gc_stack_ptr;
＠＠ -3314,6 +3320,73 ＠＠
static kkcc_gc_stack_entry *kkcc_gc_stack_last_entry;
static int kkcc_gc_stack_size;
+#ifdef ERROR_CHECK_GC
+#define KKCC_BT_STACK_SIZE 4096
+
+static struct
+{
+ void *obj;
+ const struct memory_description *desc;
+ int pos;
+} kkcc_bt[KKCC_BT_STACK_SIZE];
+
+static int kkcc_bt_depth = 0;
+
+#define KKCC_BT_INIT() kkcc_bt_depth = 0;
+
+void
+kkcc_backtrace (void)
+{
+ int i;
+ stderr_out ("KKCC mark stack backtrace :\n");
+ for (i = kkcc_bt_depth - 1; i >= 0; i--)
+ {
+ stderr_out (" [%d]", i);
+ if ((((struct lrecord_header *) kkcc_bt[i].obj)->type
+ >= lrecord_type_free)
+ || (!LRECORDP (kkcc_bt[i].obj))
+ || (!XRECORD_LHEADER_IMPLEMENTATION (kkcc_bt[i].obj)))
+ {
+ stderr_out (" non Lisp Object");
+ }
+ else
+ {
+ stderr_out (" %s",
+ XRECORD_LHEADER_IMPLEMENTATION (kkcc_bt[i].obj)->name);
+ }
+ stderr_out (" (addr: 0x%x, desc: 0x%x, ",
+ (int) kkcc_bt[i].obj,
+ (int) kkcc_bt[i].desc);
+ if (kkcc_bt[i].pos >= 0)
+ stderr_out ("pos: %d)\n", kkcc_bt[i].pos);
+ else
+ stderr_out ("root set)\n");
+ }
+}
+
+static void
+kkcc_bt_push (void *obj, const struct memory_description *desc,
+ int level, int pos)
+{
+ kkcc_bt_depth = level;
+ kkcc_bt[kkcc_bt_depth].obj = obj;
+ kkcc_bt[kkcc_bt_depth].desc = desc;
+ kkcc_bt[kkcc_bt_depth].pos = pos;
+ kkcc_bt_depth++;
+ if (kkcc_bt_depth > KKCC_BT_STACK_SIZE)
+ {
+ stderr_out ("KKCC backtrace overflow, adjust KKCC_BT_STACK_SIZE.\n");
+ stderr_out ("Maybe it is a loop?\n");
+ ABORT ();
+ }
+}
+
+#else /* not ERROR_CHECK_GC */
+#define KKCC_BT_INIT()
+#define kkcc_backtrace()
+#define kkcc_bt_push(obj, desc, level, pos)
+#endif /* not ERROR_CHECK_GC */
+
static void
kkcc_gc_stack_init (void)
{
＠＠ -3359,13 +3432,16 ＠＠
#define KKCC_GC_STACK_EMPTY (kkcc_gc_stack_top < kkcc_gc_stack_ptr)
static void
-kkcc_gc_stack_push (void *data, const struct memory_description *desc)
+kkcc_gc_stack_push (void *data, const struct memory_description *desc,
+ int level, int pos)
{
if (KKCC_GC_STACK_FULL)
kkcc_gc_stack_realloc();
kkcc_gc_stack_top++;
kkcc_gc_stack_top->data = data;
kkcc_gc_stack_top->desc = desc;
+ kkcc_gc_stack_top->level = level;
+ kkcc_gc_stack_top->pos = pos;
}
static kkcc_gc_stack_entry *
＠＠ -3378,7 +3454,7 ＠＠
}
void
-kkcc_gc_stack_push_lisp_object (Lisp_Object obj)
+kkcc_gc_stack_push_lisp_object (Lisp_Object obj, int level, int pos)
{
if (XTYPE (obj) == Lisp_Type_Record)
{
＠＠ -3389,7 +3465,7 ＠＠
if (! MARKED_RECORD_HEADER_P (lheader))
{
MARK_RECORD_HEADER (lheader);
- kkcc_gc_stack_push((void*) lheader, desc);
+ kkcc_gc_stack_push((void*) lheader, desc, level, pos);
}
}
}
＠＠ -3410,14 +3486,15 ＠＠
#ifdef ERROR_CHECK_GC
static void
-mark_object_maybe_checking_free (Lisp_Object obj, int allow_free)
+mark_object_maybe_checking_free (Lisp_Object obj, int allow_free,
+ int level, int pos)
{
KKCC_DO_CHECK_FREE (obj, allow_free);
- kkcc_gc_stack_push_lisp_object (obj);
+ kkcc_gc_stack_push_lisp_object (obj, level, pos);
}
#else
-#define mark_object_maybe_checking_free(obj, allow_free) \
- kkcc_gc_stack_push_lisp_object (obj)
+#define mark_object_maybe_checking_free(obj, allow_free, level, pos) \
+ kkcc_gc_stack_push_lisp_object (obj, level, pos)
#endif /* ERROR_CHECK_GC */
＠＠ -3426,7 +3503,7 ＠＠
static void
mark_struct_contents (const void *data,
const struct sized_memory_description *sdesc,
- int count)
+ int count, int level, int pos)
{
int i;
Bytecount elsize;
＠＠ -3434,7 +3511,8 ＠＠
for (i = 0; i < count; i++)
{
- kkcc_gc_stack_push (((char *) data) + elsize * i,
sdesc->description);
+ kkcc_gc_stack_push (((char *) data) + elsize * i, sdesc->description,
+ level, pos);
}
}
＠＠ -3449,12 +3527,17 ＠＠
kkcc_gc_stack_entry *stack_entry = 0;
void *data = 0;
const struct memory_description *desc = 0;
+ int level = 0;
int pos;
+ KKCC_BT_INIT ();
while ((stack_entry = kkcc_gc_stack_pop ()) != 0)
{
data = stack_entry->data;
desc = stack_entry->desc;
+ level = stack_entry->level + 1;
+
+ kkcc_bt_push (data, desc, stack_entry->level, stack_entry->pos);
for (pos = 0; desc[pos].type != XD_END; pos++)
{
＠＠ -3493,7 +3576,8 ＠＠
if (EQ (*stored_obj, Qnull_pointer))
break;
mark_object_maybe_checking_free
- (*stored_obj, (desc1->flags) & XD_FLAG_FREE_LISP_OBJECT);
+ (*stored_obj, (desc1->flags) & XD_FLAG_FREE_LISP_OBJECT,
+ level, pos);
break;
}
＠＠ -3510,9 +3594,9 ＠＠
if (EQ (*stored_obj, Qnull_pointer))
break;
-
mark_object_maybe_checking_free
- (*stored_obj, (desc1->flags) & XD_FLAG_FREE_LISP_OBJECT);
+ (*stored_obj, (desc1->flags) & XD_FLAG_FREE_LISP_OBJECT,
+ level, pos);
}
break;
}
＠＠ -3524,7 +3608,7 ＠＠
lispdesc_indirect_description (data, desc1->data2.descr);
const char *dobj = * (const char **) rdata;
if (dobj)
- mark_struct_contents (dobj, sdesc, count);
+ mark_struct_contents (dobj, sdesc, count, level, pos);
break;
}
case XD_BLOCK_ARRAY:
＠＠ -3534,7 +3618,7 ＠＠
const struct sized_memory_description *sdesc =
lispdesc_indirect_description (data, desc1->data2.descr);
- mark_struct_contents (rdata, sdesc, count);
+ mark_struct_contents (rdata, sdesc, count, level, pos);
break;
}
case XD_UNION:
＠＠ -3546,6 +3630,7 ＠＠
default:
stderr_out ("Unsupported description type : %d\n", desc1->type);
+ kkcc_backtrace ();
ABORT ();
}
}
＠＠ -4735,7 +4820,7 ＠＠
#ifdef USE_KKCC
/* initialize kkcc stack */
kkcc_gc_stack_init();
-#define mark_object kkcc_gc_stack_push_lisp_object
+#define mark_object(obj) kkcc_gc_stack_push_lisp_object (obj, 0, -1)
#endif /* USE_KKCC */
{ /* staticpro() */
Index: src/data.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/data.c,v
retrieving revision 1.62
diff -u -r1.62 data.c
--- src/data.c 3 Feb 2005 16:14:04 -0000 1.62
+++ src/data.c 2 Mar 2005 21:58:21 -0000
＠＠ -2739,7 +2739,7 ＠＠
if (need_to_mark_elem && ! marked_p (elem))
{
#ifdef USE_KKCC
- kkcc_gc_stack_push_lisp_object (elem);
+ kkcc_gc_stack_push_lisp_object (elem, 0, -1);
#else /* NOT USE_KKCC */
mark_object (elem);
#endif /* NOT USE_KKCC */
＠＠ -2767,7 +2767,7 ＠＠
if (!NILP (rest2) && ! marked_p (rest2))
{
#ifdef USE_KKCC
- kkcc_gc_stack_push_lisp_object (rest2);
+ kkcc_gc_stack_push_lisp_object (rest2, 0, -1);
#else /* NOT USE_KKCC */
mark_object (rest2);
#endif /* NOT USE_KKCC */
＠＠ -3148,7 +3148,7 ＠＠
{
#ifdef USE_KKCC
kkcc_gc_stack_push_lisp_object
- (XCAR (XEPHEMERON (rest)->cons_chain));
+ (XCAR (XEPHEMERON (rest)->cons_chain), 0, -1);
#else /* NOT USE_KKCC */
mark_object (XCAR (XEPHEMERON (rest)->cons_chain));
#endif /* NOT USE_KKCC */
＠＠ -3198,7 +3198,7 ＠＠
MARK_CONS (XCONS (XEPHEMERON (rest)->cons_chain));
#ifdef USE_KKCC
kkcc_gc_stack_push_lisp_object
- (XCAR (XEPHEMERON (rest)->cons_chain));
+ (XCAR (XEPHEMERON (rest)->cons_chain), 0, -1);
#else /* NOT USE_KKCC */
mark_object (XCAR (XEPHEMERON (rest)->cons_chain));
#endif /* NOT USE_KKCC */
Index: src/elhash.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/elhash.c,v
retrieving revision 1.40
diff -u -r1.40 elhash.c
--- src/elhash.c 3 Feb 2005 16:14:05 -0000 1.40
+++ src/elhash.c 2 Mar 2005 21:58:22 -0000
＠＠ -1460,13 +1460,13 ＠＠
/* garbage collecting weak hash tables */
/************************************************************************/
#ifdef USE_KKCC
-#define MARK_OBJ(obj) do { \
- Lisp_Object mo_obj = (obj); \
- if (!marked_p (mo_obj)) \
- { \
- kkcc_gc_stack_push_lisp_object (mo_obj); \
- did_mark = 1; \
- } \
+#define MARK_OBJ(obj) do { \
+ Lisp_Object mo_obj = (obj); \
+ if (!marked_p (mo_obj)) \
+ { \
+ kkcc_gc_stack_push_lisp_object (mo_obj, 0, -1); \
+ did_mark = 1; \
+ } \
} while (0)
#else /* NO USE_KKCC */
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.124
diff -u -r1.124 lisp.h
--- src/lisp.h 3 Feb 2005 16:30:37 -0000 1.124
+++ src/lisp.h 2 Mar 2005 21:58:26 -0000
＠＠ -3585,7 +3585,10 ＠＠
int object_dead_p (Lisp_Object);
void mark_object (Lisp_Object obj);
#ifdef USE_KKCC
-void kkcc_gc_stack_push_lisp_object (Lisp_Object obj);
+void kkcc_gc_stack_push_lisp_object (Lisp_Object obj, int level, int pos);
+#ifdef ERROR_CHECK_GC
+void kkcc_backtrace (void);
+#endif
#endif /* USE_KKCC */
int marked_p (Lisp_Object obj);
extern int funcall_allocation_flag;
Index: src/profile.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/profile.c,v
retrieving revision 1.24
diff -u -r1.24 profile.c
--- src/profile.c 3 Feb 2005 16:14:08 -0000 1.24
+++ src/profile.c 2 Mar 2005 21:58:27 -0000
＠＠ -609,7 +609,7 ＠＠
void *UNUSED (void_closure))
{
#ifdef USE_KKCC
- kkcc_gc_stack_push_lisp_object (VOID_TO_LISP (void_key));
+ kkcc_gc_stack_push_lisp_object (VOID_TO_LISP (void_key), 0, -1);
#else /* NOT USE_KKCC */
mark_object (VOID_TO_LISP (void_key));
#endif /* NOT USE_KKCC */
--
Marcus
- 3 participants
- 6 comments
[PATCH 21.4] Announce re-builder package
20 years
Norbert Koch
Norbert Koch
Hi!
Here's a patch to announce the new re-builder package in 21.4. Vin,
could you please apply it?
Thanks,
norbert.
2005-03-09 Norbert Koch <viteno(a)xemacs.org>
* etc/PACKAGES: Announce re-builder.
Index: PACKAGES
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/Attic/PACKAGES,v
retrieving revision 1.8.4.6
diff -u -u -r1.8.4.6 PACKAGES
--- PACKAGES 2005/02/19 22:01:59 1.8.4.6
+++ PACKAGES 2005/03/09 21:14:03
＠＠ -234,6 +234,9 ＠＠
*** python-modes
Python support.
+*** re-builder
+Interactive development tool for regular expressions.
+
*** reftex
Emacs support for LaTeX cross-references, citations.
- 1 participants
- 0 comments
Re: [PATCH] Re: [Bug: 21.5-b19] kkcc and Mule on solaris 5.8
20 years
Marcus Crestani
Marcus Crestani
Sylvain,
I did some more investigation.
>>>>> SM == Sylvain Mazet writes:
SM> Now I just try to understand how
SM> unsigned char "type"
SM> can work on other platforms.
SM>
SM> with unsigned char "type":
SM> Rune->cursor_type offset 16
SM> Rune->type offset 17
SM> Rune->object offset 20
SM> sizeof(Rune) = 44
SM>
SM> My guess is:
SM>
SM> * (int*) (&Rune->type)
SM>
SM> in lispdesc_indirect_count_1
SM> works on other platforms because all of these:
SM>
SM> - bytes 18-19 of rune are zero.
Thats correct, memory is zeroed at allocation time.
SM> - first byte of "object" member must also be zero (this I dont get).
No it is not. And this leads to an uncorrent count value!
The data looks like this:
offset 16: 1 (the value as it is meant)
offset 17: 0
offset 18: 0
offset 19: 10 (this is the first byte of "object")
In binary this is:
(gdb) x/t irdata
0x8b63885: 00001010000000000000000000000001
Altogether on a little endian machine leads to an int value (offset 16--19):
* (int*) (&Rune->type) ==> 167772161
Later in lispdesc_process_xd_union this wrong count value randomly leads to
the correct result: no variant of the XD_UNION is matched, so nothing is
marked. In this case this is correct, since variant 1 only contains a char,
so this variant has not to be processed.
This should break for variant 2, which contains Lisp_Objects that have to be
marked. Those wouldn't get marked then (at least not through this branch of
the mark tree). Anyways, I couldn't produce this situation, maybe they get
marked by another branch.
So this really is a bug on _all_ systems, not only on sparc.
I don't know why this causes a crash on sparc. Maybe it has problems with
the not aligned integer cast. But this is just a guess. Anyways, it is good
that it did!
SM> - system has to be little endian? (sparc is big endian)
SM>
SM> PS: with unsigned int type, "type" gets aligned:
SM> Rune->cursor_type offset 16
SM> Rune->type offset 20
SM> Rune->object offset 24
SM> sizeof(Rune) = 48
Well, I think this is the tradeoff we have to make here. The struct rune is
going to be 4 bytes bigger than before.
Yesterday I forgot to add a changelog entry to my patch, so here it is
again, this time complete:
src/ChangeLog addition:
2005-03-02 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de>
* redisplay.h (struct rune): make type field an int, to fix
KKCC marking of unions.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/redisplay.h
Index: src/redisplay.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.h,v
retrieving revision 1.22
diff -u -r1.22 redisplay.h
--- src/redisplay.h 26 Jan 2005 10:33:42 -0000 1.22
+++ src/redisplay.h 3 Mar 2005 00:46:19 -0000
＠＠ -144,7 +144,7 ＠＠
unsigned char cursor_type; /* is this rune covered by the cursor? */
- unsigned char type; /* type of rune object */
+ unsigned int type; /* type of rune object */
/* We used to do bitfields here, but if I
(JV) count correctly that doesn't matter
for the size of the structure. All the
bit
--
Marcus
P.S.: Sylvain, please keep the discussion on the list.
- 2 participants
- 2 comments
[PACKAGES (mail-lib)] Support Firefox in browse-url
20 years
Steve Youngs
Steve Youngs
Someone finally succeeded in nagging me into trying Firefox, so here's
an update for browse-url.
mail-lib patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: browse-url.el browse-url-xemacs.el
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v
retrieving revision 1.155
diff -u -p -U0 -r1.155 ChangeLog
--- ChangeLog 28 Feb 2005 21:33:11 -0000 1.155
+++ ChangeLog 9 Mar 2005 00:40:02 -0000
＠＠ -0,0 +1,15 ＠＠
+2005-03-09 Steve Youngs <steve(a)sxemacs.org>
+
+ Support Firefox in browse-url.
+
+ * browse-url.el (browse-url-browser-function): Add firefox.
+ (browse-url-firefox-program): New.
+ (browse-url-firefox-arguments): New.
+ (browse-url-firefox-startup-arguments): New.
+ (browse-url-firefox-new-window-is-tab): New.
+ (browse-url-default-browser): Add firefox.
+ (browse-url-firefox): New.
+ (browse-url-firefox-sentinel): New.
+
+ * browse-url-xemacs.el: Add menu item for Firefox.
+
Index: browse-url-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/browse-url-xemacs.el,v
retrieving revision 1.4
diff -u -p -u -r1.4 browse-url-xemacs.el
--- browse-url-xemacs.el 5 Jan 2003 20:58:58 -0000 1.4
+++ browse-url-xemacs.el 9 Mar 2005 00:39:50 -0000
＠＠ -108,6 +108,13 ＠＠
:selected (eq browse-url-browser-function 'browse-url-mozilla)
:active (and (fboundp 'browse-url-mozilla)
(executable-find browse-url-mozilla-program))]
+ ["%_Firefox"
+ (customize-set-variable 'browse-url-browser-function
+ 'browse-url-firefox)
+ :style radio
+ :selected (eq browse-url-browser-function 'browse-url-firefox)
+ :active (and (fboundp 'browse-url-firefox)
+ (executable-find browse-url-firefox-program))]
["G%_aleon"
(customize-set-variable 'browse-url-browser-function
'browse-url-galeon)
Index: browse-url.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/browse-url.el,v
retrieving revision 1.35
diff -u -p -u -r1.35 browse-url.el
--- browse-url.el 26 Feb 2005 19:09:55 -0000 1.35
+++ browse-url.el 9 Mar 2005 00:39:51 -0000
＠＠ -40,6 +40,7 ＠＠
;; Function Browser Earliest version
;; browse-url-mozilla Mozilla Don't know
+;; browse-url-firefox Firefox Don't know (1st tried with 1.0.1)
;; browse-url-galeon Galeon Don't know
;; browse-url-epiphany Epiphany Don't know
;; browse-url-netscape Netscape 1.1b1
＠＠ -266,6 +267,7 ＠＠ regexp should probably be \".\" to speci
(function-item :tag "W3M in another Emacs via `gnudoit'"
:value browse-url-w3-gnudoit)
(function-item :tag "Mozilla" :value browse-url-mozilla)
+ (function-item :tag "Firefox" :value browse-url-firefox)
(function-item :tag "Galeon" :value browse-url-galeon)
(function-item :tag "Epiphany" :value browse-url-epiphany)
(function-item :tag "Netscape" :value browse-url-netscape)
＠＠ -348,6 +350,24 ＠＠ Defaults to the value of `browse-url-moz
:group 'browse-url)
;;;###autoload
+(defcustom browse-url-firefox-program "firefox"
+ "*The name by which to invoke Firefox."
+:type 'string
+:group 'browse-url)
+
+(defcustom browse-url-firefox-arguments nil
+ "*A list of strings to pass to Firefox as arguments."
+:type '(repeat (string :tag "Argument"))
+:group 'browse-url)
+
+(defcustom browse-url-firefox-startup-arguments browse-url-firefox-arguments
+ "*A list of strings to pass to Firefox when it starts up.
+Defaults to the value of `browse-url-firefox-arguments' at the time
+`browse-url' is loaded."
+:type '(repeat (string :tag "Argument"))
+:group 'browse-url)
+
+;;;###autoload
(defcustom browse-url-galeon-program "galeon"
"*The name by which to invoke Galeon."
:type 'string
＠＠ -389,6 +409,13 ＠＠ If non-nil, then open the URL in a new t
:type 'boolean
:group 'browse-url)
+(defcustom browse-url-firefox-new-window-is-tab nil
+ "*Whether to open up new windows in a tab or a new window.
+If non-nil, then open the URL in a new tab rather than a new window if
+`browse-url-firefox' is asked to open it in a new window."
+:type 'boolean
+:group 'browse-url)
+
(defcustom browse-url-galeon-new-window-is-tab nil
"*Whether to open up new windows in a tab or a new window.
If non-nil, then open the URL in a new tab rather than a new window if
＠＠ -840,13 +867,14 ＠＠ the effect of `browse-url-new-window-fla
When called non-interactively, optional second argument NEW-WINDOW is
used instead of `browse-url-new-window-flag'.
-The order attempted is emacs-w3m, gnome-moz-remote, Mozilla, Galeon,
-Konqueror, Netscape, Opera, Mosaic, IXI Mosaic, Lynx in an xterm, MMM,
-and then W3."
+The order attempted is emacs-w3m, gnome-moz-remote, Mozilla, Firefox,
+Galeon, Konqueror, Netscape, Opera, Mosaic, IXI Mosaic, Lynx in an
+xterm, MMM, and then W3."
(apply
(cond
((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
+ ((executable-find browse-url-firefox-program) 'browse-url-firefox)
((executable-find browse-url-galeon-program) 'browse-url-galeon)
((executable-find browse-url-kde-program) 'browse-url-kde)
((executable-find browse-url-netscape-program) 'browse-url-netscape)
＠＠ -995,6 +1023,69 ＠＠ requested URL in a new window."
(apply 'start-process (concat "mozilla " url) nil
browse-url-mozilla-program
(append browse-url-mozilla-startup-arguments (list url))))))
+
+;;;###autoload
+(defun browse-url-firefox (url &optional new-window)
+ "Ask the Firefox WWW browser to load URL.
+Default to the URL around or before point. The strings in variable
+`browse-url-firefox-arguments' are also passed to Firefox.
+
+When called interactively, if variable `browse-url-new-window-flag' is
+non-nil, load the document in a new Firefox window, otherwise use a
+random existing one. A non-nil interactive prefix argument reverses
+the effect of `browse-url-new-window-flag'.
+
+If `browse-url-firefox-new-window-is-tab' is non-nil, then whenever a
+document would otherwise be loaded in a new window, it is loaded in a
+new tab in an existing window instead.
+
+When called non-interactively, optional second argument NEW-WINDOW is
+used instead of `browse-url-new-window-flag'.
+
+On MS-Windows systems the optional `new-window' parameter is ignored.
+Firefox for Windows does not support the \"-remote\" command line
+parameter. Therefore the `browse-url-new-window-flag',
+`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab'
+are ignored as well. Firefox on Windows will always open the
+requested URL in a new window."
+ (interactive (browse-url-interactive-arg "URL: "))
+ ;; URL encode any `confusing' characters in the URL. This needs to
+ ;; include at least commas; presumably also close parens.
+ (while (string-match "[,)]" url)
+ (setq url (replace-match
+ (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
+ (let* ((process-environment (browse-url-process-environment))
+ (process
+ (apply 'start-process
+ (concat "firefox " url) nil
+ browse-url-firefox-program
+ (append
+ browse-url-firefox-arguments
+ (if (or (featurep 'dos-w32)
+ (string-match "win32" system-configuration))
+ (list url)
+ (list "-remote"
+ (concat "openURL("
+ url
+ (if (browse-url-maybe-new-window
+ new-window)
+ (if browse-url-firefox-new-window-is-tab
+ ",new-tab"
+ ",new-window"))
+ ")")))))))
+ (set-process-sentinel process
+ `(lambda (process change)
+ (browse-url-firefox-sentinel process ,url)))))
+
+(defun browse-url-firefox-sentinel (process url)
+ "Handle a change to the process communicating with Firefox."
+ (or (eq (process-exit-status process) 0)
+ (let* ((process-environment (browse-url-process-environment)))
+ ;; Firefox is not running - start it
+ (message "Starting Firefox...")
+ (apply 'start-process (concat "firefox " url) nil
+ browse-url-firefox-program
+ (append browse-url-firefox-startup-arguments (list url))))))
;;;###autoload
(defun browse-url-galeon (url &optional new-window)
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| I am Dyslexic of Borg. |
| Fusistance is retile. Your arse will be laminated. |
|------------------------------------<steve(a)sxemacs.org>---|
- 2 participants
- 1 comments
[AC sjt-xft] Try to fix truename_via_XListFonts crash again
20 years
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT sjt-xft
The code involved is still pretty horrible, I don't understand it.
But the crash went away for me, at least for now.
Also fix a stupid typo in xlwtabs.c.
Index: lwlib/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.64.2.7
diff -u -U0 -r1.64.2.7 ChangeLog
--- lwlib/ChangeLog 9 Mar 2005 06:31:09 -0000 1.64.2.7
+++ lwlib/ChangeLog 9 Mar 2005 09:27:23 -0000
＠＠ -0,0 +1,4 ＠＠
+2005-03-09 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * xlwtabs.c (TabsGeometryManager): Fix "fat fingers" mistake.
+
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.17
diff -u -U0 -r1.758.2.17 ChangeLog
--- src/ChangeLog 9 Mar 2005 06:31:22 -0000 1.758.2.17
+++ src/ChangeLog 9 Mar 2005 09:27:28 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-03-09 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x.c (x_font_instance_truename): Try to fix XListFonts
+ crash by not hand random Xft results to core Xlib functions.
+
Index: lwlib/xlwtabs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v
retrieving revision 1.4.2.9
diff -u -r1.4.2.9 xlwtabs.c
--- lwlib/xlwtabs.c 9 Mar 2005 06:31:10 -0000 1.4.2.9
+++ lwlib/xlwtabs.c 9 Mar 2005 09:27:40 -0000
＠＠ -1143,7 +1143,7 ＠＠
~((reply->border_width == tab->core.border_width
? CWBorderWidth : 0)
|(reply->width == tab->core.width ? CWWidth : 0)
- |(reply->height == tab->core.height ? CWHeight : 0))
+ |(reply->height == tab->core.height ? CWHeight : 0));
return XtGeometryAlmost ;
}
Index: src/objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.26.2.11
diff -u -r1.26.2.11 objects-x.c
--- src/objects-x.c 9 Mar 2005 06:31:42 -0000 1.26.2.11
+++ src/objects-x.c 9 Mar 2005 09:27:40 -0000
＠＠ -711,7 +711,6 ＠＠
return Qnil;
}
-/* #### The logic in this function seems fxxked. */
static Lisp_Object
x_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb)
{
＠＠ -725,14 +724,17 ＠＠
#ifdef USE_XFT
/* First, try an Xft font. */
- if (NILP (FONT_INSTANCE_TRUENAME (f)))
+ if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_XFTFONT (f))
{
int core;
FcPattern *pat = FONT_INSTANCE_X_XFTFONT (f)->pattern;
FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &fcfont);
FcResult res_core = FcPatternGetBool (pat, XFT_CORE, 0, &core);
- if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch)
+ /* #### boy this is broken!! FIXME!!
+ Probably only makes sense in Xft v1. */
+ if (res_xlfd == FcResultNoMatch || res_core == FcResultNoMatch || !core)
+ /* #### should we test fcfont for something here? if so, what? */
{
/* we've got an Xft font! */
FcChar8 *res = FcNameUnparse (pat);
＠＠ -749,20 +751,35 ＠＠
return FONT_INSTANCE_TRUENAME (f);
}
else
- { /* Now we're f.... */
+ {
maybe_signal_error (Qgui_error,
- "Couldn't determine font truename",
+ "Couldn't unparse Xft font to truename",
Qnil, Qfont, errb);
- return Qnil;
+ /* used to return Qnil here */
}
}
- else
+ else if (res_xlfd == FcResultMatch && res_core == FcResultMatch)
{
- /* #### Why isn't this appropriate for core fonts, too? */
FONT_INSTANCE_TRUENAME (f) =
build_ext_string (truename_via_XListFonts (dpy,
(Extbyte *) &fcfont[0]),
Qx_font_name_encoding);
+ return FONT_INSTANCE_TRUENAME (f);
+ }
+ else if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch)
+ { /* Now we're f.... */
+ maybe_signal_error (Qgui_error,
+ "Xft TypeMismatch while determining font truename",
+ Qnil, Qfont, errb);
+ /* used to return Qnil here */
+ }
+ /* we shouldn't have to worry about FcResultNoId */
+ else
+ { /* Now we're f.... */
+ maybe_signal_error (Qgui_error,
+ "Xft bogus status while determining font truename",
+ Qnil, Qfont, errb);
+ /* used to return Qnil here */
}
}
#endif
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 1 participants
- 0 comments
[AC sjt-xft] stop tab geometry thrashing; avoid access to uninitialized FONT_INSTANCE_X_FONT
20 years
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT sjt-xft
For the lwlib parts of the patch, see my recent "stop tab geometry
thrashing" for 21.5.
With the current Xft patch, core X fonts and Xft fonts must coexist to
some extent (because not all widgets can handle Xft fonts yet).
G. Boffi reports a crash where an uninitialized XFontStruct causes X
to segfault. This patch should fix that (but it's untested for that).
A patch to do the same thing for Xft fonts is forthcoming, but this is
not critical because Xft fonts should almost never fail to be
initialized (fontconfig almost always returns _something_).
There are a couple of minor improvements in geometry calculations in
object-x.c, and some variable renamings (a couple of XFontStructs have
been renamed to "fs" for consistency with usage elsewhere).
Index: lwlib/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.64.2.6
diff -u -r1.64.2.6 ChangeLog
--- lwlib/ChangeLog 7 Mar 2005 02:25:54 -0000 1.64.2.6
+++ lwlib/ChangeLog 9 Mar 2005 01:03:11 -0000
＠＠ -0,0 +1,6 ＠＠
+2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * lwlib-Xlw.c (build_tabs_in_widget): Correctly disable geometry
+ negotiation for tab children.
+ (xlw_create_tab_control): Don't set nonexistent resizable resource.
+
Index: lwlib/lwlib-Xlw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xlw.c,v
retrieving revision 1.13
diff -u -r1.13 lwlib-Xlw.c
--- lwlib/lwlib-Xlw.c 20 Sep 2004 19:19:16 -0000 1.13
+++ lwlib/lwlib-Xlw.c 9 Mar 2005 01:03:11 -0000
＠＠ -319,13 +319,21 ＠＠
#ifdef LWLIB_TABS_LUCID
/* tab control
- lwlib is such an incredible hairy crock. I just cannot believe
+ [[ lwlib is such an incredible hairy crock. I just cannot believe
it! There are random dependencies between functions, there is a
total lack of genericity, even though it initially appears to be
generic. It should all be junked and begun again. Building tabs are
an example - in theory we should be able to reuse a lot of the
general stuff because we want to put labels of whatever toolkit we
- are using in the tab. Instead we have to hack it by hand. */
+ are using in the tab. Instead we have to hack it by hand. ]]
+ While lwlib is a hairy crock, whoever wrote that seems to misunderstand
+ Falk's tab control widget. The tab control widget has *two* kinds of
+ children: *widgets*, which all occupy a *single* pane below the row of
+ tabs---this is where the labels created in build_tabs_in_widget go, and
+ *gadgets*, the tabs themselves, which do *not* draw themselves, but
+ rather are drawn by the control. In fact, in XEmacs the true widget
+ children are *never* visible! So this case is not a problem in the
+ design of lwlib, but rather of Falk's widget. -- sjt */
static void
xlw_tab_control_callback (Widget w, XtPointer client_data, XtPointer call_data)
{
＠＠ -375,9 +383,8 ＠＠
widget_value* val = instance->info->val;
XtSetArg (al [ac], XtNsensitive, val->enabled); ac++;
- XtSetArg (al [ac], XtNmappedWhenManaged, FALSE); ac++;
+ XtSetArg (al [ac], XtNmappedWhenManaged, False); ac++;
XtSetArg (al [ac], XtNorientation, XtorientHorizontal); ac++;
- XtSetArg (al [ac], XtNresizable, False); ac++;
/* add any args the user supplied for creation time */
lw_add_value_args_to_args (val, al, &ac);
＠＠ -396,15 +403,22 ＠＠
Widget widget, widget_value* val)
{
widget_value* cur = val;
+ Arg al[1];
+
+ /* Children are always invisible, don't permit resizing. */
+ XtSetArg (al[0], XtNresizable, False);
+
for (cur = val; cur; cur = cur->next)
{
if (cur->value)
{
+ Widget w;
#ifdef LWLIB_WIDGETS_MOTIF
- xm_create_label (widget, cur);
+ w = xm_create_label (widget, cur);
#else
- xaw_create_label (widget, cur);
+ w = xaw_create_label (widget, cur);
#endif
+ XtSetValues (w, al, 1);
}
cur->change = NO_CHANGE;
}
＠＠ -465,8 +479,8 ＠＠
Widget clip = 0;
widget_value* val = instance->info->val;
- XtSetArg (al [ac], XtNmappedWhenManaged, FALSE); ac++;
- XtSetArg (al [ac], XtNsensitive, TRUE); ac++;
+ XtSetArg (al [ac], XtNmappedWhenManaged, False); ac++;
+ XtSetArg (al [ac], XtNsensitive, True); ac++;
/* add any args the user supplied for creation time */
lw_add_value_args_to_args (val, al, &ac);
Index: lwlib/xlwtabs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v
retrieving revision 1.4.2.8
diff -u -r1.4.2.8 xlwtabs.c
--- lwlib/xlwtabs.c 7 Mar 2005 02:25:54 -0000 1.4.2.8
+++ lwlib/xlwtabs.c 9 Mar 2005 01:03:12 -0000
＠＠ -909,10 +909,12 ＠＠
static int debug_mask = 1;
/* Position request cannot be satisfied, so if tabs are not resizable,
- no request can be satisfied: return XGeometryNo. */
+ no nontrivial request can be satisfied: return XGeometryNo. */
if (!constraint->tabs.resizable)
return XtGeometryNo;
+ fprintf (stderr, "Urk! label is resizable!\n");
+
/* Assume we will refuse these; toggle iff we accept them.
Reply won't specify any fields not in the request. */
reply->request_mode = request->request_mode;
＠＠ -943,7 +945,10 ＠＠
reply->width == tab->core.width &&
reply->height == tab->core.height &&
reply->border_width == tab->core.border_width)
- return best_offer;
+ {
+ reply->request_mode &= ~(CWWidth | CWHeight | CWBorderWidth);
+ return best_offer;
+ }
#ifndef DONT_DEBUG_REQUESTS
#define DBG_REQUEST_PRINT(name,field,size) \
＠＠ -1131,9 +1136,14 ＠＠
/* Cannot grant child's request. Describe what we *can* do
* and return counter-offer.
*/
+ control->tabs.needs_layout = False;
reply->width = aw - 2 * request->border_width ;
reply->height = ah - 2 * request->border_width ;
- control->tabs.needs_layout = False;
+ reply->request_mode &=
+ ~((reply->border_width == tab->core.border_width
+ ? CWBorderWidth : 0)
+ |(reply->width == tab->core.width ? CWWidth : 0)
+ |(reply->height == tab->core.height ? CWHeight : 0))
return XtGeometryAlmost ;
}
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.16
diff -u -r1.758.2.16 ChangeLog
--- src/ChangeLog 5 Mar 2005 18:09:25 -0000 1.758.2.16
+++ src/ChangeLog 9 Mar 2005 01:03:27 -0000
＠＠ -1,3 +1,16 ＠＠
+2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x-impl.h: Include lwlib-fonts.h
+
+ * objects-x.c (x_font_instance_truename):
+ * glyphs-x.c (update_widget_face):
+ * frame-x.c (x_update_frame_external_traits):
+ Use the correct variant of FONT_INSTANCE_{X,XFT}_FONT.
+ Protect against access of uninitialized objects.
+
+ * redisplay-x.c (x_get_gc): Fix typo.
+ * (x_output_string): Add comments, clarify logic slightly.
+
2005-03-05 Stephen J. Turnbull <stephen(a)xemacs.org>
Refactor language/charset checking in Xft.
Index: src/frame-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v
retrieving revision 1.68.2.3
diff -u -r1.68.2.3 frame-x.c
--- src/frame-x.c 5 Mar 2005 18:09:28 -0000 1.68.2.3
+++ src/frame-x.c 9 Mar 2005 01:03:28 -0000
＠＠ -2674,17 +2674,30 ＠＠
}
else if (EQ (name, Qfont))
{
- /* #### what to do about Xft? It looks like the font is used to
- compute cell size for computing frame pixel dimensions (see call
- to EmacsFrameRecomputeCellSize() below); maybe we should make
- those directly members of the frame, not the font itself. -- sjt */
Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii);
+ /* #### what to do about Xft? I don't think the font is actually used
+ to compute cell size for computing frame pixel dimensions (see call
+ to EmacsFrameRecomputeCellSize() below); where is it used? -- sjt
+ What does XtSetValues() do if that resource isn't present? */
if (!EQ (font, Vthe_null_font_instance))
{
- XtSetArg (al[ac], XtNfont,
- (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)));
- ac++;
+ if (0)
+ ;
+#ifdef USE_XFT
+ else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)))
+ {
+ XtSetArg (al[ac], XtNxftFont,
+ (void *) FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)));
+ ac++;
+ }
+#endif
+ else if (FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)))
+ {
+ XtSetArg (al[ac], XtNfont,
+ (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)));
+ ac++;
+ }
}
}
else
Index: src/glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.80.2.4
diff -u -r1.80.2.4 glyphs-x.c
--- src/glyphs-x.c 1 Feb 2005 15:46:55 -0000 1.80.2.4
+++ src/glyphs-x.c 9 Mar 2005 01:03:29 -0000
＠＠ -2326,21 +2326,33 ＠＠
lw_add_widget_value_arg (wv, XtNbackground, bcolor.pixel);
{
- /* #### What to do about Xft? */
Lisp_Object face = IMAGE_INSTANCE_WIDGET_FACE (ii);
- XFontStruct *fs =
- FONT_INSTANCE_X_FONT (XFONT_INSTANCE (query_string_font
- (IMAGE_INSTANCE_WIDGET_TEXT (ii),
- face,
- domain)));
-#ifdef LWLIB_WIDGETS_MOTIF
- fontList = XmFontListCreate (fs, XmSTRING_DEFAULT_CHARSET);
- lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal)fontList);
+ Lisp_Font_Instance *fi =
+ XFONT_INSTANCE (query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (ii),
+ face,
+ domain));
+ XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
+#ifdef USE_XFT
+ XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi);
+
+ if (rf)
+ {
+ /* #### What to do about Motif? */
+ lw_add_widget_value_arg (wv, XtNxftFont, (XtArgVal) rf);
+ }
#endif
- /* #### This is an unacceptable hack. */
+
if (fs)
- lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
- else
+ {
+#ifdef LWLIB_WIDGETS_MOTIF
+ fontList = XmFontListCreate (fs, XmSTRING_DEFAULT_CHARSET);
+ lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal) fontList);
+#endif
+ lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
+ }
+
+ /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
+ if (!rf && !fs)
warn_when_safe_lispobj
(intern ("xft"), Qdebug,
Fcons (build_string ("missing font in update_widget_face"),
Index: src/objects-x-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x-impl.h,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 objects-x-impl.h
--- src/objects-x-impl.h 25 Nov 2004 12:44:15 -0000 1.1.6.1
+++ src/objects-x-impl.h 9 Mar 2005 01:03:29 -0000
＠＠ -29,6 +29,10 ＠＠
#include "objects-impl.h"
#include "objects-x.h"
+#ifdef USE_XFT
+/* for resource name definitions, etc */
+#include "../lwlib/lwlib-fonts.h"
+#endif
#ifdef HAVE_X_WINDOWS
Index: src/objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.26.2.10
diff -u -r1.26.2.10 objects-x.c
--- src/objects-x.c 5 Mar 2005 18:09:29 -0000 1.26.2.10
+++ src/objects-x.c 9 Mar 2005 01:03:29 -0000
＠＠ -237,12 +237,11 ＠＠
{
/* yes, this has been known to happen. */
XFreeFont (dpy, fs);
+ fs = NULL;
maybe_signal_error (Qgui_error, "X font is too small", f->name, Qfont,
errb);
if (!rf)
return 0;
- else
- fs = NULL;
}
/* Now that we're sure that we will succeed, we can allocate data without
＠＠ -274,17 +273,17 ＠＠
XftTextExtents8 (dpy, rf, test_string8, len, &glyphinfo);
/* #### maybe should be glyphinfo.xOff - glyphinfo.x? */
- f->width = glyphinfo.width/len + 1;
+ f->width = (2*glyphinfo.width + len)/(2*len);
}
f->height = rf->height;
- /* #### Is this right? See comment on proportional_p below. */
- f->proportional_p = 1; /* we can't recognize monospaced fonts! */
+ f->proportional_p = 1; /* we can't recognize monospaced fonts! */
if (debug_xft > 0)
stderr_out ("initialized metrics ascent %d descent %d width %d height %d\n",
f->ascent, f->descent, f->width, f->height);
if (debug_xft > 2) /* we also output on initialization of any font below */
stderr_out ("initialized Xft font %s\n", extname);
+ fs = NULL; /* we don' need no steenkin' X font */
}
else
{
＠＠ -294,7 +293,7 ＠＠
#endif
FONT_INSTANCE_X_FONT (f) = fs;
- if (fs && !rf) /* fs && rf is unlikely, but play it safe */
+ if (fs)
/* Have to use a core font, initialize font info from it. */
{
f->ascent = fs->ascent;
＠＠ -769,7 +768,8 ＠＠
#endif
/* OK, fall back to core font. */
- if (NILP (FONT_INSTANCE_TRUENAME (f)))
+ if (NILP (FONT_INSTANCE_TRUENAME (f))
+ && FONT_INSTANCE_X_FONT (f))
{
nameext = &xlfd[0];
LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding);
Index: src/redisplay-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v
retrieving revision 1.39.2.3
diff -u -r1.39.2.3 redisplay-x.c
--- src/redisplay-x.c 1 Feb 2005 15:46:57 -0000 1.39.2.3
+++ src/redisplay-x.c 9 Mar 2005 01:03:30 -0000
＠＠ -800,7 +800,7 ＠＠
/* evil kludge! */
if (!NILP (fg) && !COLOR_INSTANCEP (fg) && !INTP (fg))
{
- /* #### I fixed once case where this was getting it. It was a
+ /* #### I fixed one case where this was getting hit. It was a
bad macro expansion (compiler bug). */
stderr_out ("Help! x_get_gc got a bogus fg value! fg = ");
debug_print (fg);
＠＠ -931,7 +931,8 ＠＠
int i;
struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
- int use_x_font = 1;
+ int use_x_font = 1; /* #### bogus!!
+ The logic of this function needs review! */
#ifdef USE_XFT
Colormap cmap = DEVICE_X_COLORMAP (d);
Visual *visual = DEVICE_X_VISUAL (d);
＠＠ -1214,19 +1215,18 ＠＠
{
int upos, uthick;
unsigned long upos_ext, uthick_ext;
- XFontStruct *xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
+ XFontStruct *fs =
+ use_x_font ? FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)) : 0;
/* #### the logic of the next two may be suboptimal: we may want
to use the POSITION and/or THICKNESS information with Xft */
- if (!use_x_font
- || !XGetFontProperty (xfont, XA_UNDERLINE_POSITION, &upos_ext))
- upos = dl->descent / 2;
- else
+ if (fs && XGetFontProperty (fs, XA_UNDERLINE_POSITION, &upos_ext))
upos = (int) upos_ext;
- if (!use_x_font
- || !XGetFontProperty (xfont, XA_UNDERLINE_THICKNESS, &uthick_ext))
- uthick = 1;
else
+ upos = dl->descent / 2;
+ if (fs && XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext))
uthick = (int) uthick_ext;
+ else
+ uthick = 1;
if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip)
{
if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip)
＠＠ -1249,7 +1249,7 ＠＠
{
int ascent, descent, upos, uthick;
unsigned long ascent_ext, descent_ext, uthick_ext;
- XFontStruct *xf = FONT_INSTANCE_X_FONT (fi);
+ XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
if (!use_x_font)
{
＠＠ -1259,15 +1259,15 ＠＠
}
else
{
- if (!XGetFontProperty (xf, XA_STRIKEOUT_ASCENT, &ascent_ext))
- ascent = xf->ascent;
+ if (!XGetFontProperty (fs, XA_STRIKEOUT_ASCENT, &ascent_ext))
+ ascent = fs->ascent;
else
ascent = (int) ascent_ext;
- if (!XGetFontProperty (xf, XA_STRIKEOUT_DESCENT, &descent_ext))
- descent = xf->descent;
+ if (!XGetFontProperty (fs, XA_STRIKEOUT_DESCENT, &descent_ext))
+ descent = fs->descent;
else
descent = (int
- 1 participants
- 0 comments