From e119ad0d84d2bd7568b4ddc7955d22797171df20 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 21 Mar 2003 13:49:57 +0000 Subject: [PATCH] (No_Cursor): Define as 0 for Mac. (XRectangle): Add X compatible rectangle type. (NativeRectangle): Declare as Rect for Mac. (CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros. --- src/macgui.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/macgui.h b/src/macgui.h index f0ae1c36397..3e11f2b3d40 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -30,6 +30,8 @@ typedef int Display; /* fix later */ typedef unsigned long Time; +#define No_Cursor (0) /* fix later */ + #if MAC_OSX typedef struct OpaqueWindowPtr* Window; #else @@ -169,5 +171,30 @@ XCreateGC (void *, Window, unsigned long, XGCValues *); 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_MACGUI_H */ -- 2.39.2