Documented Eshell's insert output-redirection operator

[gnu-emacs] / src / xfont.c

diff --git a/src/xfont.c b/src/xfont.c
index 8b1e37aa146707d24edb0491d82de951dc7b537d..9978aba76de52abbfcd4b66009fd9d7b6a0b021f 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1,5 +1,5 @@
 /* xfont.c -- X core font driver.
 /* xfont.c -- X core font driver.

-   Copyright (C) 2006-2011 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 "lisp.h"
 #include <X11/Xlib.h>
 
 #include "lisp.h"


@@ -46,7 +45,6 @@ struct xfont_info
 };
 
 /* Prototypes of support functions.  */
 };
 
 /* Prototypes of support functions.  */

-extern void x_clear_errors (Display *);

 
 static XCharStruct *xfont_get_pcm (XFontStruct *, XChar2b *);
 
 
 static XCharStruct *xfont_get_pcm (XFontStruct *, XChar2b *);
 


@@ -59,7 +57,7 @@ xfont_get_pcm (XFontStruct *xfont, XChar2b *char2b)
   /* The result metric information.  */
   XCharStruct *pcm = NULL;
 
   /* The result metric information.  */
   XCharStruct *pcm = NULL;
 

-  font_assert (xfont && char2b);
+  eassert (xfont && char2b);

 
   if (xfont->per_char != NULL)
     {
 
   if (xfont->per_char != NULL)
     {


@@ -127,12 +125,12 @@ static int xfont_has_char (Lisp_Object, int);
 static unsigned xfont_encode_char (struct font *, int);
 static int xfont_text_extents (struct font *, unsigned *, int,
                                struct font_metrics *);
 static unsigned xfont_encode_char (struct font *, int);
 static int xfont_text_extents (struct font *, unsigned *, int,
                                struct font_metrics *);

-static int xfont_draw (struct glyph_string *, int, int, int, int, int);
+static int xfont_draw (struct glyph_string *, int, int, int, int, bool);

 static int xfont_check (FRAME_PTR, struct font *);
 
 struct font_driver xfont_driver =
   {
 static int xfont_check (FRAME_PTR, struct font *);
 
 struct font_driver xfont_driver =
   {

-    0,                         /* Qx */
+    LISP_INITIALLY_ZERO,       /* Qx */

     0,                         /* case insensitive */
     xfont_get_cache,
     xfont_list,
     0,                         /* case insensitive */
     xfont_get_cache,
     xfont_list,


@@ -164,8 +162,9 @@ xfont_get_cache (FRAME_PTR f)
 static int
 compare_font_names (const void *name1, const void *name2)
 {
 static int
 compare_font_names (const void *name1, const void *name2)
 {

-  return xstrcasecmp (*(const char **) name1,
-                     *(const char **) name2);
+  char *const *n1 = name1;
+  char *const *n2 = name2;
+  return xstrcasecmp (*n1, *n2);

 }
 
 /* Decode XLFD as iso-8859-1 into OUTPUT, and return the byte length
 }
 
 /* Decode XLFD as iso-8859-1 into OUTPUT, and return the byte length


@@ -173,7 +172,7 @@ compare_font_names (const void *name1, const void *name2)
    XLFD is NULL terminated.  The caller must assure that OUTPUT is at
    least twice (plus 1) as large as XLFD.  */
 
    XLFD is NULL terminated.  The caller must assure that OUTPUT is at
    least twice (plus 1) as large as XLFD.  */
 

-static int
+static ptrdiff_t

 xfont_decode_coding_xlfd (char *xlfd, int len, char *output)
 {
   char *p0 = xlfd, *p1 = output;
 xfont_decode_coding_xlfd (char *xlfd, int len, char *output)
 {
   char *p0 = xlfd, *p1 = output;


@@ -217,9 +216,9 @@ xfont_encode_coding_xlfd (char *xlfd)
 /* Check if CHARS (cons or vector) is supported by XFONT whose
    encoding charset is ENCODING (XFONT is NULL) or by a font whose
    registry corresponds to ENCODING and REPERTORY.
 /* Check if CHARS (cons or vector) is supported by XFONT whose
    encoding charset is ENCODING (XFONT is NULL) or by a font whose
    registry corresponds to ENCODING and REPERTORY.

-   Return 1 if supported, return 0 otherwise.  */
+   Return true if supported.  */

 
 

-static int
+static bool

 xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
                       struct charset *encoding, struct charset *repertory)
 {
 xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
                       struct charset *encoding, struct charset *repertory)
 {


@@ -272,8 +271,8 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
   return 0;
 }
 
   return 0;
 }
 

-/* A hash table recoding which font supports which scritps.  Each key
-   is a vector of characteristic font propertis FOUNDRY to WIDTH and
+/* A hash table recoding which font supports which scripts.  Each key
+   is a vector of characteristic font properties FOUNDRY to WIDTH and

    ADDSTYLE, and each value is a list of script symbols.
 
    We assume that fonts that have the same value in the above
    ADDSTYLE, and each value is a list of script symbols.
 
    We assume that fonts that have the same value in the above


@@ -281,7 +280,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
 
 static Lisp_Object xfont_scripts_cache;
 
 
 static Lisp_Object xfont_scripts_cache;
 

-/* Re-usable vector to store characteristic font properites.   */
+/* Re-usable vector to store characteristic font properties.   */

 static Lisp_Object xfont_scratch_props;
 
 /* Return a list of scripts supported by the font of FONTNAME whose
 static Lisp_Object xfont_scratch_props;
 
 /* Return a list of scripts supported by the font of FONTNAME whose


@@ -363,7 +362,7 @@ xfont_list_pattern (Display *display, const char *pattern,
        }
     }
 
        }
     }
 

-  BLOCK_INPUT;
+  block_input ();

   x_catch_errors (display);
 
   for (limit = 512; ; limit *= 2)
   x_catch_errors (display);
 
   for (limit = 512; ; limit *= 2)


@@ -389,20 +388,21 @@ xfont_list_pattern (Display *display, const char *pattern,
       Lisp_Object scripts = Qnil;
 
       for (i = 0; i < ASIZE (xfont_scratch_props); i++)
       Lisp_Object scripts = Qnil;
 
       for (i = 0; i < ASIZE (xfont_scratch_props); i++)

-       props[i] = Qnil;
+       ASET (xfont_scratch_props, i, Qnil);

       for (i = 0; i < num_fonts; i++)
        indices[i] = names[i];
       qsort (indices, num_fonts, sizeof (char *), compare_font_names);
 
       for (i = 0; i < num_fonts; i++)
        {
       for (i = 0; i < num_fonts; i++)
        indices[i] = names[i];
       qsort (indices, num_fonts, sizeof (char *), compare_font_names);
 
       for (i = 0; i < num_fonts; i++)
        {

+         ptrdiff_t len;

          Lisp_Object entity;
 
          if (i > 0 && xstrcasecmp (indices[i - 1], indices[i]) == 0)
            continue;
          entity = font_make_entity ();
          Lisp_Object entity;
 
          if (i > 0 && xstrcasecmp (indices[i - 1], indices[i]) == 0)
            continue;
          entity = font_make_entity ();

-         xfont_decode_coding_xlfd (indices[i], -1, buf);
-         if (font_parse_xlfd (buf, entity) < 0)
+         len = xfont_decode_coding_xlfd (indices[i], -1, buf);
+         if (font_parse_xlfd (buf, len, entity) < 0)

            continue;
          ASET (entity, FONT_TYPE_INDEX, Qx);
          /* Avoid auto-scaled fonts.  */
            continue;
          ASET (entity, FONT_TYPE_INDEX, Qx);
          /* Avoid auto-scaled fonts.  */


@@ -432,7 +432,8 @@ xfont_list_pattern (Display *display, const char *pattern,
                {
                  elt = XCAR (tail);
                  if (STRINGP (elt)
                {
                  elt = XCAR (tail);
                  if (STRINGP (elt)

-                     && fast_c_string_match_ignore_case (elt, indices[i]) >= 0)
+                     && fast_c_string_match_ignore_case (elt, indices[i],
+                                                         len) >= 0)

                    break;
                }
              if (! CONSP (tail))
                    break;
                }
              if (! CONSP (tail))


@@ -460,13 +461,13 @@ xfont_list_pattern (Display *display, const char *pattern,
                list = Fcons (entity, list);
              continue;
            }
                list = Fcons (entity, list);
              continue;
            }

-         if (memcmp (props, &(AREF (entity, FONT_FOUNDRY_INDEX)),
-                     sizeof (Lisp_Object) * 7)
+         if (memcmp (props, aref_addr (entity, FONT_FOUNDRY_INDEX),
+                     word_size * 7)

              || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7]))
            {
              || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7]))
            {

-             memcpy (props, &(AREF (entity, FONT_FOUNDRY_INDEX)),
-                     sizeof (Lisp_Object) * 7);
-             props[7] = AREF (entity, FONT_SPACING_INDEX);
+             vcopy (xfont_scratch_props, 0,
+                    aref_addr (entity, FONT_FOUNDRY_INDEX), 7);
+             ASET (xfont_scratch_props, 7, AREF (entity, FONT_SPACING_INDEX));

              scripts = xfont_supported_scripts (display, indices[i],
                                                 xfont_scratch_props, encoding);
            }
              scripts = xfont_supported_scripts (display, indices[i],
                                                 xfont_scratch_props, encoding);
            }


@@ -478,7 +479,7 @@ xfont_list_pattern (Display *display, const char *pattern,
     }
 
   x_uncatch_errors ();
     }
 
   x_uncatch_errors ();

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   FONT_ADD_LOG ("xfont-list", build_string (pattern), list);
   return list;
 
   FONT_ADD_LOG ("xfont-list", build_string (pattern), list);
   return list;


