2006-01-19 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkprivate-x11.h (XID_FONT_BIT):
* gdk/x11/gdkfont-x11.c:
* gdk/x11/gdkxid.c: Use an unused high bit in the
XID to mark fonts in the global xid hash table.
* gdk/x11/gdkcursor-x11.c (update_cursor): Skip fonts
when iterating over the xid hash table, since calling
GDK_IS_WINDOW () on an GdkFont can cause a segfault.
(#327751, Ryan Lortie)
gpointer value,
gpointer data)
{
gpointer value,
gpointer data)
{
+ if (*xid & XID_FONT_BIT)
+ return;
+
if (!GDK_IS_WINDOW (value))
return;
if (!GDK_IS_WINDOW (value))
return;
GdkDisplay *display;
GSList *names;
GdkDisplay *display;
GSList *names;
private->xfont = xfont;
private->base.ref_count = 1;
private->names = NULL;
private->xfont = xfont;
private->base.ref_count = 1;
private->names = NULL;
+ private->xid = xfont->fid | XID_FONT_BIT;
font = (GdkFont*) private;
font->type = GDK_FONT_FONT;
font->ascent = xfont->ascent;
font->descent = xfont->descent;
font = (GdkFont*) private;
font->type = GDK_FONT_FONT;
font->ascent = xfont->ascent;
font->descent = xfont->descent;
- _gdk_xid_table_insert (display, &xfont->fid, font);
+ _gdk_xid_table_insert (display, &private->xid, font);
}
gdk_font_hash_insert (GDK_FONT_FONT, font, font_name);
}
gdk_font_hash_insert (GDK_FONT_FONT, font, font_name);
+#define XID_FONT_BIT (1<<31)
+
void _gdk_xid_table_insert (GdkDisplay *display,
XID *xid,
gpointer data);
void _gdk_xid_table_insert (GdkDisplay *display,
XID *xid,
gpointer data);
+/* The 3 high bits of XIDs are unused. We use one to mark fonts,
+ * since we must be able to skip fonts when iterating over all XIDs.
+ */
+#define XID_FONT_BIT (1<<31)
+
void
_gdk_xid_table_insert (GdkDisplay *display,
XID *xid,
void
_gdk_xid_table_insert (GdkDisplay *display,
XID *xid,
gdk_xid_equal (XID *a,
XID *b)
{
gdk_xid_equal (XID *a,
XID *b)
{
+ return ((*a & ~XID_FONT_BIT) == (*b & ~XID_FONT_BIT));