(Version, mh-version): Update for release 8.0.

[gnu-emacs] / src / msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index 76b133582da373d77b6f66aab2f8e7b045ec113b..8bfbcf2d10c55cd1402bf4c4acce45673d95cb77 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,5 +1,6 @@
 /* MS-DOS specific C utilities, interface.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,11 +16,11 @@ 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
-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.  */
 
-#ifndef _MSDOS_H_
-#define _MSDOS_H_
+#ifndef EMACS_MSDOS_H
+#define EMACS_MSDOS_H
 
 #include <dpmi.h>
 
@@ -80,19 +81,21 @@ struct display_info
 
   /* Nonzero means defer mouse-motion highlighting.  */
   int mouse_face_defer;
+
+  /* Nonzero means that the mouse highlight should not be shown.  */
+  int mouse_face_hidden;
 };
 
+typedef struct display_info Display_Info;
+
 /* This is a cut-down version of the one in xterm.h, which see.  */
 struct x_output
 {
-  int left_pos;                        /* used in xmenu_show (xmenu.c) */
-  int top_pos;                 /* ditto */
-  int line_height;             /* used in x-popup-menu (xmenu.c) */
   PIX_TYPE background_pixel;   /* used in xfaces.c and lots of other places */
   PIX_TYPE foreground_pixel;   /* ditto */
   XFontStruct *font;           /* used in x-popup-menu (xmenu.c) */
-  Window busy_window;          /* currently unused (but maybe some day) */
-  unsigned busy_p : 1;         /* ditto */
+  Window hourglass_window;     /* currently unused (but maybe some day) */
+  unsigned hourglass_p : 1;    /* ditto */
   struct display_info display_info; /* used for drawing mouse highlight */
 };
 
@@ -104,22 +107,12 @@ extern struct x_output the_only_x_display;
 #define FRAME_FONT(f) (the_only_x_display.font)
 #define FRAME_X_DISPLAY_INFO(f) (&the_only_x_display.display_info)
 
-#define FRAME_INTERNAL_BORDER_WIDTH(f) (0)
-
 /* Prototypes.  */
 
 /* Forward declarations for prototypes.  */
 struct frame;
 struct window;
 
-/* From xterm.c; emulated on msdos.c */
-
-extern void pixel_to_glyph_coords P_ ((struct frame *f, int pix_x, int pix_y,
-                                      int *x, int *y, XRectangle *bounds,
-                                      int noclip));
-extern void glyph_to_pixel_coords P_ ((struct frame *f, int x, int y,
-                                      int *pix_x, int *pix_y));
-
 /* Defined in xfns.c; emulated on msdos.c */
 
 extern int have_menus_p P_ ((void));
@@ -131,8 +124,8 @@ extern int x_pixel_height P_ ((struct frame *));
 #define x_destroy_bitmap(p1,p2)
 #define load_pixmap(p1,p2,p3,p4) (0)
 #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9)
-#define DisplayWidth(p1,p2) (SELECTED_FRAME()->width)
-#define DisplayHeight(p1,p2) (SELECTED_FRAME()->height)
+#define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols)
+#define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines)
 #define XMenuSetAEQ (void)
 #define XMenuSetFreeze (void)
 #define XMenuRecompute (void)
@@ -161,9 +154,12 @@ int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *);
 void XMenuLocate (Display *, XMenu *, int, int, int, int,
                  int *, int *, int *, int *);
 int XMenuActivate (Display *, XMenu *, int *, int *, int, int, unsigned,
-                  char **, void (*callback)(char *));
+                  char **, void (*callback)(char *, int, int));
 void XMenuDestroy (Display *, XMenu *);
 
 #endif /* not HAVE_X_WINDOWS */
 
-#endif /* not _MSDOS_H_ */
+#endif /* not EMACS_MSDOS_H */
+
+/* arch-tag: ad21eeed-8fdb-4357-8007-36368a6bdbf3
+   (do not change this comment) */