@@ -587,7 +588,7 @@ xfont_match (Lisp_Object frame, Lisp_Object spec)
   if (xfont_encode_coding_xlfd (name) < 0)
     return Qnil;
 
   if (xfont_encode_coding_xlfd (name) < 0)
     return Qnil;
 

-  BLOCK_INPUT;
+  block_input ();

   entity = Qnil;
   xfont = XLoadQueryFont (display, name);
   if (xfont)
   entity = Qnil;
   xfont = XLoadQueryFont (display, name);
   if (xfont)


@@ -603,17 +604,18 @@ xfont_match (Lisp_Object frame, Lisp_Object spec)
             string.  We must avoid such a name.  */
          if (*s)
            {
             string.  We must avoid such a name.  */
          if (*s)
            {

+             ptrdiff_t len;

              entity = font_make_entity ();
              ASET (entity, FONT_TYPE_INDEX, Qx);
              entity = font_make_entity ();
              ASET (entity, FONT_TYPE_INDEX, Qx);

-             xfont_decode_coding_xlfd (s, -1, name);
-             if (font_parse_xlfd (name, entity) < 0)
+             len = xfont_decode_coding_xlfd (s, -1, name);
+             if (font_parse_xlfd (name, len, entity) < 0)

                entity = Qnil;
            }
          XFree (s);
        }
       XFreeFont (display, xfont);
     }
                entity = Qnil;
            }
          XFree (s);
        }
       XFreeFont (display, xfont);
     }

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   FONT_ADD_LOG ("xfont-match", spec, entity);
   return entity;
 
   FONT_ADD_LOG ("xfont-match", spec, entity);
   return entity;


