(enum fringe_bitmap_type): Define here.

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

diff --git a/src/xterm.h b/src/xterm.h
index ea64955..3c8bee6 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1,5 +1,6 @@
 /* Definitions and headers for communication with X protocol.
 /* Definitions and headers for communication with X protocol.

-   Copyright (C) 1989, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2001
+   Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -29,11 +30,25 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>    /* CoreP.h needs this */
 #include <X11/CoreP.h>         /* foul, but we need this to use our own
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>    /* CoreP.h needs this */
 #include <X11/CoreP.h>         /* foul, but we need this to use our own

-                                  window inside a widget instead of one 
+                                  window inside a widget instead of one

                                   that Xt creates... */
 #include <X11/StringDefs.h>
                                   that Xt creates... */
 #include <X11/StringDefs.h>

+
+typedef Widget xt_or_gtk_widget;

 #endif
 
 #endif
 

+#ifdef USE_GTK
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+/* Some definitions to reduce conditionals.  */
+typedef GtkWidget *xt_or_gtk_widget;
+#define XtParent(x) (gtk_widget_get_parent (x))
+#undef XSync
+#define XSync(d, b) gdk_window_process_all_updates ()
+
+#endif /* USE_GTK */
+

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


@@ -64,7 +79,7 @@ Boston, MA 02111-1307, USA.  */
 #ifdef PBaseSize
 /* AIX 3.1's X is somewhere between X11R3 and X11R4.  It has
    PBaseSize, but not XWithdrawWindow, XSetWMName, XSetWMNormalHints,
 #ifdef PBaseSize
 /* AIX 3.1's X is somewhere between X11R3 and X11R4.  It has
    PBaseSize, but not XWithdrawWindow, XSetWMName, XSetWMNormalHints,

-   XSetWMIconName.  
+   XSetWMIconName.

    AIX 3.2 is at least X11R4.  */
 #if (!defined AIX) || (defined AIX3_2)
 #define HAVE_X11R4
    AIX 3.2 is at least X11R4.  */
 #if (!defined AIX) || (defined AIX3_2)
 #define HAVE_X11R4


@@ -77,8 +92,7 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_X11R4
 #endif
 
 #define HAVE_X11R4
 #endif
 

-#ifdef HAVE_X11R5
-#define HAVE_X_I18N
+#ifdef HAVE_X_I18N

 #include <X11/Xlocale.h>
 #endif
 \f
 #include <X11/Xlocale.h>
 #endif
 \f


@@ -107,33 +121,6 @@ Boston, MA 02111-1307, USA.  */
    | EnterWindowMask           \
    | VisibilityChangeMask)
 
    | EnterWindowMask           \
    | VisibilityChangeMask)
 

-/* This checks to make sure we have a display.  */
-extern void check_x ();
-
-extern struct frame *x_window_to_frame ();
-
-#ifdef USE_X_TOOLKIT
-extern struct frame *x_any_window_to_frame ();
-extern struct frame *x_non_menubar_window_to_frame ();
-extern struct frame *x_top_window_to_frame ();
-#endif
-
-extern Visual *select_visual ();
-
-enum text_cursor_kinds {
-  filled_box_cursor, hollow_box_cursor, bar_cursor
-};
-
-/* This data type is used for the font_table field
-   of struct x_display_info.  */
-
-struct font_info
-{
-  XFontStruct *font;
-  char *name;
-  char *full_name;
-};
-

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


