merge from trunk

[gnu-emacs] / src / xftfont.c

diff --git a/src/xftfont.c b/src/xftfont.c
index 404b912409959a1268b5e16b553e61d45134c2d4..f2b4c2abe2bcdfd511fa83a14aa0f6356f60a25a 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -1,5 +1,5 @@
 /* xftfont.c -- XFT font driver.
 /* xftfont.c -- XFT font driver.

-   Copyright (C) 2006-2012 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.

    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009


@@ -21,7 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
 
 #include <config.h>
 #include <stdio.h>

-#include <setjmp.h>

 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 


@@ -71,7 +70,7 @@ struct xftface_info
   XftColor xft_bg;             /* color for face->background */
 };
 
   XftColor xft_bg;             /* color for face->background */
 };
 

-static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc,
+static void xftfont_get_colors (struct frame *, struct face *, GC gc,

                                 struct xftface_info *,
                                 XftColor *fg, XftColor *bg);
 
                                 struct xftface_info *,
                                 XftColor *fg, XftColor *bg);
 


@@ -81,7 +80,9 @@ static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc,
    may be NULL.  */
 
 static void
    may be NULL.  */
 
 static void

-xftfont_get_colors (FRAME_PTR f, struct face *face, GC gc, struct xftface_info *xftface_info, XftColor *fg, XftColor *bg)
+xftfont_get_colors (struct frame *f, struct face *face, GC gc,
+                   struct xftface_info *xftface_info,
+                   XftColor *fg, XftColor *bg)

 {
   if (xftface_info && face->gc == gc)
     {
 {
   if (xftface_info && face->gc == gc)
     {


@@ -94,7 +95,7 @@ xftfont_get_colors (FRAME_PTR f, struct face *face, GC gc, struct xftface_info *
       XGCValues xgcv;
       bool fg_done = 0, bg_done = 0;
 
       XGCValues xgcv;
       bool fg_done = 0, bg_done = 0;
 

-      BLOCK_INPUT;
+      block_input ();

       XGetGCValues (FRAME_X_DISPLAY (f), gc,
                    GCForeground | GCBackground, &xgcv);
       if (xftface_info)
       XGetGCValues (FRAME_X_DISPLAY (f), gc,
                    GCForeground | GCBackground, &xgcv);
       if (xftface_info)


@@ -132,7 +133,7 @@ xftfont_get_colors (FRAME_PTR f, struct face *face, GC gc, struct xftface_info *
              bg->color.blue = colors[1].blue;
            }
        }
              bg->color.blue = colors[1].blue;
            }
        }

-      UNBLOCK_INPUT;
+      unblock_input ();

     }
 }
 
     }
 }
 


@@ -140,9 +141,9 @@ xftfont_get_colors (FRAME_PTR f, struct face *face, GC gc, struct xftface_info *
 struct font_driver xftfont_driver;
 
 static Lisp_Object
 struct font_driver xftfont_driver;
 
 static Lisp_Object

-xftfont_list (Lisp_Object frame, Lisp_Object spec)
+xftfont_list (struct frame *f, Lisp_Object spec)

 {
 {

-  Lisp_Object list = ftfont_driver.list (frame, spec), tail;
+  Lisp_Object list = ftfont_driver.list (f, spec), tail;

 
   for (tail = list; CONSP (tail); tail = XCDR (tail))
     ASET (XCAR (tail), FONT_TYPE_INDEX, Qxft);
 
   for (tail = list; CONSP (tail); tail = XCDR (tail))
     ASET (XCAR (tail), FONT_TYPE_INDEX, Qxft);


@@ -150,9 +151,9 @@ xftfont_list (Lisp_Object frame, Lisp_Object spec)
 }
 
 static Lisp_Object
 }
 
 static Lisp_Object

-xftfont_match (Lisp_Object frame, Lisp_Object spec)
+xftfont_match (struct frame *f, Lisp_Object spec)

 {
 {

-  Lisp_Object entity = ftfont_driver.match (frame, spec);
+  Lisp_Object entity = ftfont_driver.match (f, spec);

 
   if (! NILP (entity))
     ASET (entity, FONT_TYPE_INDEX, Qxft);
 
   if (! NILP (entity))
     ASET (entity, FONT_TYPE_INDEX, Qxft);


@@ -263,7 +264,7 @@ xftfont_add_rendering_parameters (FcPattern *pat, Lisp_Object entity)
 }
 
 static Lisp_Object
 }
 
 static Lisp_Object

-xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
+xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)

 {
   FcResult result;
   Display *display = FRAME_X_DISPLAY (f);
 {
   FcResult result;
   Display *display = FRAME_X_DISPLAY (f);


@@ -325,7 +326,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   FcPatternAddInteger (pat, FC_INDEX, XINT (idx));
 
 
   FcPatternAddInteger (pat, FC_INDEX, XINT (idx));
 
 

-  BLOCK_INPUT;
+  block_input ();

   /* Make sure that the Xrender extension is added before the Xft one.
      Otherwise, the close-display hook set by Xft is called after the
      one for Xrender, and the former tries to re-add the latter.  This
   /* Make sure that the Xrender extension is added before the Xft one.
      Otherwise, the close-display hook set by Xft is called after the
      one for Xrender, and the former tries to re-add the latter.  This


@@ -346,12 +347,12 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   xftfont = XftFontOpenPattern (display, match);
   if (!xftfont)
     {
   xftfont = XftFontOpenPattern (display, match);
   if (!xftfont)
     {

-      UNBLOCK_INPUT;
+      unblock_input ();

       XftPatternDestroy (match);
       return Qnil;
     }
   ft_face = XftLockFace (xftfont);
       XftPatternDestroy (match);
       return Qnil;
     }
   ft_face = XftLockFace (xftfont);

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   /* We should not destroy PAT here because it is kept in XFTFONT and
      destroyed automatically when XFTFONT is closed.  */
 
   /* We should not destroy PAT here because it is kept in XFTFONT and
      destroyed automatically when XFTFONT is closed.  */


@@ -370,7 +371,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   ASET (font_object, FONT_FORMAT_INDEX,
        ftfont_font_format (xftfont->pattern, filename));
   font = XFONT_OBJECT (font_object);
   ASET (font_object, FONT_FORMAT_INDEX,
        ftfont_font_format (xftfont->pattern, filename));
   font = XFONT_OBJECT (font_object);

-  font->pixel_size = pixel_size;
+  font->pixel_size = size;

   font->driver = &xftfont_driver;
   font->encoding_charset = font->repertory_charset = -1;
 
   font->driver = &xftfont_driver;
   font->encoding_charset = font->repertory_charset = -1;
 


@@ -388,8 +389,6 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
       xftfont_info->matrix.xy = 0x10000L * matrix->xy;
       xftfont_info->matrix.yx = 0x10000L * matrix->yx;
     }
       xftfont_info->matrix.xy = 0x10000L * matrix->xy;
       xftfont_info->matrix.yx = 0x10000L * matrix->yx;
     }