@@ -630,7 +632,7 @@ xfont_list_family (Lisp_Object frame)
   char *last_family IF_LINT (= 0);
   int last_len;
 
   char *last_family IF_LINT (= 0);
   int last_len;
 

-  BLOCK_INPUT;
+  block_input ();

   x_catch_errors (dpyinfo->display);
   names = XListFonts (dpyinfo->display, "-*-*-*-*-*-*-*-*-*-*-*-*-*-*",
                      0x8000, &num_fonts);
   x_catch_errors (dpyinfo->display);
   names = XListFonts (dpyinfo->display, "-*-*-*-*-*-*-*-*-*-*-*-*-*-*",
                      0x8000, &num_fonts);


@@ -671,7 +673,7 @@ xfont_list_family (Lisp_Object frame)
 
   XFreeFontNames (names);
   x_uncatch_errors ();
 
   XFreeFontNames (names);
   x_uncatch_errors ();

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   return list;
 }
 
   return list;
 }


@@ -715,7 +717,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
       return Qnil;
     }
 
       return Qnil;
     }
 

-  BLOCK_INPUT;
+  block_input ();

   x_catch_errors (display);
   xfont = XLoadQueryFont (display, name);
   if (x_had_errors_p (display))
   x_catch_errors (display);
   xfont = XLoadQueryFont (display, name);
   if (x_had_errors_p (display))


@@ -782,7 +784,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
       XFree (p0);
     }
   x_uncatch_errors ();
       XFree (p0);
     }
   x_uncatch_errors ();

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   if (! xfont)
     {
 
   if (! xfont)
     {


@@ -795,7 +797,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   ASET (font_object, FONT_TYPE_INDEX, Qx);
   if (STRINGP (fullname))
     {
   ASET (font_object, FONT_TYPE_INDEX, Qx);
   if (STRINGP (fullname))
     {

-      font_parse_xlfd (SSDATA (fullname), font_object);
+      font_parse_xlfd (SSDATA (fullname), SBYTES (fullname), font_object);

       ASET (font_object, FONT_NAME_INDEX, fullname);
     }
   else
       ASET (font_object, FONT_NAME_INDEX, fullname);
     }
   else


@@ -819,6 +821,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   font->descent = xfont->descent;
   font->height = font->ascent + font->descent;
   font->min_width = xfont->min_bounds.width;
   font->descent = xfont->descent;
   font->height = font->ascent + font->descent;
   font->min_width = xfont->min_bounds.width;

+  font->max_width = xfont->max_bounds.width;

   if (xfont->min_bounds.width == xfont->max_bounds.width)
     {
       /* Fixed width font.  */
   if (xfont->min_bounds.width == xfont->max_bounds.width)
     {
       /* Fixed width font.  */


@@ -863,7 +866,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
        }
     }
 
        }
     }
 

