diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-05-09 18:12:22 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-05-19 19:50:32 -0600 |
| commit | 462b1fd7185ab8866c8db15b6e7a9b865e4d2389 (patch) | |
| tree | b1fd61f503943b3ab7da24877033a3170cdfbef0 /src/nsgui.h | |
| parent | 44d577925e0f5679d417028799db47a1f5d0fd03 (diff) | |
| download | emacs-462b1fd7185ab8866c8db15b6e7a9b865e4d2389.tar.gz | |
Introduce Emacs_Rectangle struct and typedef
* src/dispextern.h [HAVE_X_WINDOWS]: Alias Emacs_Rectangle to
XRectangle.
[!HAVE_X_WINDOWS]: Define Emacs_Rectangle struct.
Use Emacs_Rectangle over XRectangle.
* src/frame.h (MonitorInfo):
* src/msdos.h:
* src/w32term.c:
* src/xdisp.c: Use Emacs_Rectangle over XRectangle.
* src/nsgui.h:
* src/w32gui.h: Remove old XRectangle structs.
* src/xdisp.c:
* src/nsgui.h:
* src/w32gui.h: Rename CONVERT_FROM_XRECT and CONVERT_TO_XRECT to
CONVERT_FROM_EMACS_RECT and CONVERT_TO_EMACS_RECT respectively.
Diffstat (limited to 'src/nsgui.h')
| -rw-r--r-- | src/nsgui.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/nsgui.h b/src/nsgui.h index c6f0f4b0eae..592e21f60af 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -109,14 +109,6 @@ typedef void *Emacs_Cursor; typedef int Window; - -/* Some sort of attempt to normalize rectangle handling. Seems a bit - much for what is accomplished. */ -typedef struct { - int x, y; - unsigned width, height; -} XRectangle; - #ifndef __OBJC__ #if defined (__LP64__) && __LP64__ typedef double CGFloat; @@ -130,13 +122,13 @@ typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect; #define NativeRectangle NSRect -#define CONVERT_TO_XRECT(xr, nr) \ +#define CONVERT_TO_EMACS_RECT(xr, nr) \ ((xr).x = (nr).origin.x, \ (xr).y = (nr).origin.y, \ (xr).width = (nr).size.width, \ (xr).height = (nr).size.height) -#define CONVERT_FROM_XRECT(xr, nr) \ +#define CONVERT_FROM_EMACS_RECT(xr, nr) \ ((nr).origin.x = (xr).x, \ (nr).origin.y = (xr).y, \ (nr).size.width = (xr).width, \ |