-  font->pixel_size = size;
-  font->driver = &xftfont_driver;

   if (INTEGERP (AREF (entity, FONT_SPACING_INDEX)))
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
   if (INTEGERP (AREF (entity, FONT_SPACING_INDEX)))
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else


@@ -400,7 +399,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
       for (ch = 0; ch < 95; ch++)
        ascii_printable[ch] = ' ' + ch;
     }
       for (ch = 0; ch < 95; ch++)
        ascii_printable[ch] = ' ' + ch;
     }

-  BLOCK_INPUT;
+  block_input ();

 
   /* Unfortunately Xft doesn't provide a way to get minimum char
      width.  So, we set min_width to space_width.  */
 
   /* Unfortunately Xft doesn't provide a way to get minimum char
      width.  So, we set min_width to space_width.  */


@@ -426,7 +425,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
       XftTextExtents8 (display, xftfont, ascii_printable + 1, 94, &extents);
       font->average_width = (font->space_width + extents.xOff) / 95;
     }
       XftTextExtents8 (display, xftfont, ascii_printable + 1, 94, &extents);
       font->average_width = (font->space_width + extents.xOff) / 95;
     }

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   font->ascent = xftfont->ascent;
   font->descent = xftfont->descent;
 
   font->ascent = xftfont->ascent;
   font->descent = xftfont->descent;


@@ -487,7 +486,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
 }
 
 static void
 }
 
 static void

-xftfont_close (FRAME_PTR f, struct font *font)
+xftfont_close (struct frame *f, struct font *font)

 {
   struct xftfont_info *xftfont_info = (struct xftfont_info *) font;
 
 {
   struct xftfont_info *xftfont_info = (struct xftfont_info *) font;
 


@@ -495,14 +494,14 @@ xftfont_close (FRAME_PTR f, struct font *font)
   if (xftfont_info->otf)
     OTF_close (xftfont_info->otf);
 #endif
   if (xftfont_info->otf)
     OTF_close (xftfont_info->otf);
 #endif

-  BLOCK_INPUT;
+  block_input ();

   XftUnlockFace (xftfont_info->xftfont);
   XftFontClose (xftfont_info->display, xftfont_info->xftfont);
   XftUnlockFace (xftfont_info->xftfont);
   XftFontClose (xftfont_info->display, xftfont_info->xftfont);

-  UNBLOCK_INPUT;
+  unblock_input ();

 }
 
 static int
 }
 
 static int

-xftfont_prepare_face (FRAME_PTR f, struct face *face)
+xftfont_prepare_face (struct frame *f, struct face *face)

 {
   struct xftface_info *xftface_info;
 
 {
   struct xftface_info *xftface_info;
 


@@ -525,7 +524,7 @@ xftfont_prepare_face (FRAME_PTR f, struct face *face)
 }
 
 static void
 }
 
 static void

