Merge from emacs--rel--22

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

diff --git a/src/msdos.h b/src/msdos.h
index a919bf6..59e75ca 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,11 +1,12 @@
 /* MS-DOS specific C utilities, interface.
 /* MS-DOS specific C utilities, interface.

-   Copyright (C) 1993, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007, 2008 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,8 +16,8 @@ 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.  */

 
 #ifndef EMACS_MSDOS_H
 #define EMACS_MSDOS_H
 
 #ifndef EMACS_MSDOS_H
 #define EMACS_MSDOS_H


@@ -52,7 +53,7 @@ typedef int Pixmap;
 typedef int Display;
 typedef int Window;
 typedef int XRectangle;
 typedef int Display;
 typedef int Window;
 typedef int XRectangle;

-#define PIX_TYPE int
+#define PIX_TYPE unsigned long

 #define XDISPLAY
 
 /* A stripped version of struct x_display_info in xterm.h, which see.  */
 #define XDISPLAY
 
 /* A stripped version of struct x_display_info in xterm.h, which see.  */


@@ -90,9 +91,6 @@ typedef struct display_info Display_Info;
 /* This is a cut-down version of the one in xterm.h, which see.  */
 struct x_output
 {
 /* 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) */
   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) */


@@ -108,9 +106,6 @@ extern struct x_output the_only_x_display;
 #define FRAME_BACKGROUND_PIXEL(f) (the_only_x_display.background_pixel)
 #define FRAME_FONT(f) (the_only_x_display.font)
 #define FRAME_X_DISPLAY_INFO(f) (&the_only_x_display.display_info)
 #define FRAME_BACKGROUND_PIXEL(f) (the_only_x_display.background_pixel)
 #define FRAME_FONT(f) (the_only_x_display.font)
 #define FRAME_X_DISPLAY_INFO(f) (&the_only_x_display.display_info)

-#define FRAME_LINE_HEIGHT(f) (the_only_x_display.line_height)
-
-#define FRAME_INTERNAL_BORDER_WIDTH(f) (0)

 
 /* Prototypes.  */
 
 
 /* Prototypes.  */
 


@@ -118,17 +113,8 @@ extern struct x_output the_only_x_display;
 struct frame;
 struct window;
 
 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 */
 
 /* Defined in xfns.c; emulated on msdos.c */
 

-extern int have_menus_p P_ ((void));

 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
 extern int x_pixel_width P_ ((struct frame *));
 extern int x_pixel_height P_ ((struct frame *));
 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
 extern int x_pixel_width P_ ((struct frame *));
 extern int x_pixel_height P_ ((struct frame *));


@@ -137,8 +123,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 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)
 #define XMenuSetAEQ (void)
 #define XMenuSetFreeze (void)
 #define XMenuRecompute (void)


@@ -173,3 +159,6 @@ void XMenuDestroy (Display *, XMenu *);
 #endif /* not HAVE_X_WINDOWS */
 
 #endif /* not EMACS_MSDOS_H */
 #endif /* not HAVE_X_WINDOWS */
 
 #endif /* not EMACS_MSDOS_H */

+
+/* arch-tag: ad21eeed-8fdb-4357-8007-36368a6bdbf3
+   (do not change this comment) */