@@ -153,32 +140,51 @@ struct x_display_info
 {
   /* Chain of all x_display_info structures.  */
   struct x_display_info *next;
 {
   /* Chain of all x_display_info structures.  */
   struct x_display_info *next;

+

   /* Connection number (normally a file descriptor number).  */
   int connection;
   /* Connection number (normally a file descriptor number).  */
   int connection;

+

   /* This says how to access this display in Xlib.  */
   Display *display;
   /* This says how to access this display in Xlib.  */
   Display *display;

+

   /* 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;

+

   /* The Screen this connection is connected to.  */
   Screen *screen;
   /* The Screen this connection is connected to.  */
   Screen *screen;

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

   /* The Visual being used for this display.  */
   Visual *visual;
   /* The Visual being used for this display.  */
   Visual *visual;

+
+  /* The colormap being used.  */
+  Colormap cmap;
+

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

+

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

+

   /* 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;
   /* 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;

+

   /* X Resource data base */
   XrmDatabase xrdb;
 
   /* X Resource data base */
   XrmDatabase xrdb;
 


@@ -188,18 +194,28 @@ struct x_display_info
   /* The current capacity of x_font_table.  */
   int font_table_size;
 
   /* The current capacity of x_font_table.  */
   int font_table_size;
 

+  /* 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. */
   GC scratch_cursor_gc;
 
   /* Reusable Graphics Context for drawing a cursor in a non-default face. */
   GC 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.  */
+  /* 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.  */


@@ -213,11 +229,16 @@ struct x_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 *x_id_name;
 
   /* The number of fonts actually stored in x_font_table.
   char *x_id_name;
 
   /* The number of fonts actually stored in x_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 iff 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.  */


@@ -255,24 +276,40 @@ struct x_display_info
 
   /* Communication with window managers.  */
   Atom Xatom_wm_protocols;
 
   /* Communication with window managers.  */
   Atom Xatom_wm_protocols;

+

   /* Kinds of protocol things we may receive.  */
   Atom Xatom_wm_take_focus;
   Atom Xatom_wm_save_yourself;
   Atom Xatom_wm_delete_window;
   /* Kinds of protocol things we may receive.  */
   Atom Xatom_wm_take_focus;
   Atom Xatom_wm_save_yourself;
   Atom Xatom_wm_delete_window;

+

   /* Atom for indicating window state to the window manager.  */
   Atom Xatom_wm_change_state;
   /* Atom for indicating window state to the window manager.  */
   Atom Xatom_wm_change_state;

+

   /* Other WM communication */
   Atom Xatom_wm_configure_denied; /* When our config request is denied */
   Atom Xatom_wm_window_moved;     /* When the WM moves us.  */
   /* Other WM communication */
   Atom Xatom_wm_configure_denied; /* When our config request is denied */
   Atom Xatom_wm_window_moved;     /* When the WM moves us.  */

+

   /* EditRes protocol */
   Atom Xatom_editres;
   /* EditRes protocol */
   Atom Xatom_editres;

-  /* Atom `FONT' */
-  Atom Xatom_FONT;

 
   /* More atoms, which are selection types.  */
   Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE,
 
   /* More atoms, which are selection types.  */
   Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE,

+  Xatom_COMPOUND_TEXT, Xatom_UTF8_STRING,

   Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL,
   Xatom_ATOM_PAIR;
   Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL,
   Xatom_ATOM_PAIR;

+
+  /* More atoms for font properties.  The last three are private
+     properties, see the comments in src/fontset.h.  */
+  Atom Xatom_PIXEL_SIZE,
+  Xatom_MULE_BASELINE_OFFSET, Xatom_MULE_RELATIVE_COMPOSE,
+  Xatom_MULE_DEFAULT_ASCENT;
+
+  /* More atoms for Ghostscript support.  */
+  Atom Xatom_DONE, Xatom_PAGE;
+
+  /* Atom used in toolkit scroll bar client messages.  */
+  Atom Xatom_Scrollbar;
+

 #ifdef MULTI_KBOARD
   struct kboard *kboard;
 #endif
 #ifdef MULTI_KBOARD
   struct kboard *kboard;
 #endif


@@ -297,8 +334,40 @@ struct x_display_info
      frame.  It differs from x_focus_frame when we're using a global
      minibuffer.  */
   struct frame *x_highlight_frame;
      frame.  It differs from x_focus_frame when we're using a global
      minibuffer.  */
   struct frame *x_highlight_frame;

+
+  /* The null pixel used for filling a character background with
+     background color of a gc.  */
+  Pixmap null_pixel;
+
+  /* The gray pixmap.  */
+  Pixmap gray;
+
+  /* Cache of images.  */
+  struct image_cache *image_cache;
+
+#ifdef HAVE_X_I18N
+  /* XIM (X Input method).  */
+  XIM xim;
+  XIMStyles *xim_styles;
+#endif
+
+  /* If non-null, a cache of the colors in the color map.  Don't
+     use this directly, call x_color_cells instead.  */
+  XColor *color_cells;
+  int ncolor_cells;

 };
 
 };
 

+/* This checks to make sure we have a display.  */
+extern void check_x P_ ((void));
+
+extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int));
+
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int));
+extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int));
+extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int));
+#endif
+

 /* This is a chain of structures for all the X displays currently in use.  */
 extern struct x_display_info *x_display_list;
 
 /* This is a chain of structures for all the X displays currently in use.  */
 extern struct x_display_info *x_display_list;
 


@@ -308,10 +377,23 @@ extern struct x_display_info *x_display_list;
    FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
 extern Lisp_Object x_display_name_list;
 
    FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
 extern Lisp_Object x_display_name_list;
 

-extern struct x_display_info *x_display_info_for_display ();
-extern struct x_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;
+
+/* A flag to control how to display unibyte 8-bit character.  */
+extern int unibyte_display_via_language_environment;

 
 

