*** empty log message ***

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

diff --git a/src/w32term.h b/src/w32term.h
index c537275..acf864d 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -1,11 +1,12 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
 /* Definitions and headers for communication on the Microsoft W32 API.

-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007 Free Software Foundation, Inc.

 
 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
 
 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

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, 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,26 +16,37 @@ 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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 /* Added by Kevin Gallo */
 
 
 /* Added by Kevin Gallo */
 

-#include <w32gui.h>
+#include "w32gui.h"

 
 

-/* The class of this X application.  */
-#define EMACS_CLASS "Emacs"

 \f
 #define BLACK_PIX_DEFAULT(f) PALETTERGB(0,0,0)
 #define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255)
 
 \f
 #define BLACK_PIX_DEFAULT(f) PALETTERGB(0,0,0)
 #define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255)
 

-#define FONT_WIDTH(f)  ((f)->tm.tmAveCharWidth)
-#define FONT_HEIGHT(f) ((f)->tm.tmHeight)
-#define FONT_BASE(f)    ((f)->tm.tmAscent)
+#define FONT_WIDTH(f)       \
+  ((f)->bdf ? (f)->bdf->width : (f)->tm.tmAveCharWidth)
+#define FONT_HEIGHT(f)      \
+   ((f)->bdf ? (f)->bdf->height : (f)->tm.tmHeight)
+#define FONT_BASE(f)        \
+  ((f)->bdf ? (f)->bdf->ury : (f)->tm.tmAscent)
+#define FONT_DESCENT(f)     \
+  ((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))                            \
 
 #define CHECK_W32_FRAME(f, frame)              \
   if (NILP (frame))                            \

