Mercurial > hg > xemacs-beta

diff src/redisplay-xlike-inc.c @ 5237:6466bc9ebf15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* console-x-impl.h (DEVICE_X_XFTDRAW): Define, instead of FRAME_X_FTDRAW. (struct x_device): Add XftDraw field. (struct x_frame): Remove XftDraw field. Move XftDraw from frame to device for improved caching. * device-x.c (x_delete_device): Free XftDraw here. * frame-x.c (x_delete_frame): Remove freeing of XftDraw. * redisplay-xlike-inc.c (XLIKE_output_string): Use DEVICE_X_XFTDRAW instead of FRAME_X_XFTDRAW when lazily creating XftDraw structure.
author Jeff Sparkes <jsparkes@gmail.com>
date Wed, 23 Jun 2010 08:04:18 -0400
parents bc3ede8f29a8
children f19e6bc25969
line wrap: on
line diff
--- a/src/redisplay-xlike-inc.c	Sun Jun 13 23:54:13 2010 +0900
+++ b/src/redisplay-xlike-inc.c	Wed Jun 23 08:04:18 2010 -0400
@@ -1028,10 +1028,10 @@
   XftDraw *xftDraw;
 
   /* Lazily initialize frame's xftDraw member. */
-  if (!FRAME_X_XFTDRAW (f)) {
-    FRAME_X_XFTDRAW (f) = XftDrawCreate (dpy, x_win, visual, cmap);
+  if (!DEVICE_X_XFTDRAW (d)) {
+    DEVICE_X_XFTDRAW (d) = XftDrawCreate (dpy, x_win, visual, cmap);
   }
-  xftDraw = FRAME_X_XFTDRAW (f);
+  xftDraw = DEVICE_X_XFTDRAW (d);
 
   /* #### This will probably cause asserts when passed a Lisp integer for a
      color.  See ca. line 759 this file.