-extern struct x_display_info *x_term_init ();
+extern struct x_display_info *x_display_info_for_display P_ ((Display *));
+extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
+
+extern struct x_display_info *x_term_init P_ ((Lisp_Object, char *, char *));
+
+extern Lisp_Object x_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
+extern void select_visual P_ ((struct x_display_info *));
+extern struct font_info *x_get_font_info P_ ((struct frame *f, int));
+extern struct font_info *x_load_font P_ ((struct frame *, char *, int));
+extern struct font_info *x_query_font P_ ((struct frame *, char *));
+extern void x_find_ccl_program P_ ((struct font_info *));

 \f
 /* Each X frame object points to its own struct x_output object
    in the output_data.x field.  The x_output structure contains
 \f
 /* Each X frame object points to its own struct x_output object
    in the output_data.x field.  The x_output structure contains


@@ -335,6 +417,10 @@ struct x_output
      if the menubar is turned off.  */
   int menubar_height;
 
      if the menubar is turned off.  */
   int menubar_height;
 

+  /* Height of tool bar widget, in pixels.
+     Zero if not using an external tool bar.  */
+  int toolbar_height;
+

   /* Height of a line, in pixels.  */
   int line_height;
 
   /* Height of a line, in pixels.  */
   int line_height;
 


@@ -378,12 +464,40 @@ struct x_output
   Widget menubar_widget;
 #endif
 
   Widget menubar_widget;
 #endif
 

+#ifdef USE_GTK
+  /* The widget of this screen.  This is the window of a top widget.  */
+  GtkWidget *widget;
+  /* The widget of the edit portion of this screen; the window in
+     "window_desc" is inside of this.  */
+  GtkWidget *edit_widget;
+  /* The widget used for laying out widgets vertically.  */
+  GtkWidget *vbox_widget;
+  /* The menubar in this frame.  */
+  GtkWidget *menubar_widget;
+  /* The tool bar in this frame  */
+  GtkWidget *toolbar_widget;
+  /* The handle box that makes the tool bar detachable.  */
+  GtkWidget *handlebox_widget;
+
+  /* The last size hints set.  */
+  GdkGeometry size_hints;
+  long hint_flags;
+#endif
+

   /* If >=0, a bitmap index.  The indicated bitmap is used for the
      icon. */
   int icon_bitmap;
 
   /* If >=0, a bitmap index.  The indicated bitmap is used for the
      icon. */
   int icon_bitmap;
 

+  /* 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.  */
   unsigned long background_pixel;
   /* Pixel values used for various purposes.
      border_pixel may be -1 meaning use a gray tile.  */
   unsigned long background_pixel;


@@ -393,25 +507,37 @@ struct x_output
   unsigned long mouse_pixel;
   unsigned long cursor_foreground_pixel;
 
   unsigned long mouse_pixel;
   unsigned long cursor_foreground_pixel;
 

+  /* Foreground color for scroll bars.  A value of -1 means use the
+     default (black for non-toolkit scroll bars).  */
+  unsigned long 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).  */
+  unsigned long scroll_bar_background_pixel;
+
+  /* Top and bottom shadow colors for 3d toolkit scrollbars.  -1 means
+     let the scroll compute them itself.  */
+  unsigned long scroll_bar_top_shadow_pixel;
+  unsigned long scroll_bar_bottom_shadow_pixel;
+

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

+  Cursor hourglass_cursor;
+  Cursor horizontal_drag_cursor;

 
 

-  /* Flag to set when the X window needs to be completely repainted.  */
-  int needs_exposure;
-
-  /* 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;
+  /* Window whose cursor is hourglass_cursor.  This window is temporarily
+     mapped to display an hourglass cursor.  */
+  Window hourglass_window;

 
 

-  /* 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;
+  /* Non-zero means hourglass cursor is currently displayed.  */
+  unsigned hourglass_p : 1;

 
 

-  /* Width of bar cursor (if we are using that).  */
-  int cursor_width;
+  /* Flag to set when the X window needs to be completely repainted.  */
+  int needs_exposure;

 
   /* These are the current window manager hints.  It seems that
      XSetWMHints, when presented with an unset bit in the `flags'
 
   /* These are the current window manager hints.  It seems that
      XSetWMHints, when presented with an unset bit in the `flags'


@@ -430,20 +556,11 @@ struct x_output
      scroll bars, in pixels.  */
   int vertical_scroll_bar_extra;
 
      scroll bars, in pixels.  */
   int vertical_scroll_bar_extra;
 