-    f = selected_frame;                                \
+    f = SELECTED_FRAME ();                     \

   else                                         \
     {                                          \
       CHECK_LIVE_FRAME (frame, 0);             \
   else                                         \
     {                                          \
       CHECK_LIVE_FRAME (frame, 0);             \


@@ -50,23 +62,10 @@ extern BOOL bUseDflt;
 
 extern struct frame *x_window_to_frame ();
 
 
 extern struct frame *x_window_to_frame ();
 

-enum text_cursor_kinds {
-  filled_box_cursor, hollow_box_cursor, bar_cursor
-};
-
-/* This data type is used for the font_table field
-   of struct w32_display_info.  */
-
-struct font_info 
-{
-  XFontStruct *font;
-  char *name;
-};
-

 /* Structure recording bitmaps and reference count.
    If REFCOUNT is 0 then this record is free to be reused.  */
 
 /* Structure recording bitmaps and reference count.
    If REFCOUNT is 0 then this record is free to be reused.  */
 

-struct w32_bitmap_record 
+struct w32_bitmap_record

 {
   Pixmap pixmap;
   char *file;
 {
   Pixmap pixmap;
   char *file;


@@ -100,49 +99,84 @@ struct w32_display_info
 {
   /* Chain of all w32_display_info structures.  */
   struct w32_display_info *next;
 {
   /* Chain of all w32_display_info structures.  */
   struct w32_display_info *next;

+

   /* This is a cons cell of the form (NAME . FONT-LIST-CACHE).
      The same cons cell also appears in x_display_name_list.  */
   Lisp_Object name_list_element;
   /* This is a cons cell of the form (NAME . FONT-LIST-CACHE).
      The same cons cell also appears in x_display_name_list.  */
   Lisp_Object name_list_element;

+

   /* Number of frames that are on this display.  */
   int reference_count;
   /* Number of frames that are on this display.  */
   int reference_count;

+
+  /* Dots per inch of the screen.  */
+  double resx, resy;
+

   /* Number of planes on this screen.  */
   int n_planes;
   /* Number of planes on this screen.  */
   int n_planes;

+

   /* Number of bits per pixel on this screen.  */
   int n_cbits;
   /* Number of bits per pixel on this screen.  */
   int n_cbits;

+

   /* Dimensions of this screen.  */
   int height, width;
   int height_in,width_in;
   /* Dimensions of this screen.  */
   int height, width;
   int height_in,width_in;

+

   /* Mask of things that cause the mouse to be grabbed.  */
   int grabbed;
   /* Mask of things that cause the mouse to be grabbed.  */
   int grabbed;

+
+  /* Emacs bitmap-id of the default icon bitmap for this frame.
+     Or -1 if none has been allocated yet.  */
+  int icon_bitmap_id;
+

   /* The root window of this screen.  */
   Window root_window;
   /* The root window of this screen.  */
   Window root_window;

+

   /* The cursor to use for vertical scroll bars.  */
   Cursor vertical_scroll_bar_cursor;
 
   /* The cursor to use for vertical scroll bars.  */
   Cursor vertical_scroll_bar_cursor;
 

-  /* color palette information */
+  /* Resource data base */
+  XrmDatabase xrdb;
+
+  /* color palette information.  */

   int has_palette;
   struct w32_palette_entry * color_list;
   unsigned num_colors;
   HPALETTE palette;
 
   int has_palette;
   struct w32_palette_entry * color_list;
   unsigned num_colors;
   HPALETTE palette;
 

-  /* deferred action flags checked when starting frame update */
+  /* deferred action flags checked when starting frame update.  */

   int regen_palette;
 
   int regen_palette;
 

+  /* Keystroke that has been faked by Emacs and will be ignored when
+     received; value is reset after key is received.  */
+  int faked_key;
+

   /* A table of all the fonts we have already loaded.  */
   struct font_info *font_table;
 
   /* A table of all the fonts we have already loaded.  */
   struct font_info *font_table;
 

-  /* The current capacity of x_font_table.  */
+  /* The current capacity of font_table.  */

   int font_table_size;
 
   int font_table_size;
 

-  /* These variables describe the range of text currently shown
-     in its mouse-face, together with the window they apply to.
-     As long as the mouse stays within this range, we need not
-     redraw anything on its account.  */
+  /* Minimum width over all characters in all fonts in font_table.  */
+  int smallest_char_width;
+
+  /* Minimum font height over all fonts in font_table.  */
+  int smallest_font_height;
+
+  /* Reusable Graphics Context for drawing a cursor in a non-default face. */
+  XGCValues *scratch_cursor_gc;
+
+  /* These variables describe the range of text currently shown in its
+     mouse-face, together with the window they apply to. As long as
+     the mouse stays within this range, we need not redraw anything on
+     its account.  Rows and columns are glyph matrix positions in
+     MOUSE_FACE_WINDOW.  */

   int mouse_face_beg_row, mouse_face_beg_col;
   int mouse_face_beg_row, mouse_face_beg_col;

+  int mouse_face_beg_x, mouse_face_beg_y;

   int mouse_face_end_row, mouse_face_end_col;
   int mouse_face_end_row, mouse_face_end_col;

+  int mouse_face_end_x, mouse_face_end_y;

   int mouse_face_past_end;
   Lisp_Object mouse_face_window;
   int mouse_face_face_id;
   int mouse_face_past_end;
   Lisp_Object mouse_face_window;
   int mouse_face_face_id;

+  Lisp_Object mouse_face_overlay;

 
   /* 1 if a mouse motion event came and we didn't handle it right away because
      gc was in progress.  */
 
   /* 1 if a mouse motion event came and we didn't handle it right away because
      gc was in progress.  */


@@ -156,11 +190,16 @@ struct w32_display_info
   /* Nonzero means defer mouse-motion highlighting.  */
   int mouse_face_defer;
 
   /* Nonzero means defer mouse-motion highlighting.  */
   int mouse_face_defer;
 

+  /* Nonzero means that the mouse highlight should not be shown.  */
+  int mouse_face_hidden;
+
+  int mouse_face_image_state;
+

   char *w32_id_name;
 
   /* The number of fonts actually stored in w32_font_table.
   char *w32_id_name;
 
   /* The number of fonts actually stored in w32_font_table.

-     font_table[n] is used and valid iff 0 <= n < n_fonts.
-     0 <= n_fonts <= font_table_size.  */
+     font_table[n] is used and valid if 0 <= n < n_fonts. 0 <=
+     n_fonts <= font_table_size. and font_table[i].name != 0. */

   int n_fonts;
 
   /* Pointer to bitmap records.  */
   int n_fonts;
 
   /* Pointer to bitmap records.  */


@@ -190,10 +229,14 @@ struct w32_display_info
      event).  It points to the focus frame's selected window's
      frame.  It differs from w32_focus_frame when we're using a global
      minibuffer.  */
      event).  It points to the focus frame's selected window's
      frame.  It differs from w32_focus_frame when we're using a global
      minibuffer.  */

-  struct frame *w32_highlight_frame;
+  struct frame *x_highlight_frame;
+
+  /* Cache of images.  */
+  struct image_cache *image_cache;

 };
 
 /* This is a chain of structures for all the displays currently in use.  */
 };
 
 /* This is a chain of structures for all the displays currently in use.  */

+extern struct w32_display_info *x_display_list;

 extern struct w32_display_info one_w32_display_info;
 
 /* This is a list of cons cells, each of the form (NAME . FONT-LIST-CACHE),
 extern struct w32_display_info one_w32_display_info;
 
 /* This is a list of cons cells, each of the form (NAME . FONT-LIST-CACHE),


@@ -202,40 +245,68 @@ extern struct w32_display_info one_w32_display_info;
    FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
 extern Lisp_Object w32_display_name_list;
 
    FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
 extern Lisp_Object w32_display_name_list;
 

-extern struct w32_display_info *x_display_info_for_display ();
-extern struct w32_display_info *x_display_info_for_name ();
+/* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.  */
+extern Lisp_Object Vx_pixel_size_width_font_regexp;
+
+struct w32_display_info *x_display_info_for_name ();
+
+Lisp_Object display_x_get_resource P_ ((struct w32_display_info *,
+                                       Lisp_Object, Lisp_Object,
+                                       Lisp_Object, Lisp_Object));

 
 extern struct w32_display_info *w32_term_init ();
 \f
 
 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
+

 /* Each W32 frame object points to its own struct w32_display object
    in the output_data.w32 field.  The w32_display structure contains all
    the information that is specific to W32 windows.  */
 
 /* Each W32 frame object points to its own struct w32_display object
    in the output_data.w32 field.  The w32_display structure contains all
    the information that is specific to W32 windows.  */
 

+/* Put some things in x_output for compatibility.
+   NTEMACS_TODO: Move all common things here to eliminate unneccesary
+   diffs between X and w32 code.  */
+struct x_output
+{
+  PIX_TYPE background_pixel;
+  PIX_TYPE foreground_pixel;
+
+  /* Keep track of focus.  May be EXPLICIT if we received a FocusIn for this
+     frame, or IMPLICIT if we received an EnterNotify.
+     FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
+  int focus_state;
+
+};
+
+enum
+{
+  /* Values for focus_state, used as bit mask.
+     EXPLICIT means we received a FocusIn for the frame and know it has
+     the focus.  IMPLICIT means we recevied an EnterNotify and the frame
+     may have the focus if no window manager is running.
+     FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
+  FOCUS_NONE     = 0,
+  FOCUS_IMPLICIT = 1,
+  FOCUS_EXPLICIT = 2
+};
+

 struct w32_output
 {
 struct w32_output
 {

+  /* Placeholder for things accessed through output_data.x.  */
+  struct x_output x_compatible;
+

   /* Menubar "widget" handle.  */
   HMENU menubar_widget;
 
   /* Original palette (used to deselect real palette after drawing) */
   HPALETTE old_palette;
 
   /* Menubar "widget" handle.  */
   HMENU menubar_widget;
 
   /* Original palette (used to deselect real palette after drawing) */
   HPALETTE old_palette;
 

-  /* Position of the W32 window (x and y offsets in root window).  */
-  int left_pos;
-  int top_pos;
-
-  /* Border width of the W32 window as known by the window system.  */
-  int border_width;
-
-  /* Size of the W32 window in pixels.  */
-  int pixel_height, pixel_width;
-
-  /* Height of a line, in pixels.  */
-  int line_height;
-
-  /* Width of the internal border.  This is a line of background color
-     just inside the window's border.  When the frame is selected,
-     a highlighting is displayed inside the internal border.  */
-  int internal_border_width;
+  /* Here are the Graphics Contexts for the default font.  */
+  XGCValues *cursor_gc;                                /* cursor drawing */

 
   /* The window used for this frame.
      May be zero while the frame object is being created
 
   /* The window used for this frame.
      May be zero while the frame object is being created


@@ -248,64 +319,52 @@ struct w32_output
      (see the explicit_parent field, below).  */
   Window parent_desc;
 
      (see the explicit_parent field, below).  */
   Window parent_desc;
 

+  /* Default ASCII font of this frame. */

   XFontStruct *font;
 
   XFontStruct *font;
 

+  /* The baseline offset of the default ASCII font.  */
+  int baseline_offset;
+
+  /* If a fontset is specified for this frame instead of font, this
+     value contains an ID of the fontset, else -1.  */
+  int fontset;
+

   /* Pixel values used for various purposes.
      border_pixel may be -1 meaning use a gray tile.  */
   /* Pixel values used for various purposes.
      border_pixel may be -1 meaning use a gray tile.  */

-  unsigned long background_pixel;
-  unsigned long foreground_pixel;
-  unsigned long cursor_pixel;
-  unsigned long border_pixel;
-  unsigned long mouse_pixel;
-  unsigned long cursor_foreground_pixel;
+  COLORREF cursor_pixel;
+  COLORREF border_pixel;
+  COLORREF mouse_pixel;
+  COLORREF cursor_foreground_pixel;
+
+  /* Foreground color for scroll bars.  A value of -1 means use the
+     default (black for non-toolkit scroll bars).  */
+  COLORREF scroll_bar_foreground_pixel;
+
+  /* Background color for scroll bars.  A value of -1 means use the
+     default (background color of the frame for non-toolkit scroll
+     bars).  */
+  COLORREF scroll_bar_background_pixel;

 
   /* Descriptor for the cursor in use for this window.  */
   Cursor text_cursor;
   Cursor nontext_cursor;
   Cursor modeline_cursor;
 
   /* Descriptor for the cursor in use for this window.  */
   Cursor text_cursor;
   Cursor nontext_cursor;
   Cursor modeline_cursor;

-  Cursor cross_cursor;
+  Cursor hand_cursor;
+  Cursor hourglass_cursor;
+  Cursor horizontal_drag_cursor;

 
 

-  /* Flag to set when the window needs to be completely repainted.  */
-  int needs_exposure;
+  /* Window whose cursor is hourglass_cursor.  This window is
+     temporarily mapped to display an hourglass cursor.  */
+  Window hourglass_window;

 
 

-  /* What kind of text cursor is drawn in this window right now?
-     (If there is no cursor (phys_cursor_x < 0), then this means nothing.)  */
-  enum text_cursor_kinds current_cursor;
+  /* Non-zero means hourglass cursor is currently displayed.  */
+  unsigned hourglass_p : 1;

 
 

-  /* What kind of text cursor should we draw in the future?
-     This should always be filled_box_cursor or bar_cursor.  */
-  enum text_cursor_kinds desired_cursor;
-
-  /* Width of bar cursor (if we are using that).  */
-  int cursor_width;
+  /* Flag to set when the window needs to be completely repainted.  */
+  int needs_exposure;

 
   DWORD dwStyle;
 
 
   DWORD dwStyle;
 

-  /* The size of the extra width currently allotted for vertical
-     scroll bars, in pixels.  */
-  int vertical_scroll_bar_extra;
-
-  /* Table of parameter faces for this frame.  Any resources (pixel
-     values, fonts) referred to here have been allocated explicitly
-     for this face, and should be freed if we change the face.  */
-  struct face **param_faces;
-  int n_param_faces;
-
-  /* Table of computed faces for this frame.  These are the faces
-     whose indexes go into the upper bits of a glyph, computed by
-     combining the parameter faces specified by overlays, text
-     properties, and what have you.  The resources mentioned here
-     are all shared with parameter faces.  */
-  struct face **computed_faces;
-  int n_computed_faces;                /* How many are valid */
-  int size_computed_faces;     /* How many are allocated */
-
-  /* This is the gravity value for the specified window position.  */
-  int win_gravity;
-
-  /* The geometry flags for this window.  */
-  int size_hint_flags;
-

   /* This is the Emacs structure for the display this frame is on.  */
   /* struct w32_display_info *display_info; */
 
   /* This is the Emacs structure for the display this frame is on.  */
   /* struct w32_display_info *display_info; */
 


@@ -322,37 +381,59 @@ struct w32_output
   /* Nonzero means menubar is about to become active, but should be
      brought up to date first.  */
   volatile char pending_menu_activation;
   /* Nonzero means menubar is about to become active, but should be
      brought up to date first.  */
   volatile char pending_menu_activation;

+
+  /* Relief GCs, colors etc.  */
+  struct relief
+  {
+    XGCValues *gc;
+    unsigned long pixel;
+    int allocated_p;
+  }
+  black_relief, white_relief;
+
+  /* The background for which the above relief GCs were set up.
+     They are changed only when a different background is involved.  */
+  unsigned long relief_background;

 };
 
 };
 

-/* Get at the computed faces of an X window frame.  */
-#define FRAME_PARAM_FACES(f) ((f)->output_data.w32->param_faces)
-#define FRAME_N_PARAM_FACES(f) ((f)->output_data.w32->n_param_faces)
-#define FRAME_DEFAULT_PARAM_FACE(f) (FRAME_PARAM_FACES (f)[0])
-#define FRAME_MODE_LINE_PARAM_FACE(f) (FRAME_PARAM_FACES (f)[1])
+extern struct w32_output w32term_display;

 
 

-#define FRAME_COMPUTED_FACES(f) ((f)->output_data.w32->computed_faces)
-#define FRAME_N_COMPUTED_FACES(f) ((f)->output_data.w32->n_computed_faces)
-#define FRAME_SIZE_COMPUTED_FACES(f) ((f)->output_data.w32->size_computed_faces)
-#define FRAME_DEFAULT_FACE(f) ((f)->output_data.w32->computed_faces[0])
-#define FRAME_MODE_LINE_FACE(f) ((f)->output_data.w32->computed_faces[1])
+/* Return the X output data for frame F.  */
+#define FRAME_X_OUTPUT(f) ((f)->output_data.w32)

 
 /* Return the window associated with the frame F.  */
 #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc)
 
 /* Return the window associated with the frame F.  */
 #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc)

+#define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc)

 
 

-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.w32->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.w32->background_pixel)
+#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
+#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)

 #define FRAME_FONT(f) ((f)->output_data.w32->font)
 #define FRAME_FONT(f) ((f)->output_data.w32->font)

