2003-10-24  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=124513
	* main.c (setup_font_sample) : merge in patch to allocate black and
	  white correctly on TruColor displays.
This commit is contained in:
Jody Goldberg 2003-10-28 20:46:08 +00:00 committed by Jody Goldberg
parent 3c9f4ea6ed
commit 6d257e030e
3 changed files with 20 additions and 2 deletions

1
NEWS
View file

@ -5,6 +5,7 @@ Jody:
xkb-properties-capplet
* http://bugzilla.gnome.org/show_bug.cgi?id=120842 [HIGification broke accessx]
* http://bugzilla.gnome.org/show_bug.cgi?id=106489 [protect against gconf failure]
* http://bugzilla.gnome.org/show_bug.cgi?id=124513 [Handle TruColor Displays]
------------------------------------------------------------------------------

View file

@ -1,3 +1,9 @@
2003-10-24 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=124513
* main.c (setup_font_sample) : merge in patch to allocate black and
white correctly on TruColor displays.
2003-10-23 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=106489

View file

@ -202,8 +202,8 @@ setup_font_sample (GtkWidget *darea,
const char *string1 = "abcfgop AO ";
const char *string2 = "abcfgop";
XftColor black = { 0, { 0, 0, 0, 0xffff } };
XftColor white = { 0, { 0xffff, 0xffff, 0xffff, 0xffff } };
XftColor black, white;
XRenderColor rendcolor;
Display *xdisplay = gdk_x11_get_default_xdisplay ();
@ -265,6 +265,17 @@ setup_font_sample (GtkWidget *darea,
draw = XftDrawCreate (xdisplay, GDK_DRAWABLE_XID (pixmap), xvisual, xcolormap);
rendcolor.red = 0;
rendcolor.green = 0;
rendcolor.blue = 0;
rendcolor.alpha = 0xffff;
XftColorAllocValue (xdisplay, xvisual, xcolormap, &rendcolor, &black);
rendcolor.red = 0xffff;
rendcolor.green = 0xffff;
rendcolor.blue = 0xffff;
rendcolor.alpha = 0xffff;
XftColorAllocValue (xdisplay, xvisual, xcolormap, &rendcolor, &white);
XftDrawRect (draw, &white, 0, 0, width, height);
if (font1)
XftDrawStringUtf8 (draw, &black, font1,