-  /* Table of parameter faces for this frame.  Any X 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 X 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 */
+  /* The extra width currently allotted for the areas in which
+     truncation marks, continuation marks, and overlay arrows are
+     displayed.  */
+  int left_fringe_width, right_fringe_width;
+  int fringe_cols, fringes_extra;

 
   /* This is the gravity value for the specified window position.  */
   int win_gravity;
 
   /* This is the gravity value for the specified window position.  */
   int win_gravity;


@@ -470,35 +587,123 @@ struct x_output
   /* Nonzero means tried already to make this frame visible.  */
   char asked_for_visible;
 
   /* Nonzero means tried already to make this frame visible.  */
   char asked_for_visible;
 

+  /* Nonzero if this frame was ever previously visible.  */
+  char has_been_visible;
+

 #ifdef HAVE_X_I18N
 #ifdef HAVE_X_I18N

-  /* Input method. */
-  XIM xim;

   /* Input context (currently, this means Compose key handler setup).  */
   XIC xic;
   /* Input context (currently, this means Compose key handler setup).  */
   XIC xic;

+  XIMStyle xic_style;
+  XFontSet xic_xfs;

 #endif
 #endif

+
+  /* Relief GCs, colors etc.  */
+  struct relief
+  {
+    GC 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;
+
+  /* Xt waits for a ConfigureNotify event from the window manager in
+     EmacsFrameSetCharSize when the shell widget is resized.  For some
+     window managers like fvwm2 2.2.5 and KDE 2.1 this event doesn't
+     arrive for an unknown reason and Emacs hangs in Xt.  If this is
+     zero, tell Xt not to wait.  */
+  int wait_for_wm;
+
+  /* See enum below */
+  int want_fullscreen;
+
+  /* This many pixels are the difference between the outer window (i.e. the
+     left of the window manager decoration) and FRAME_X_WINDOW. */
+  int x_pixels_diff;
+
+  /* This many pixels are the difference between the outer window (i.e. the
+     top of the window manager titlebar) and FRAME_X_WINDOW. */
+  int y_pixels_diff;
+
+  /* As x_pixels_diff, but to FRAME_OUTER_WINDOW.  For some reason the
+     two might differ by a pixel, depending on WM */
+  int x_pixels_outer_diff;
+
+  /* As y_pixels_diff, but to FRAME_OUTER_WINDOW.  In the toolkit version,
+     these may differ because this does not take into account possible
+     menubar.  y_pixels_diff is with menubar height included */
+  int y_pixels_outer_diff;
+
+  /* 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;

 };
 
 };
 

-/* Get at the computed faces of an X window frame.  */
-#define FRAME_PARAM_FACES(f) ((f)->output_data.x->param_faces)
-#define FRAME_N_PARAM_FACES(f) ((f)->output_data.x->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])
+enum
+{
+  /* Values used as a bit mask, BOTH == WIDTH | HEIGHT.  */
+  FULLSCREEN_NONE       = 0,
+  FULLSCREEN_WIDTH      = 1,
+  FULLSCREEN_HEIGHT     = 2,
+  FULLSCREEN_BOTH       = 3,
+  FULLSCREEN_WAIT       = 4,
+  FULLSCREEN_MOVE_WAIT  = 8,
+};
+
+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
+};

 
 

-#define FRAME_COMPUTED_FACES(f) ((f)->output_data.x->computed_faces)
-#define FRAME_N_COMPUTED_FACES(f) ((f)->output_data.x->n_computed_faces)
-#define FRAME_SIZE_COMPUTED_FACES(f) ((f)->output_data.x->size_computed_faces)
-#define FRAME_DEFAULT_FACE(f) ((f)->output_data.x->computed_faces[0])
-#define FRAME_MODE_LINE_FACE(f) ((f)->output_data.x->computed_faces[1])

 
 

-/* Return the window associated with the frame F.  */
+/* Return the X window used for displaying data in frame F.  */

 #define FRAME_X_WINDOW(f) ((f)->output_data.x->window_desc)
 
 #define FRAME_X_WINDOW(f) ((f)->output_data.x->window_desc)
 

