X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3b15de48202c4f6b1ba16ef665cfc13e6a6ef66c..b78f97676f9c1e47c127275ae542f344f300310d:/src/w32gui.h
diff --git a/src/w32gui.h b/src/w32gui.h
index ba7b5c584a..07a6fed0b4 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,12 +1,13 @@
/* 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, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+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)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,30 +15,26 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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. */
+along with GNU Emacs. If not, see . */
#ifndef EMACS_W32GUI_H
#define EMACS_W32GUI_H
#include
-#include "w32bdf.h"
-typedef struct W32FontStruct {
- TEXTMETRIC tm;
- HFONT hfont;
- bdffont *bdf;
- int double_byte_p;
-} W32FontStruct;
+/* Local memory management for menus. */
+#define local_heap (GetProcessHeap ())
+#define local_alloc(n) (HeapAlloc (local_heap, HEAP_ZERO_MEMORY, (n)))
+#define local_free(p) (HeapFree (local_heap, 0, ((LPVOID) (p))))
-typedef struct W32FontStruct XFontStruct;
+#define malloc_widget_value() ((widget_value *) local_alloc (sizeof (widget_value)))
+#define free_widget_value(wv) (local_free ((wv)))
/* Emulate X GC's by keeping color and font info in a structure. */
typedef struct _XGCValues
{
COLORREF foreground;
COLORREF background;
- XFontStruct * font;
+ struct font *font;
} XGCValues;
#define GCForeground 0x01
@@ -47,12 +44,38 @@ typedef struct _XGCValues
typedef HBITMAP Pixmap;
typedef HBITMAP Bitmap;
+typedef char * XrmDatabase;
+
typedef XGCValues * GC;
typedef COLORREF Color;
typedef DWORD Time;
typedef HWND Window;
+typedef HDC Display; /* HDC so it doesn't conflict with xpm lib. */
typedef HCURSOR Cursor;
+#define No_Cursor (0)
+
+#define XChar2b wchar_t
+
+/* Dealing with bits of wchar_t as if they were an XChar2b. */
+#define STORE_XCHAR2B(chp, byte1, byte2) \
+ ((*chp) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
+
+#define XCHAR2B_BYTE1(chp) \
+ (((*chp) & 0xff00) >> 8)
+
+#define XCHAR2B_BYTE2(chp) \
+ ((*chp) & 0x00ff)
+
+
+/* Windows equivalent of XImage. */
+typedef struct _XImage
+{
+ unsigned char * data;
+ BITMAPINFO info;
+ /* Optional RGBQUAD array for palette follows (see BITMAPINFO docs). */
+} XImage;
+
#define FACE_DEFAULT (~0)
extern HINSTANCE hinst;
@@ -97,4 +120,34 @@ extern int nCmdShow;
extern int XParseGeometry ();
+
+typedef struct {
+ int x, y;
+ unsigned width, height;
+} XRectangle;
+
+#define NativeRectangle RECT
+
+#define CONVERT_TO_XRECT(xr,nr) \
+ ((xr).x = (nr).left, \
+ (xr).y = (nr).top, \
+ (xr).width = ((nr).right - (nr).left), \
+ (xr).height = ((nr).bottom - (nr).top))
+
+#define CONVERT_FROM_XRECT(xr,nr) \
+ ((nr).left = (xr).x, \
+ (nr).top = (xr).y, \
+ (nr).right = ((xr).x + (xr).width), \
+ (nr).bottom = ((xr).y + (xr).height))
+
+#define STORE_NATIVE_RECT(nr,x,y,width,height) \
+ ((nr).left = (x), \
+ (nr).top = (y), \
+ (nr).right = ((nr).left + (width)), \
+ (nr).bottom = ((nr).top + (height)))
+
+
#endif /* EMACS_W32GUI_H */
+
+/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
+ (do not change this comment) */