-#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.w32->internal_border_width)
+#define FRAME_FONTSET(f) ((f)->output_data.w32->fontset)
+#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset)

 
 /* This gives the w32_display_info structure for the display F is on.  */
 #define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info)
 
 /* This gives the w32_display_info structure for the display F is on.  */
 #define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info)

+#define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info)
+
+/* This is the `Display *' which frame F is on.  */
+#define FRAME_X_DISPLAY(f) (0)
+
+/* This is the 'font_info *' which frame F has.  */
+#define FRAME_W32_FONT_TABLE(f) (FRAME_W32_DISPLAY_INFO (f)->font_table)
+
+/* Value is the smallest width of any character in any font on frame F.  */

 
 

-/* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}.  */
-#define PIXEL_WIDTH(f) ((f)->output_data.w32->pixel_width)
-#define PIXEL_HEIGHT(f) ((f)->output_data.w32->pixel_height)
-#define FRAME_LINE_HEIGHT(f) ((f)->output_data.w32->line_height)
+#define FRAME_SMALLEST_CHAR_WIDTH(F) \
+     FRAME_W32_DISPLAY_INFO(F)->smallest_char_width

 
 

-#define FRAME_DESIRED_CURSOR(f) ((f)->output_data.w32->desired_cursor)
+/* Value is the smallest height of any font on frame F.  */
+
+#define FRAME_SMALLEST_FONT_HEIGHT(F) \
+     FRAME_W32_DISPLAY_INFO(F)->smallest_font_height
+
+/* Return a pointer to the image cache of frame F.  */
+
+#define FRAME_X_IMAGE_CACHE(F) FRAME_W32_DISPLAY_INFO ((F))->image_cache

 
 \f
 /* W32-specific scroll bar stuff.  */
 
 \f
 /* W32-specific scroll bar stuff.  */


