*** empty log message ***

[bpt/emacs.git] / src / w32term.h

diff --git a/src/w32term.h b/src/w32term.h
index 6c10b3b..8181d61 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
    Copyright (C) 1995, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -29,13 +29,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define FONT_HEIGHT(f)    ((f)->height)
 #define FONT_BASE(f)      ((f)->ascent)
 #define FONT_DESCENT(f)   ((f)->descent)
-#define FONT_AVG_WIDTH(f) ((f)->average_width)
 
 #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))                            \
@@ -112,10 +107,6 @@ struct w32_display_info
   /* Number of bits per pixel on this screen.  */
   int n_cbits;
 
-  /* Dimensions of this screen.  */
-  int height, width;
-  int height_in,width_in;
-
   /* Mask of things that cause the mouse to be grabbed.  */
   int grabbed;
 
@@ -242,6 +233,10 @@ Lisp_Object display_x_get_resource P_ ((struct w32_display_info *,
                                        Lisp_Object, Lisp_Object));
 
 extern struct w32_display_info *w32_term_init ();
+
+extern int x_display_pixel_height P_ ((struct w32_display_info *));
+extern int x_display_pixel_width P_ ((struct w32_display_info *));
+
 \f
 #define PIX_TYPE COLORREF
 
@@ -614,7 +609,8 @@ do { \
 #define WM_EMACS_SHOW_CARET            (WM_EMACS_START + 17)
 #define WM_EMACS_HIDE_CARET            (WM_EMACS_START + 18)
 #define WM_EMACS_SETCURSOR             (WM_EMACS_START + 19)
-#define WM_EMACS_END                   (WM_EMACS_START + 20)
+#define WM_EMACS_PAINT                 (WM_EMACS_START + 20)
+#define WM_EMACS_END                   (WM_EMACS_START + 21)
 
 #define WND_FONTWIDTH_INDEX    (0)
 #define WND_LINEHEIGHT_INDEX   (4)
@@ -729,15 +725,6 @@ struct frame * check_x_frame (Lisp_Object);
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);
 
-#define FONT_TYPE_FOR_UNIBYTE(font, ch)                        \
-  ((font)->bdf ? BDF_1D_FONT : ANSI_FONT)
-
-#define FONT_TYPE_FOR_MULTIBYTE(font, ch)              \
-  (!(font)->bdf                                                \
-   ? UNICODE_FONT                                      \
-   : ((CHARSET_DIMENSION (CHAR_CHARSET ((ch))) == 1)   \
-      ? BDF_1D_FONT : BDF_2D_FONT))
-
 typedef DWORD (WINAPI * ClipboardSequence_Proc) ();
 typedef BOOL (WINAPI * AppendMenuW_Proc) (
     IN HMENU,