-  BLOCK_INPUT;
+  block_input ();

   font->underline_thickness
     = (XGetFontProperty (xfont, XA_UNDERLINE_THICKNESS, &value)
        ? (long) value : 0);
   font->underline_thickness
     = (XGetFontProperty (xfont, XA_UNDERLINE_THICKNESS, &value)
        ? (long) value : 0);


@@ -879,7 +882,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   font->default_ascent
     = (XGetFontProperty (xfont, dpyinfo->Xatom_MULE_DEFAULT_ASCENT, &value)
        ? (long) value : 0);
   font->default_ascent
     = (XGetFontProperty (xfont, dpyinfo->Xatom_MULE_DEFAULT_ASCENT, &value)
        ? (long) value : 0);

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   if (NILP (fullname))
     fullname = AREF (font_object, FONT_NAME_INDEX);
 
   if (NILP (fullname))
     fullname = AREF (font_object, FONT_NAME_INDEX);


@@ -894,18 +897,18 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
 static void
 xfont_close (FRAME_PTR f, struct font *font)
 {
 static void
 xfont_close (FRAME_PTR f, struct font *font)
 {

-  BLOCK_INPUT;
+  block_input ();

   XFreeFont (FRAME_X_DISPLAY (f), ((struct xfont_info *) font)->xfont);
   XFreeFont (FRAME_X_DISPLAY (f), ((struct xfont_info *) font)->xfont);

-  UNBLOCK_INPUT;
+  unblock_input ();

 }
 
 static int
 xfont_prepare_face (FRAME_PTR f, struct face *face)
 {
 }
 
 static int
 xfont_prepare_face (FRAME_PTR f, struct face *face)
 {

-  BLOCK_INPUT;
+  block_input ();

   XSetFont (FRAME_X_DISPLAY (f), face->gc,
            ((struct xfont_info *) face->font)->xfont->fid);
   XSetFont (FRAME_X_DISPLAY (f), face->gc,
            ((struct xfont_info *) face->font)->xfont->fid);

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   return 0;
 }
 
   return 0;
 }


@@ -1015,7 +1018,8 @@ xfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct f
 }
 
 static int
 }
 
 static int

-xfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_background)
+xfont_draw (struct glyph_string *s, int from, int to, int x, int y,
+            bool with_background)

 {
   XFontStruct *xfont = ((struct xfont_info *) s->font)->xfont;
   int len = to - from;
 {
   XFontStruct *xfont = ((struct xfont_info *) s->font)->xfont;
   int len = to - from;


@@ -1024,21 +1028,19 @@ xfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_bac
 
   if (s->gc != s->face->gc)
     {
 
   if (s->gc != s->face->gc)
     {

-      BLOCK_INPUT;
+      block_input ();

       XSetFont (s->display, gc, xfont->fid);
       XSetFont (s->display, gc, xfont->fid);

-      UNBLOCK_INPUT;
+      unblock_input ();

     }
 
   if (xfont->min_byte1 == 0 && xfont->max_byte1 == 0)
     {
     }
 
   if (xfont->min_byte1 == 0 && xfont->max_byte1 == 0)
     {

-      char *str;

       USE_SAFE_ALLOCA;
       USE_SAFE_ALLOCA;

-
-      SAFE_ALLOCA (str, char *, len);
+      char *str = SAFE_ALLOCA (len);

       for (i = 0; i < len ; i++)
        str[i] = XCHAR2B_BYTE2 (s->char2b + from + i);
       for (i = 0; i < len ; i++)
        str[i] = XCHAR2B_BYTE2 (s->char2b + from + i);

-      BLOCK_INPUT;
-      if (with_background > 0)
+      block_input ();
+      if (with_background)

        {
          if (s->padding_p)
            for (i = 0; i < len; i++)
        {
          if (s->padding_p)
            for (i = 0; i < len; i++)


@@ -1058,13 +1060,13 @@ xfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_bac
            XDrawString (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
                         gc, x, y, str, len);
        }
            XDrawString (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
                         gc, x, y, str, len);
        }

-      UNBLOCK_INPUT;
+      unblock_input ();

       SAFE_FREE ();
       return s->nchars;
     }
 
       SAFE_FREE ();
       return s->nchars;
     }
 

-  BLOCK_INPUT;
-  if (with_background > 0)
+  block_input ();
+  if (with_background)

     {
       if (s->padding_p)
        for (i = 0; i < len; i++)
     {
       if (s->padding_p)
        for (i = 0; i < len; i++)


@@ -1084,7 +1086,7 @@ xfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_bac
        XDrawString16 (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
                       gc, x, y, s->char2b + from, len);
     }
        XDrawString16 (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
                       gc, x, y, s->char2b + from, len);
     }

-  UNBLOCK_INPUT;
+  unblock_input ();

 
   return len;
 }
 
   return len;
 }