(cfstring_create_with_string) [TARGET_API_MAC_CARBON]: New extern.

[gnu-emacs] / src / disptab.h

diff --git a/src/disptab.h b/src/disptab.h
index 235f6bf24fb452d06f1e87a5db9e79080698cca7..d3bf54ea4fe77df60cbabbefc12db3b3626a3ec1 100644 (file)
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,23 +15,41 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to

-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */

 
 /* Access the slots of a display-table, according to their purpose.  */
 
 
 /* Access the slots of a display-table, according to their purpose.  */
 

-#define DISP_TABLE_SIZE 261
-#define DISP_TRUNC_GLYPH(dp) ((dp)->contents[256])
-#define DISP_CONTINUE_GLYPH(dp) ((dp)->contents[257])
-#define DISP_ESCAPE_GLYPH(dp) ((dp)->contents[258])
-#define DISP_CTRL_GLYPH(dp) ((dp)->contents[259])
-#define DISP_INVIS_VECTOR(dp) ((dp)->contents[260])
-#define DISP_CHAR_VECTOR(dp, c) ((dp)->contents[c])
+#define DISP_TABLE_P(obj)                                                  \
+  (CHAR_TABLE_P (obj)                                                      \
+   && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table)                      \
+   && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS)

 
 

-extern struct Lisp_Vector *window_display_table ();
+#define DISP_TABLE_EXTRA_SLOTS 6
+#define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0])
+#define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1])
+#define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2])
+#define DISP_CTRL_GLYPH(dp) ((dp)->extras[3])
+#define DISP_INVIS_VECTOR(dp) ((dp)->extras[4])
+#define DISP_BORDER_GLYPH(dp) ((dp)->extras[5])
+
+extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int));
+
+#define DISP_CHAR_VECTOR(dp, c) \
+  (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : disp_char_vector ((dp), (c)))
+
+/* Defined in window.c.  */
+extern struct Lisp_Char_Table *window_display_table P_ ((struct window *));
+
+/* Defined in indent.c.  */
+extern struct Lisp_Char_Table *buffer_display_table P_ ((void));

 
 /* Display table to use for vectors that don't specify their own.  */
 extern Lisp_Object Vstandard_display_table;
 
 
 /* Display table to use for vectors that don't specify their own.  */
 extern Lisp_Object Vstandard_display_table;
 

+/* This is the `purpose' slot of a display table.  */
+extern Lisp_Object Qdisplay_table;
+

 /* Vector of GLYPH definitions.  Indexed by GLYPH number,
    the contents are a string which is how to output the GLYPH.  */
 extern Lisp_Object Vglyph_table;
 /* Vector of GLYPH definitions.  Indexed by GLYPH number,
    the contents are a string which is how to output the GLYPH.  */
 extern Lisp_Object Vglyph_table;


@@ -39,25 +57,21 @@ extern Lisp_Object Vglyph_table;
 /* Return the current length of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_LENGTH  \
 /* Return the current length of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_LENGTH  \

-  ((XTYPE (Vglyph_table) == Lisp_Vector) \
-   ? XVECTOR (Vglyph_table)->size : 0)
+  ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0)

 
 /* Return the current base (for indexing) of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_BASE  \
 
 /* Return the current base (for indexing) of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_BASE  \

-  ((XTYPE (Vglyph_table) == Lisp_Vector) \
-   ? XVECTOR (Vglyph_table)->contents : 0)
+  ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0)

 
 /* Given BASE and LEN returned by the two previous macros,
    return nonzero if the GLYPH code G should be output as a single
    character with code G.  Return zero if G has a string in the table.  */
 
 /* Given BASE and LEN returned by the two previous macros,
    return nonzero if the GLYPH code G should be output as a single
    character with code G.  Return zero if G has a string in the table.  */

-#define GLYPH_SIMPLE_P(base,len,g)  \
-  ((g) >= (len) || XTYPE (base[g]) != Lisp_String)
+#define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g]))

 
 /* Given BASE and LEN returned by the two previous macros,
    return nonzero if GLYPH code G is aliased to a different code.  */
 
 /* Given BASE and LEN returned by the two previous macros,
    return nonzero if GLYPH code G is aliased to a different code.  */

-#define GLYPH_ALIAS_P(base,len,g)  \
-  ((g) < (len) && XTYPE (base[g]) == Lisp_Int)
+#define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g]))

 
 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1,
    return the alias for G.  */
 
 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1,
    return the alias for G.  */


@@ -65,15 +79,19 @@ extern Lisp_Object Vglyph_table;
 
 /* Follow all aliases for G in the glyph table given by (BASE,
    LENGTH), and set G to the final glyph.  */
 
 /* Follow all aliases for G in the glyph table given by (BASE,
    LENGTH), and set G to the final glyph.  */

-#define GLYPH_FOLLOW_ALIASES(base, length, g)                          \
-  while (GLYPH_ALIAS_P ((base), (length), (g)))                                \
-    (g) = GLYPH_ALIAS ((base), (g));
-  
+#define GLYPH_FOLLOW_ALIASES(base, length, g)          \
+  do {                                                 \
+    while (GLYPH_ALIAS_P ((base), (length), (g)))      \
+      (g) = GLYPH_ALIAS ((base), (g));                 \
+    if (!GLYPH_CHAR_VALID_P (FAST_GLYPH_CHAR (g)))     \
+      g = FAST_MAKE_GLYPH (' ', FAST_GLYPH_FACE (g));  \
+  } while (0)
+

 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0,
    return the length and the address of the character-sequence
    used for outputting GLYPH G.  */
 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0,
    return the length and the address of the character-sequence
    used for outputting GLYPH G.  */

-#define GLYPH_LENGTH(base,g)   XSTRING (base[g])->size
-#define GLYPH_STRING(base,g)   XSTRING (base[g])->data
+#define GLYPH_LENGTH(base,g)   SCHARS (base[g])
+#define GLYPH_STRING(base,g)   SDATA (base[g])

 
 /* GLYPH for a space character.  */
 
 
 /* GLYPH for a space character.  */
 


@@ -82,7 +100,5 @@ extern Lisp_Object Vglyph_table;
 
 #define GLYPH_FROM_CHAR(c) (c)
 
 
 #define GLYPH_FROM_CHAR(c) (c)
 

-extern int glyphlen ();
-extern void str_to_glyph_cpy ();
-extern void str_to_glyph_ncpy ();
-extern void glyph_to_str_cpy ();
+/* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349
+   (do not change this comment) */