(save_frame_matrix, restore_frame_matrix): Removed.

[gnu-emacs] / src / w32term.h

diff --git a/src/w32term.h b/src/w32term.h
index 7eb0bb59aa933a6a4d8965fb853c9134eb9f6cc2..e87ea67da9d3104549a212f8be46ecdf03b36c44 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -35,11 +35,15 @@ Boston, MA 02111-1307, USA.  */
 #define FONT_BASE(f)        \
   ((f)->bdf ? (f)->bdf->ury : (f)->tm.tmAscent)
 #define FONT_DESCENT(f)     \
-  ((f)->bdf ? (f)->bdf->lly : (f)->tm.tmDescent)
+  ((f)->bdf ? -((f)->bdf->lly) : (f)->tm.tmDescent)
 #define FONT_MAX_WIDTH(f)   \
   ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth)
 
 #define CP_DEFAULT 1004
+/* Special pseudo-codepages. */
+#define CP_8BIT      -1
+#define CP_UNICODE   -2
+#define CP_UNKNOWN   -3
 
 #define CHECK_W32_FRAME(f, frame)              \
   if (NILP (frame))                            \
@@ -51,17 +55,6 @@ Boston, MA 02111-1307, USA.  */
     }                                          \
   if (! FRAME_W32_P (f))
 
-/* Emulate XCharStruct.  */
-typedef struct _XCharStruct
-{
-  int rbearing;
-  int lbearing;
-  int width;
-  int ascent;
-  int descent;
-} XCharStruct;
-
-
 /* Indicates whether we are in the readsocket call and the message we
    are processing in the current loop */
 
@@ -258,14 +251,13 @@ extern Lisp_Object Vx_pixel_size_width_font_regexp;
 /* A flag to control how to display unibyte 8-bit character.  */
 extern int unibyte_display_via_language_environment;
 
-/* NTEMACS_TODO: This does not seem to be defined. Check and remove. */
-struct w32_display_info *x_display_info_for_display ();
 struct w32_display_info *x_display_info_for_name ();
 
 extern struct w32_display_info *w32_term_init ();
 \f
 extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
 extern struct font_info *w32_get_font_info (), *w32_query_font ();
+extern void w32_cache_char_metrics (XFontStruct *font);
 extern void w32_find_ccl_program();
 \f
 #define PIX_TYPE COLORREF
@@ -359,6 +351,7 @@ struct w32_output
   Cursor modeline_cursor;
   Cursor cross_cursor;
   Cursor busy_cursor;
+  Cursor horizontal_drag_cursor;
 
   /* Window whose cursor is busy_cursor.  This window is temporarily
      mapped to display a busy-cursor.  */