-xftfont_done_face (FRAME_PTR f, struct face *face)
+xftfont_done_face (struct frame *f, struct face *face)

 {
   struct xftface_info *xftface_info;
 
 {
   struct xftface_info *xftface_info;
 


@@ -582,10 +581,10 @@ xftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct
   struct xftfont_info *xftfont_info = (struct xftfont_info *) font;
   XGlyphInfo extents;
 
   struct xftfont_info *xftfont_info = (struct xftfont_info *) font;
   XGlyphInfo extents;
 

-  BLOCK_INPUT;
+  block_input ();

   XftGlyphExtents (xftfont_info->display, xftfont_info->xftfont, code, nglyphs,
                   &extents);
   XftGlyphExtents (xftfont_info->display, xftfont_info->xftfont, code, nglyphs,
                   &extents);

-  UNBLOCK_INPUT;
+  unblock_input ();

   if (metrics)
     {
       metrics->lbearing = - extents.x;
   if (metrics)
     {
       metrics->lbearing = - extents.x;


@@ -598,18 +597,18 @@ xftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct
 }
 
 static XftDraw *
 }
 
 static XftDraw *

-xftfont_get_xft_draw (FRAME_PTR f)
+xftfont_get_xft_draw (struct frame *f)

 {
   XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);
 
   if (! xft_draw)
     {
 {
   XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);
 
   if (! xft_draw)
     {

-      BLOCK_INPUT;
+      block_input ();

       xft_draw= XftDrawCreate (FRAME_X_DISPLAY (f),
                               FRAME_X_WINDOW (f),
                               FRAME_X_VISUAL (f),
                               FRAME_X_COLORMAP (f));
       xft_draw= XftDrawCreate (FRAME_X_DISPLAY (f),
                               FRAME_X_WINDOW (f),
                               FRAME_X_VISUAL (f),
                               FRAME_X_COLORMAP (f));

-      UNBLOCK_INPUT;
+      unblock_input ();

       eassert (xft_draw != NULL);
       font_put_frame_data (f, &xftfont_driver, xft_draw);
     }
       eassert (xft_draw != NULL);
       font_put_frame_data (f, &xftfont_driver, xft_draw);
     }


@@ -620,7 +619,7 @@ static int
 xftfont_draw (struct glyph_string *s, int from, int to, int x, int y,
               bool with_background)
 {
 xftfont_draw (struct glyph_string *s, int from, int to, int x, int y,
               bool with_background)
 {

-  FRAME_PTR f = s->f;
+  struct frame *f = s->f;

   struct face *face = s->face;
   struct xftfont_info *xftfont_info = (struct xftfont_info *) s->font;
   struct xftface_info *xftface_info = NULL;
   struct face *face = s->face;
   struct xftfont_info *xftfont_info = (struct xftfont_info *) s->font;
   struct xftface_info *xftface_info = NULL;


@@ -634,7 +633,7 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y,
     xftface_info = (struct xftface_info *) face->extra;
   xftfont_get_colors (f, face, s->gc, xftface_info,
                      &fg, with_background ? &bg : NULL);
     xftface_info = (struct xftface_info *) face->extra;
   xftfont_get_colors (f, face, s->gc, xftface_info,
                      &fg, with_background ? &bg : NULL);

-  BLOCK_INPUT;
+  block_input ();

   if (s->num_clips > 0)
     XftDrawSetClipRectangles (xft_draw, 0, 0, s->clip, s->num_clips);
   else
   if (s->num_clips > 0)
     XftDrawSetClipRectangles (xft_draw, 0, 0, s->clip, s->num_clips);
   else


@@ -655,7 +654,7 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y,
   else
     XftDrawGlyphs (xft_draw, &fg, xftfont_info->xftfont,
                   x, y, code, len);
   else
     XftDrawGlyphs (xft_draw, &fg, xftfont_info->xftfont,
                   x, y, code, len);

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   return len;
 }
 
   return len;
 }


@@ -680,7 +679,7 @@ xftfont_shape (Lisp_Object lgstring)
 #endif
 
 static int
 #endif
 
 static int

-xftfont_end_for_frame (FRAME_PTR f)
+xftfont_end_for_frame (struct frame *f)

 {
   XftDraw *xft_draw;
 
 {
   XftDraw *xft_draw;
 


@@ -691,9 +690,9 @@ xftfont_end_for_frame (FRAME_PTR f)
 
   if (xft_draw)
     {
 
   if (xft_draw)
     {

-      BLOCK_INPUT;
+      block_input ();

       XftDrawDestroy (xft_draw);
       XftDrawDestroy (xft_draw);

-      UNBLOCK_INPUT;
+      unblock_input ();

       font_put_frame_data (f, &xftfont_driver, NULL);
     }
   return 0;
       font_put_frame_data (f, &xftfont_driver, NULL);
     }
   return 0;