@@ -381,6 +462,9 @@ struct scroll_bar {
      32-bit quantity, we store it split into two 32-bit values.  */
   Lisp_Object w32_window_low, w32_window_high;
 
      32-bit quantity, we store it split into two 32-bit values.  */
   Lisp_Object w32_window_low, w32_window_high;
 

+  /* Same as above for the widget.  */
+  Lisp_Object w32_widget_low, w32_widget_high;
+

   /* The position and size of the scroll bar in pixels, relative to the
      frame.  */
   Lisp_Object top, left, width, height;
   /* The position and size of the scroll bar in pixels, relative to the
      frame.  */
   Lisp_Object top, left, width, height;


@@ -432,30 +516,35 @@ struct scroll_bar {
 #define SET_SCROLL_BAR_W32_WINDOW(ptr, id) \
   (SCROLL_BAR_UNPACK ((ptr)->w32_window_low, (ptr)->w32_window_high, (int) id))
 
 #define SET_SCROLL_BAR_W32_WINDOW(ptr, id) \
   (SCROLL_BAR_UNPACK ((ptr)->w32_window_low, (ptr)->w32_window_high, (int) id))
 

+/* Extract the X widget of the scroll bar from a struct scroll_bar.  */
+#define SCROLL_BAR_X_WIDGET(ptr) \
+  ((Widget) SCROLL_BAR_PACK ((ptr)->x_widget_low, (ptr)->x_widget_high))

 
 

-/* Return the outside pixel height for a vertical scroll bar HEIGHT
-   rows high on frame F.  */
-#define VERTICAL_SCROLL_BAR_PIXEL_HEIGHT(f, height) \
-  ((height) * (f)->output_data.w32->line_height)
+/* Store a widget id in a struct scroll_bar.  */
+#define SET_SCROLL_BAR_X_WIDGET(ptr, w) \
+  (SCROLL_BAR_UNPACK ((ptr)->x_widget_low, (ptr)->x_widget_high, (int) w))

 
 /* Return the inside width of a vertical scroll bar, given the outside
    width.  */
 
 /* Return the inside width of a vertical scroll bar, given the outside
    width.  */

-#define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(width) \
-  ((width) - VERTICAL_SCROLL_BAR_LEFT_BORDER - VERTICAL_SCROLL_BAR_RIGHT_BORDER)
+#define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f,width) \
+  ((width) \
+   - VERTICAL_SCROLL_BAR_LEFT_BORDER \
+   - VERTICAL_SCROLL_BAR_RIGHT_BORDER \
+   - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2)

 
 /* Return the length of the rectangle within which the top of the
    handle must stay.  This isn't equivalent to the inside height,
 
 /* Return the length of the rectangle within which the top of the
    handle must stay.  This isn't equivalent to the inside height,

-   because the scroll bar handle has a minimum height.  
+   because the scroll bar handle has a minimum height.

 
    This is the real range of motion for the scroll bar, so when we're
    scaling buffer positions to scroll bar positions, we use this, not
    VERTICAL_SCROLL_BAR_INSIDE_HEIGHT.  */
 
    This is the real range of motion for the scroll bar, so when we're
    scaling buffer positions to scroll bar positions, we use this, not
    VERTICAL_SCROLL_BAR_INSIDE_HEIGHT.  */

-#define VERTICAL_SCROLL_BAR_TOP_RANGE(height) \
-  (VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (height) - VERTICAL_SCROLL_BAR_MIN_HANDLE)
+#define VERTICAL_SCROLL_BAR_TOP_RANGE(f,height) \
+  (VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (f, height) - VERTICAL_SCROLL_BAR_MIN_HANDLE)

 
 /* Return the inside height of vertical scroll bar, given the outside
    height.  See VERTICAL_SCROLL_BAR_TOP_RANGE too.  */
 
 /* Return the inside height of vertical scroll bar, given the outside
    height.  See VERTICAL_SCROLL_BAR_TOP_RANGE too.  */

-#define VERTICAL_SCROLL_BAR_INSIDE_HEIGHT(height) \
+#define VERTICAL_SCROLL_BAR_INSIDE_HEIGHT(f,height) \

   ((height) - VERTICAL_SCROLL_BAR_TOP_BORDER - VERTICAL_SCROLL_BAR_BOTTOM_BORDER)
 
 
   ((height) - VERTICAL_SCROLL_BAR_TOP_BORDER - VERTICAL_SCROLL_BAR_BOTTOM_BORDER)
 
 


@@ -478,94 +567,11 @@ struct scroll_bar {
 /* Minimum lengths for scroll bar handles, in pixels.  */
 #define VERTICAL_SCROLL_BAR_MIN_HANDLE (vertical_scroll_bar_min_handle)
 
 /* Minimum lengths for scroll bar handles, in pixels.  */
 #define VERTICAL_SCROLL_BAR_MIN_HANDLE (vertical_scroll_bar_min_handle)
 

+/* Trimming off a few pixels from each side prevents
+   text from glomming up against the scroll bar */
+#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)

 
 \f
 
 \f

-/* Manipulating pixel sizes and character sizes.
-   Knowledge of which factors affect the overall size of the window should
-   be hidden in these macros, if that's possible.
-
-   Return the upper/left pixel position of the character cell on frame F
-   at ROW/COL.  */
-#define CHAR_TO_PIXEL_ROW(f, row) \
-  ((f)->output_data.w32->internal_border_width \
-   + (row) * (f)->output_data.w32->line_height)
-#define CHAR_TO_PIXEL_COL(f, col) \
-  ((f)->output_data.w32->internal_border_width \
-   + (col) * FONT_WIDTH ((f)->output_data.w32->font))
-
-/* Return the pixel width/height of frame F if it has
-   WIDTH columns/HEIGHT rows.  */
-#define CHAR_TO_PIXEL_WIDTH(f, width) \
-  (CHAR_TO_PIXEL_COL (f, width) \
-   + (f)->output_data.w32->vertical_scroll_bar_extra \
-   + (f)->output_data.w32->internal_border_width)
-#define CHAR_TO_PIXEL_HEIGHT(f, height) \
-  (CHAR_TO_PIXEL_ROW (f, height) \
-   + (f)->output_data.w32->internal_border_width)
-
-
-/* Return the row/column (zero-based) of the character cell containing 
-   the pixel on FRAME at ROW/COL.  */
-#define PIXEL_TO_CHAR_ROW(f, row) \
-  (((row) - (f)->output_data.w32->internal_border_width) \
-   / (f)->output_data.w32->line_height)
-#define PIXEL_TO_CHAR_COL(f, col) \
-  (((col) - (f)->output_data.w32->internal_border_width) \
-   / FONT_WIDTH ((f)->output_data.w32->font))
-
-/* How many columns/rows of text can we fit in WIDTH/HEIGHT pixels on
-   frame F?  */
-#define PIXEL_TO_CHAR_WIDTH(f, width) \
-  (PIXEL_TO_CHAR_COL (f, ((width) \
-                         - (f)->output_data.w32->internal_border_width \
-                         - (f)->output_data.w32->vertical_scroll_bar_extra)))
-#define PIXEL_TO_CHAR_HEIGHT(f, height) \
-  (PIXEL_TO_CHAR_ROW (f, ((height) \
-                         - (f)->output_data.w32->internal_border_width)))
-\f
-/* Interface to the face code functions.  */
-
-/* Create the first two computed faces for a frame -- the ones that
-   have GC's.  */
-extern void init_frame_faces (/* FRAME_PTR */);
-
-/* Free the resources for the faces associated with a frame.  */
-extern void free_frame_faces (/* FRAME_PTR */);
-
-/* Given a computed face, find or make an equivalent display face
-   in face_vector, and return a pointer to it.  */
-extern struct face *intern_face (/* FRAME_PTR, struct face * */);
-
-/* Given a frame and a face name, return the face's ID number, or
-   zero if it isn't a recognized face name.  */
-extern int face_name_id_number (/* FRAME_PTR, Lisp_Object */);
-
-/* Return non-zero if FONT1 and FONT2 have the same size bounding box.
-   We assume that they're both character-cell fonts.  */
-extern int same_size_fonts (/* XFontStruct *, XFontStruct * */);
-
-/* Recompute the GC's for the default and modeline faces.
-   We call this after changing frame parameters on which those GC's
-   depend.  */
-extern void recompute_basic_faces (/* FRAME_PTR */);
-
-/* Return the face ID associated with a buffer position POS.  Store
-   into *ENDPTR the next position at which a different face is
-   needed.  This does not take account of glyphs that specify their
-   own face codes.  F is the frame in use for display, and W is a
-   window displaying the current buffer.
-
-   REGION_BEG, REGION_END delimit the region, so it can be highlighted.  */
-extern int compute_char_face (/* FRAME_PTR frame,
-                                struct window *w,
-                                int pos,
-                                int region_beg, int region_end,
-                                int *endptr */);
-/* Return the face ID to use to display a special glyph which selects
-   FACE_CODE as the face ID, assuming that ordinarily the face would
-   be BASIC_FACE.  F is the frame.  */
-extern int compute_glyph_face (/* FRAME_PTR, int */);
-

 extern void w32_fill_rect ();
 extern void w32_clear_window ();
 
 extern void w32_fill_rect ();
 extern void w32_clear_window ();
 


@@ -580,36 +586,54 @@ extern void w32_clear_window ();
 }
 
 #define w32_clear_rect(f,hdc,lprect) \
 }
 
 #define w32_clear_rect(f,hdc,lprect) \

-w32_fill_rect (f,hdc,f->output_data.w32->background_pixel,lprect)
+w32_fill_rect (f,hdc,f->output_data.x->background_pixel,lprect)

 
 

-#define w32_clear_area(f,hdc,x,y,nx,ny) \
-w32_fill_area (f,hdc,f->output_data.w32->background_pixel,x,y,nx,ny)
+#define w32_clear_area(f,hdc,px,py,nx,ny) \
+w32_fill_area (f,hdc,f->output_data.x->background_pixel,px,py,nx,ny)

 
 

-extern XFontStruct *w32_load_font ();
+extern struct font_info *w32_load_font ();

 extern void w32_unload_font ();
 
 /* Define for earlier versions of Visual C */
 #ifndef WM_MOUSEWHEEL
 extern void w32_unload_font ();
 
 /* Define for earlier versions of Visual C */
 #ifndef WM_MOUSEWHEEL

-#define WM_MOUSEWHEEL                  (0x020A)
+#define WM_MOUSEWHEEL                 (WM_MOUSELAST + 1)

 #endif /* WM_MOUSEWHEEL */
 #endif /* WM_MOUSEWHEEL */

+#ifndef MSH_MOUSEWHEEL
+#define MSH_MOUSEWHEEL                "MSWHEEL_ROLLMSG"
+#endif /* MSH_MOUSEWHEEL */
+#ifndef WM_XBUTTONDOWN
+#define WM_XBUTTONDOWN                 (WM_MOUSEWHEEL + 1)
+#define WM_XBUTTONUP                   (WM_MOUSEWHEEL + 2)
+#endif /* WM_XBUTTONDOWN */

 
 #define WM_EMACS_START                 (WM_USER + 1)
 
 #define WM_EMACS_START                 (WM_USER + 1)

-#define WM_EMACS_KILL                  (WM_EMACS_START + 0x00)
-#define WM_EMACS_CREATEWINDOW          (WM_EMACS_START + 0x01)
-#define WM_EMACS_DONE                  (WM_EMACS_START + 0x02)
-#define WM_EMACS_CREATESCROLLBAR       (WM_EMACS_START + 0x03)
-#define WM_EMACS_SHOWWINDOW            (WM_EMACS_START + 0x04)
-#define WM_EMACS_SETWINDOWPOS          (WM_EMACS_START + 0x05)
-#define WM_EMACS_DESTROYWINDOW         (WM_EMACS_START + 0x06)
-#define WM_EMACS_TRACKPOPUPMENU        (WM_EMACS_START + 0x07)
-#define WM_EMACS_SETFOCUS              (WM_EMACS_START + 0x08)
-#define WM_EMACS_END                   (WM_EMACS_START + 0x10)
-
-#define WND_FONTWIDTH_INDEX    (0) 
-#define WND_LINEHEIGHT_INDEX   (4) 
-#define WND_BORDER_INDEX       (8) 
-#define WND_SCROLLBAR_INDEX    (12) 
-#define WND_BACKGROUND_INDEX   (16) 
+#define WM_EMACS_KILL                  (WM_EMACS_START + 0)
+#define WM_EMACS_CREATEWINDOW          (WM_EMACS_START + 1)
+#define WM_EMACS_DONE                  (WM_EMACS_START + 2)
+#define WM_EMACS_CREATESCROLLBAR       (WM_EMACS_START + 3)
+#define WM_EMACS_SHOWWINDOW            (WM_EMACS_START + 4)
+#define WM_EMACS_SETWINDOWPOS          (WM_EMACS_START + 5)
+#define WM_EMACS_DESTROYWINDOW         (WM_EMACS_START + 6)
+#define WM_EMACS_TRACKPOPUPMENU        (WM_EMACS_START + 7)
+#define WM_EMACS_SETFOCUS              (WM_EMACS_START + 8)
+#define WM_EMACS_SETFOREGROUND         (WM_EMACS_START + 9)
+#define WM_EMACS_SETLOCALE             (WM_EMACS_START + 10)
+#define WM_EMACS_SETKEYBOARDLAYOUT     (WM_EMACS_START + 11)
+#define WM_EMACS_REGISTER_HOT_KEY      (WM_EMACS_START + 12)
+#define WM_EMACS_UNREGISTER_HOT_KEY    (WM_EMACS_START + 13)
+#define WM_EMACS_TOGGLE_LOCK_KEY       (WM_EMACS_START + 14)
+#define WM_EMACS_TRACK_CARET           (WM_EMACS_START + 15)
+#define WM_EMACS_DESTROY_CARET         (WM_EMACS_START + 16)
+#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 WND_FONTWIDTH_INDEX    (0)
+#define WND_LINEHEIGHT_INDEX   (4)
+#define WND_BORDER_INDEX       (8)
+#define WND_SCROLLBAR_INDEX    (12)
+#define WND_BACKGROUND_INDEX   (16)

 #define WND_LAST_INDEX         (20)
 
 #define WND_EXTRA_BYTES     (WND_LAST_INDEX)
 #define WND_LAST_INDEX         (20)
 
 #define WND_EXTRA_BYTES     (WND_LAST_INDEX)


@@ -641,6 +665,8 @@ extern CRITICAL_SECTION critsect;
 extern void init_crit ();
 extern void delete_crit ();
 
 extern void init_crit ();
 extern void delete_crit ();
 

+extern void signal_quit ();
+

 #define enter_crit() EnterCriticalSection (&critsect)
 #define leave_crit() LeaveCriticalSection (&critsect)
 
 #define enter_crit() EnterCriticalSection (&critsect)
 #define leave_crit() LeaveCriticalSection (&critsect)
 


@@ -649,6 +675,8 @@ extern void deselect_palette (struct frame * f, HDC hdc);
 extern HDC get_frame_dc (struct frame * f);
 extern int release_frame_dc (struct frame * f, HDC hDC);
 
 extern HDC get_frame_dc (struct frame * f);
 extern int release_frame_dc (struct frame * f, HDC hDC);
 

+extern void drain_message_queue ();
+

 extern BOOL get_next_msg ();
 extern BOOL post_msg ();
 extern void complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result);
 extern BOOL get_next_msg ();
 extern BOOL post_msg ();
 extern void complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result);


