[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/pgtk 964dfcf 062/100: * src/pgtkgui.h: change coding style
From: |
Yuuki Harano |
Subject: |
feature/pgtk 964dfcf 062/100: * src/pgtkgui.h: change coding style |
Date: |
Tue, 24 Nov 2020 08:02:38 -0500 (EST) |
branch: feature/pgtk
commit 964dfcf46222d9d834da936f5cef7aa3c3c29bd9
Author: Yuuki Harano <masm+github@masm11.me>
Commit: Jeff Walsh <jeff.walsh@drtusers-MacBook-Pro.local>
* src/pgtkgui.h: change coding style
---
src/pgtkgui.h | 72 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 37 insertions(+), 35 deletions(-)
diff --git a/src/pgtkgui.h b/src/pgtkgui.h
index be9fb25..0855920 100644
--- a/src/pgtkgui.h
+++ b/src/pgtkgui.h
@@ -45,7 +45,7 @@ typedef unichar XChar2b;
typedef struct _GdkCursor *Emacs_Cursor;
-typedef void * Color;
+typedef void *Color;
typedef int Window;
typedef struct _GdkDisplay Display;
@@ -55,31 +55,12 @@ typedef void *XrmDatabase;
/* some sort of attempt to normalize rectangle handling.. seems a bit much
for what is accomplished */
-typedef struct {
- int x, y;
- unsigned width, height;
+typedef struct
+{
+ int x, y;
+ unsigned width, height;
} XRectangle;
-#define NativeRectangle XRectangle
-
-#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_EMACS_RECT(xr, nr) \
- ((nr).x = (xr).x, \
- (nr).y = (xr).y, \
- (nr).width = (xr).width, \
- (nr).height = (xr).height)
-
-#define STORE_NATIVE_RECT(nr, px, py, pwidth, pheight) \
- ((nr).x = (px), \
- (nr).y = (py), \
- (nr).width = (pwidth), \
- (nr).height = (pheight))
-
/* This stuff needed by frame.c. */
#define ForgetGravity 0
#define NorthWestGravity 1
@@ -102,16 +83,37 @@ typedef struct {
#define XNegative 0x0010
#define YNegative 0x0020
-#define USPosition (1L << 0) /* user specified x, y */
-#define USSize (1L << 1) /* user specified width, height */
+#define USPosition (1L << 0) /* user specified x, y */
+#define USSize (1L << 1) /* user specified width, height */
-#define PPosition (1L << 2) /* program specified position */
-#define PSize (1L << 3) /* program specified size */
-#define PMinSize (1L << 4) /* program specified minimum size */
-#define PMaxSize (1L << 5) /* program specified maximum size */
-#define PResizeInc (1L << 6) /* program specified resize increments */
-#define PAspect (1L << 7) /* program specified min, max aspect
ratios */
-#define PBaseSize (1L << 8) /* program specified base for incrementing */
-#define PWinGravity (1L << 9) /* program specified window gravity */
+#define PPosition (1L << 2) /* program specified position */
+#define PSize (1L << 3) /* program specified size */
+#define PMinSize (1L << 4) /* program specified minimum size */
+#define PMaxSize (1L << 5) /* program specified maximum size */
+#define PResizeInc (1L << 6) /* program specified resize increments
*/
+#define PAspect (1L << 7) /* program specified min, max
aspect ratios */
+#define PBaseSize (1L << 8) /* program specified base for
incrementing */
+#define PWinGravity (1L << 9) /* program specified window gravity */
+
+
+#define NativeRectangle XRectangle
+
+#define CONVERT_TO_EMACS_RECT(xr, nr) \
+ ((xr).x = (nr).x, \
+ (xr).y = (nr).y, \
+ (xr).width = (nr).width, \
+ (xr).height = (nr).height)
+
+#define CONVERT_FROM_EMACS_RECT(xr, nr) \
+ ((nr).x = (xr).x, \
+ (nr).y = (xr).y, \
+ (nr).width = (xr).width, \
+ (nr).height = (xr).height)
+
+#define STORE_NATIVE_RECT(nr, px, py, pwidth, pheight) \
+ ((nr).x = (px), \
+ (nr).y = (py), \
+ (nr).width = (pwidth), \
+ (nr).height = (pheight))
-#endif /* __PGTKGUI_H__ */
+#endif /* __PGTKGUI_H__ */
- feature/pgtk 209c611 063/100: * src/pgtkterm.h: Remove unused code, (continued)
- feature/pgtk 209c611 063/100: * src/pgtkterm.h: Remove unused code, Yuuki Harano, 2020/11/24
- feature/pgtk 04bfe70 048/100: implement popup/context menu, Yuuki Harano, 2020/11/24
- feature/pgtk d899fc1 087/100: Fix tooltips don't hide on events, Yuuki Harano, 2020/11/24
- feature/pgtk 640f770 088/100: Fix mouse cursor doesn't appear on motion events on xwidgets, Yuuki Harano, 2020/11/24
- feature/pgtk d437aab 092/100: Avoid gtk warnings on X, Yuuki Harano, 2020/11/24
- feature/pgtk 886fcb2 096/100: Update copyright dates for PGTK files, Yuuki Harano, 2020/11/24
- feature/pgtk d6ef9af 100/100: Fix crash when .schema.xml is not installed, Yuuki Harano, 2020/11/24
- feature/pgtk 12cc104 009/100: Cleanup x_* to gui_ to match upstream work, Yuuki Harano, 2020/11/24
- feature/pgtk fde74fa 028/100: implement pgtk-frame-list-z-order same as frame-list., Yuuki Harano, 2020/11/24
- feature/pgtk c9e6b44 044/100: Some work toward posframe on wayland, Yuuki Harano, 2020/11/24
- feature/pgtk 964dfcf 062/100: * src/pgtkgui.h: change coding style,
Yuuki Harano <=
- feature/pgtk da3c351 019/100: border_color/pixel width, Yuuki Harano, 2020/11/24
- feature/pgtk 014d56f 052/100: * src/pgtkterm.c: Remove incorrect mark_object call., Yuuki Harano, 2020/11/24
- feature/pgtk bc35a1e 032/100: Make multipdisplay work by limiting selection while enabed, Yuuki Harano, 2020/11/24
- feature/pgtk d68633b 056/100: * src/pgtkterm.c (pgtk_defined_color): support gtk special colors, Yuuki Harano, 2020/11/24
- feature/pgtk 6957f94 024/100: Add PGTK support for fullscreen, Yuuki Harano, 2020/11/24
- feature/pgtk ae3bb14 029/100: implement restacking and cleanup frame z order, Yuuki Harano, 2020/11/24
- feature/pgtk 49645df 047/100: minimize gtkutil.c differences., Yuuki Harano, 2020/11/24
- feature/pgtk d2a29e8 040/100: emacsclient should use both of DISPLAY and WAYLAND_DISPLAY., Yuuki Harano, 2020/11/24
- feature/pgtk be47e34 077/100: Re-port image drawing code from X, Yuuki Harano, 2020/11/24
- feature/pgtk 0b69b73 085/100: Fix crash when child frame updates toolbar, Yuuki Harano, 2020/11/24