-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
+/* Return the outermost X window associated with the frame F.  */
+#ifdef USE_X_TOOLKIT
+#define FRAME_OUTER_WINDOW(f) ((f)->output_data.x->widget ?             \
+                               XtWindow ((f)->output_data.x->widget) :  \
+                               FRAME_X_WINDOW (f))
+#else
+#ifdef USE_GTK
+#define GTK_WIDGET_TO_X_WIN(w) \
+  ((w) && (w)->window ? GDK_WINDOW_XWINDOW ((w)->window) : 0)
+
+#define FRAME_GTK_OUTER_WIDGET(f) ((f)->output_data.x->widget)
+#define FRAME_GTK_WIDGET(f) ((f)->output_data.x->edit_widget)
+#define FRAME_OUTER_WINDOW(f)                                   \
+       (FRAME_GTK_OUTER_WIDGET (f) ?                            \
+        GTK_WIDGET_TO_X_WIN (FRAME_GTK_OUTER_WIDGET (f)) :      \
+         FRAME_X_WINDOW (f))
+
+#else /* !USE_GTK */
+#define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f))
+#endif /* !USE_GTK */
+#endif
+
+

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

+#define FRAME_FONTSET(f) ((f)->output_data.x->fontset)

 #define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width)
 #define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width)

+#define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height)
+#define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height)

 #define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height)
 
 #define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height)
 

+/* Width of the default font of frame F.  Must be defined by each
+   terminal specific header.  */
+#define FRAME_DEFAULT_FONT_WIDTH(F)    FONT_WIDTH (FRAME_FONT (F))
+

 /* This gives the x_display_info structure for the display F is on.  */
 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info)
 
 /* This gives the x_display_info structure for the display F is on.  */
 #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info)
 


@@ -507,15 +712,70 @@ struct x_output
 
 /* This is the `Screen *' which frame F is on.  */
 #define FRAME_X_SCREEN(f) (FRAME_X_DISPLAY_INFO (f)->screen)
 
 /* This is the `Screen *' which frame F is on.  */
 #define FRAME_X_SCREEN(f) (FRAME_X_DISPLAY_INFO (f)->screen)

+#define FRAME_X_SCREEN_NUMBER(f) XScreenNumberOfScreen (FRAME_X_SCREEN (f))
+
+/* This is the Visual which frame F is on.  */
+#define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual
+
+/* This is the Colormap which frame F uses.  */
+#define FRAME_X_COLORMAP(f) FRAME_X_DISPLAY_INFO (f)->cmap
+
+/* This is the 'font_info *' which frame F has.  */
+#define FRAME_X_FONT_TABLE(f) (FRAME_X_DISPLAY_INFO (f)->font_table)

 
 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}.  */
 #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width)
 #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height)
 
 
 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}.  */
 #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width)
 #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height)
 

-#define FRAME_DESIRED_CURSOR(f) ((f)->output_data.x->desired_cursor)
+/* The difference in pixels between the top left corner of the
+   Emacs window (including possible window manager decorations)
+   and FRAME_X_WINDOW (f).  */
+#define FRAME_OUTER_TO_INNER_DIFF_X(f) \
+     ((f)->output_data.x->x_pixels_outer_diff)
+#define FRAME_OUTER_TO_INNER_DIFF_Y(f)          \
+     ((f)->output_data.x->y_pixels_outer_diff   \
+      + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f))
+

 
 

-#define FRAME_XIM(f) ((f)->output_data.x->xim)

 #define FRAME_XIC(f) ((f)->output_data.x->xic)
 #define FRAME_XIC(f) ((f)->output_data.x->xic)

+#define FRAME_X_XIM(f) (FRAME_X_DISPLAY_INFO (f)->xim)
+#define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles)
+#define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)
+#define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)
+
+/* Value is the smallest width of any character in any font on frame F.  */
+
+#define FRAME_SMALLEST_CHAR_WIDTH(F) \
+     FRAME_X_DISPLAY_INFO(F)->smallest_char_width
+
+/* Value is the smallest height of any font on frame F.  */
+
+#define FRAME_SMALLEST_FONT_HEIGHT(F) \
+     FRAME_X_DISPLAY_INFO(F)->smallest_font_height
+
+/* Return a pointer to the image cache of frame F.  */
+
+#define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache
+
+\f
+/* Total width of fringes reserved for drawing truncation bitmaps,
+   continuation bitmaps and alike.  The width is in canonical char
+   units of the frame.  This must currently be the case because window
+   sizes aren't pixel values.  If it weren't the case, we wouldn't be
+   able to split windows horizontally nicely.  */
+
+#define FRAME_X_FRINGE_COLS(F) ((F)->output_data.x->fringe_cols)
+
+/* Total width of fringes in pixels.  */
+
+#define FRAME_X_FRINGE_WIDTH(F) ((F)->output_data.x->fringes_extra)
+
+/* Pixel-width of the left and right fringe.  */
+
+#define FRAME_X_LEFT_FRINGE_WIDTH(F) ((F)->output_data.x->left_fringe_width)
+#define FRAME_X_RIGHT_FRINGE_WIDTH(F) ((F)->output_data.x->right_fringe_width)
+
+

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