@@ -679,3 +707,54 @@ extern BOOL parse_button ();
 #define VK_RWIN                        0x5C
 #define VK_APPS                        0x5D
 #endif
 #define VK_RWIN                        0x5C
 #define VK_APPS                        0x5D
 #endif

+
+/* Support for treating Windows and Apps keys as modifiers.  These
+   constants must not overlap with any of the dwControlKeyState flags in
+   KEY_EVENT_RECORD.  */
+#define LEFT_WIN_PRESSED       0x8000
+#define RIGHT_WIN_PRESSED      0x4000
+#define APPS_PRESSED           0x2000
+
+/* When compiling on Windows 9x/ME and NT 3.x, the following are not defined
+   (even though they are supported on 98 and ME.  */
+#ifndef WM_MOUSELEAVE
+#define WM_MOUSELEAVE 0x02A3
+#define TME_LEAVE 0x00000002;
+
+typedef struct tagTRACKMOUSEEVENT
+{
+  DWORD cbSize;
+  DWORD dwFlags;
+  HWND hwndTrack;
+  DWORD dwHoverTime;
+} TRACKMOUSEEVENT;
+#endif
+
+struct image;
+struct face;
+
+XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
+struct frame * check_x_frame (Lisp_Object);
+Lisp_Object vga_stdcolor_name (int);
+
+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,
+    IN UINT,
+    IN UINT_PTR,
+    IN LPCWSTR);
+
+/* arch-tag: f201d05a-1240-4fc5-8ea4-ca24d4ee5671
+   (do not change this comment) */