@@ -527,8 +787,8 @@ struct x_output
    We use struct scroll_bar as a template for accessing fields of the
    vector.  */
 
    We use struct scroll_bar as a template for accessing fields of the
    vector.  */
 

-struct scroll_bar {
-
+struct scroll_bar
+{

   /* These fields are shared by all vectors.  */
   EMACS_INT size_from_Lisp_Vector_struct;
   struct Lisp_Vector *next_from_Lisp_Vector_struct;
   /* These fields are shared by all vectors.  */
   EMACS_INT size_from_Lisp_Vector_struct;
   struct Lisp_Vector *next_from_Lisp_Vector_struct;


@@ -594,11 +854,21 @@ struct scroll_bar {
 #define SET_SCROLL_BAR_X_WINDOW(ptr, id) \
   (SCROLL_BAR_UNPACK ((ptr)->x_window_low, (ptr)->x_window_high, (int) id))
 
 #define SET_SCROLL_BAR_X_WINDOW(ptr, id) \
   (SCROLL_BAR_UNPACK ((ptr)->x_window_low, (ptr)->x_window_high, (int) id))
 

+/* Extract the X widget of the scroll bar from a struct scroll_bar.
+   XtWindowToWidget should be fast enough since Xt uses a hash table
+   to map windows to widgets.  */
+
+#define SCROLL_BAR_X_WIDGET(dpy, ptr) \
+  XtWindowToWidget (dpy, SCROLL_BAR_X_WINDOW (ptr))
+
+/* Store a widget id in a struct scroll_bar.  */
+
+#define SET_SCROLL_BAR_X_WIDGET(ptr, w)                \
+  do {                                         \
+    Window window = XtWindow (w);              \
+    SET_SCROLL_BAR_X_WINDOW (ptr, window);     \
+} while (0)

 
 

-/* 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.x->line_height)

 
 /* 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.  */


@@ -610,7 +880,7 @@ struct scroll_bar {
 
 /* 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
 
    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


@@ -645,7 +915,7 @@ struct scroll_bar {
 
 /* Trimming off a few pixels from each side prevents
    text from glomming up against the scroll bar */
 
 /* Trimming off a few pixels from each side prevents
    text from glomming up against the scroll bar */

-#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (2)
+#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)

 
 \f
 /* Manipulating pixel sizes and character sizes.
 
 \f
 /* Manipulating pixel sizes and character sizes.


@@ -666,13 +936,14 @@ struct scroll_bar {
 #define CHAR_TO_PIXEL_WIDTH(f, width) \
   (CHAR_TO_PIXEL_COL (f, width) \
    + (f)->output_data.x->vertical_scroll_bar_extra \
 #define CHAR_TO_PIXEL_WIDTH(f, width) \
   (CHAR_TO_PIXEL_COL (f, width) \
    + (f)->output_data.x->vertical_scroll_bar_extra \

+   + (f)->output_data.x->fringes_extra \

    + (f)->output_data.x->internal_border_width)
 #define CHAR_TO_PIXEL_HEIGHT(f, height) \
   (CHAR_TO_PIXEL_ROW (f, height) \
    + (f)->output_data.x->internal_border_width)
 
 
    + (f)->output_data.x->internal_border_width)
 #define CHAR_TO_PIXEL_HEIGHT(f, height) \
   (CHAR_TO_PIXEL_ROW (f, height) \
    + (f)->output_data.x->internal_border_width)
 
 

-/* Return the row/column (zero-based) of the character cell containing 
+/* 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.x->internal_border_width) \
    the pixel on FRAME at ROW/COL.  */
 #define PIXEL_TO_CHAR_ROW(f, row) \
   (((row) - (f)->output_data.x->internal_border_width) \


@@ -686,16 +957,18 @@ struct scroll_bar {
 #define PIXEL_TO_CHAR_WIDTH(f, width) \
   (PIXEL_TO_CHAR_COL (f, ((width) \
                          - (f)->output_data.x->internal_border_width \
 #define PIXEL_TO_CHAR_WIDTH(f, width) \
   (PIXEL_TO_CHAR_COL (f, ((width) \
                          - (f)->output_data.x->internal_border_width \

+                         - (f)->output_data.x->fringes_extra \

                          - (f)->output_data.x->vertical_scroll_bar_extra)))
 #define PIXEL_TO_CHAR_HEIGHT(f, height) \
   (PIXEL_TO_CHAR_ROW (f, ((height) \
                          - (f)->output_data.x->internal_border_width)))
                          - (f)->output_data.x->vertical_scroll_bar_extra)))
 #define PIXEL_TO_CHAR_HEIGHT(f, height) \
   (PIXEL_TO_CHAR_ROW (f, ((height) \
                          - (f)->output_data.x->internal_border_width)))

+

 \f
 \f

-/* If a struct input_event has a kind which is selection_request_event
-   or selection_clear_event, then its contents are really described
+/* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT
+   or SELECTION_CLEAR_EVENT, then its contents are really described

    by this structure.  */
 
    by this structure.  */
 

-/* For an event of kind selection_request_event,
+/* For an event of kind SELECTION_REQUEST_EVENT,

    this structure really describes the contents.
    **Don't make this struct longer!**
    If it overlaps the frame_or_window field of struct input_event,
    this structure really describes the contents.
    **Don't make this struct longer!**
    If it overlaps the frame_or_window field of struct input_event,


@@ -725,45 +998,171 @@ struct selection_input_event
   (((struct selection_input_event *) (eventp))->time)
 
 \f
   (((struct selection_input_event *) (eventp))->time)
 
 \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 */);
+struct window;
+struct glyph_matrix;
+struct frame;
+struct input_event;
+struct face;
+struct image;
+
+/* From xselect.c.  */
+
+void x_handle_selection_notify P_ ((XSelectionEvent *));
+void x_handle_property_notify P_ ((XPropertyEvent *));
+
+/* From xfns.c.  */
+
+Lisp_Object display_x_get_resource P_ ((struct x_display_info *,
+                                       Lisp_Object, Lisp_Object,
+                                       Lisp_Object, Lisp_Object));
+struct frame *check_x_frame P_ ((Lisp_Object));
+EXFUN (Fx_display_color_p, 1);
+EXFUN (Fx_display_grayscale_p, 1);
+int image_ascent P_ ((struct image *, struct face *));
+extern void x_free_gcs P_ ((struct frame *));
+
+/* From xrdb.c.  */
+
+char *x_get_string_resource P_ ((XrmDatabase, char *, char *));
+char *x_get_customization_string P_ ((XrmDatabase, char *, char *));
+XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *));
+int x_get_resource P_ ((XrmDatabase, char *, char *,
+                       XrmRepresentation, XrmValue *));
+void x_delete_display P_ ((struct x_display_info *));
+void x_make_frame_visible P_ ((struct frame *));
+void x_iconify_frame P_ ((struct frame *));
+void x_wm_set_size_hint P_ ((struct frame *, long, int));
+void x_set_offset P_ ((struct frame *, int, int, int));
+void x_wm_set_icon_position P_ ((struct frame *, int, int));
+int x_catch_errors P_ ((Display *));
+int x_had_errors_p P_ ((Display *));
+void x_uncatch_errors P_ ((Display *, int));
+void x_check_errors P_ ((Display *, char *));
+int x_text_icon P_ ((struct frame *, char *));
+int x_bitmap_icon P_ ((struct frame *, Lisp_Object));
+void x_set_window_size P_ ((struct frame *, int, int, int));
+void x_wm_set_window_state P_ ((struct frame *, int));
+int x_alloc_nearest_color P_ ((struct frame *, Colormap, XColor *));
+
+extern void pixel_to_glyph_coords P_ ((struct frame *, int, int,
+                                      int *, int *, XRectangle *, int));
+
+/* Defined in xterm.c */
+
+extern void cancel_mouse_face P_ ((struct frame *));
+extern void x_scroll_bar_clear P_ ((struct frame *));
+extern void x_start_queuing_selection_requests P_ ((Display *));
+extern void x_stop_queuing_selection_requests P_ ((Display *));
+extern void x_update_cursor P_ ((struct frame *, int));
+extern int x_text_icon P_ ((struct frame *, char *));
+extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object));
+extern int x_catch_errors P_ ((Display *));
+extern void x_check_errors P_ ((Display *, char *));
+extern int x_had_errors_p P_ ((Display *));
+extern void x_uncatch_errors P_ ((Display *, int));
+extern Lisp_Object x_new_font P_ ((struct frame *, char *));
+extern Lisp_Object x_new_fontset P_ ((struct frame *, char *));
+extern void x_compute_fringe_widths P_ ((struct frame *, int));
+extern void x_set_offset P_ ((struct frame *, int, int, int));
+extern void x_set_window_size P_ ((struct frame *, int, int, int));
+extern void x_set_mouse_position P_ ((struct frame *, int, int));
+extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));
+extern void x_raise_frame P_ ((struct frame *));
+extern void x_lower_frame P_ ((struct frame *));
+extern void x_make_frame_visible P_ ((struct frame *));
+extern void x_make_frame_invisible P_ ((struct frame *));
+extern void x_iconify_frame P_ ((struct frame *));
+extern void x_free_frame_resources P_ ((struct frame *));
+extern void x_destroy_window P_ ((struct frame *));
+extern void x_wm_set_size_hint P_ ((struct frame *, long, int));
+extern void x_wm_set_window_state P_ ((struct frame *, int));
+extern void x_wm_set_icon_pixmap P_ ((struct frame *, int));
+extern void x_wm_set_icon_position P_ ((struct frame *, int, int));
+extern void x_delete_display P_ ((struct x_display_info *));
+extern void x_initialize P_ ((void));
+extern void x_display_cursor P_ ((struct window *, int, int, int, int, int));
+extern unsigned long x_copy_color P_ ((struct frame *, unsigned long));
+#ifdef USE_X_TOOLKIT
+extern XtAppContext Xt_app_con;
+#endif
+extern void x_query_colors P_ ((struct frame *f, XColor *, int));
+extern void x_query_color P_ ((struct frame *f, XColor *));
+extern void x_clear_area P_ ((Display *, Window, int, int, int, int, int));
+
+extern void x_fullscreen_adjust P_ ((struct frame *f, int *, int *,
+                                     int *, int *));
+
+extern int x_dispatch_event P_ ((XEvent *, Display *));
+
+/* Defined in xselect.c */
+
+extern void x_handle_property_notify P_ ((XPropertyEvent *));
+extern void x_handle_selection_notify P_ ((XSelectionEvent *));
+extern void x_handle_selection_request P_ ((struct input_event *));
+extern void x_handle_selection_clear P_ ((struct input_event *));
+extern void x_clear_frame_selections P_ ((struct frame *));
+
+/* Defined in xfns.c */
+
+extern int have_menus_p P_ ((void));
+extern int x_bitmap_height P_ ((struct frame *, int));
+extern int x_bitmap_width P_ ((struct frame *, int));
+extern int x_bitmap_pixmap P_ ((struct frame *, int));
+extern void x_reference_bitmap P_ ((struct frame *, int));
+extern int x_create_bitmap_from_data P_ ((struct frame *, char *,
+                                         unsigned int, unsigned int));
+extern int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object));
+extern void x_destroy_bitmap P_ ((struct frame *, int));
+extern void x_set_frame_parameters P_ ((struct frame *, Lisp_Object));
+extern void x_real_positions P_ ((struct frame *, int *, int *));
+extern void x_report_frame_params P_ ((struct frame *, Lisp_Object *));
+extern int defined_color P_ ((struct frame *, char *, XColor *, int));
+extern void x_set_border_pixel P_ ((struct frame *, int));
+extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
+extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,
+                                         int *, int *));
+extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
+extern void create_frame_xic P_ ((struct frame *));
+extern void destroy_frame_xic P_ ((struct frame *));
+extern void xic_set_preeditarea P_ ((struct window *, int, int));
+extern void xic_set_statusarea P_ ((struct frame *));
+extern void xic_set_xfontset P_ ((struct frame *, char *));
+extern int x_pixel_width P_ ((struct frame *));
+extern int x_pixel_height P_ ((struct frame *));
+extern int x_char_width P_ ((struct frame *));
+extern int x_char_height P_ ((struct frame *));
+extern int x_screen_planes P_ ((struct frame *));
+extern void x_sync P_ ((struct frame *));
+extern int x_defined_color P_ ((struct frame *, char *, XColor *, int));
+#ifdef HAVE_X_I18N
+extern void free_frame_xic P_ ((struct frame *));
+#endif
+extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
+
+/* Defined in xfaces.c */
+
+extern int frame_update_line_height P_ ((struct frame *));
+extern int compute_glyph_face P_ ((struct frame *, int, int));
+extern int compute_glyph_face_1 P_ ((struct frame *, Lisp_Object, int));
+extern void x_free_dpy_colors P_ ((Display *, Screen *, Colormap,
+                                  unsigned long *, int));
+
+/* Defined in xmenu.c */
+
+extern void x_activate_menubar P_ ((struct frame *));
+extern int popup_activated P_ ((void));
+extern void initialize_frame_menubar P_ ((struct frame *));
+
+/* Defined in widget.c */
+
+#ifdef USE_X_TOOLKIT
+extern void widget_store_internal_border P_ ((Widget));
+#endif
+
+/* Defined in xsmfns.c */
+#ifdef HAVE_X_SM
+extern void x_session_initialize P_ ((void));
+extern int x_session_check_input P_ ((struct input_event *bufp,
+                                      int *numchars));
+extern int x_session_have_connection P_ ((void));
+#endif