rename the Client struct to ObClient

[chaz/openbox] / openbox / dispatch.h

diff --git a/openbox/dispatch.h b/openbox/dispatch.h
index 794c0f4492da11c2b25c10302714e6fbe9130332..320c46a67a99f756c9f98c342ee255a05e6b8218 100644 (file)
--- a/openbox/dispatch.h
+++ b/openbox/dispatch.h
@@ -18,34 +18,64 @@ typedef enum {
     Event_X_Bell          = 1 << 7, /* an XKB bell event */
 
     Event_Client_New      = 1 << 8, /* new window, before mapping */
-    Event_Client_Mapped   = 1 << 9, /* new window, after mapping */
+    Event_Client_Mapped   = 1 << 9, /* new window, after mapping
+                                       or uniconified */
     Event_Client_Destroy  = 1 << 10, /* unmanaged */
-    Event_Client_Focus    = 1 << 11, /* focused */
-    Event_Client_Unfocus  = 1 << 12, /* unfocused */
-    Event_Client_Urgent   = 1 << 13, /* entered/left urgent state */
-    Event_Client_Visible  = 1 << 14, /* shown/hidden (not on a workspace or
-                                        show-the-desktop change though) */
+    Event_Client_Unmapped = 1 << 11, /* unmanaged, after unmapping
+                                        or iconified */
+    Event_Client_Focus    = 1 << 12, /* focused */
+    Event_Client_Unfocus  = 1 << 13, /* unfocused */
+    Event_Client_Urgent   = 1 << 14, /* entered/left urgent state */
+    Event_Client_Desktop  = 1 << 15, /* moved to a new desktop */
+    Event_Client_Moving   = 1 << 16, /* being interactively moved */
+    Event_Client_Resizing = 1 << 17, /* being interactively resized */
 
-    Event_Ob_Desktop      = 1 << 15, /* changed desktops */
-    Event_Ob_NumDesktops  = 1 << 16, /* changed the number of desktops */
-    Event_Ob_ShowDesktop  = 1 << 17, /* entered/left show-the-desktop mode */
-    Event_Ob_Startup      = 1 << 18, /* startup under way */
-    Event_Ob_Shutdown     = 1 << 19, /* shutdown under way */
+    Event_Ob_Desktop      = 1 << 18, /* changed desktops */
+    Event_Ob_NumDesktops  = 1 << 19, /* changed the number of desktops */
+    Event_Ob_ShowDesktop  = 1 << 20, /* entered/left show-the-desktop mode */
 
-    Event_Signal          = 1 << 20, /* a signal from the OS */
+    Event_Signal          = 1 << 21, /* a signal from the OS */
 
-    EVENT_RANGE           = 1 << 21
+    EVENT_RANGE           = 1 << 22
 } EventType;
 
 typedef struct {
     XEvent *e;
-    Client *client;
+    ObClient *client;
 } EventData_X;
 
-typedef union {
-    EventData_X x; /* for Event_X_* event types */
-    Client *client; /* for Event_Client_* event types */
+typedef struct {
+    ObClient *client;
+    int num[3];
+    /* Event_ObClient_Desktop: num[0] = new number, num[1] = old number
+       Event_ObClient_Urgent: num[0] = urgent state
+       Event_ObClient_Moving: num[0] = dest x coord, num[1] = dest y coord --
+                            change these in the handler to adjust where the
+                            window will be placed
+       Event_ObClient_Resizing: num[0] = dest width, num[1] = dest height --
+                              change these in the handler to adjust where the
+                              window will be placed
+                              num[2] = the anchored corner
+     */
+} EventData_ObClient;
+
+typedef struct {
+    int num[2];
+    /* Event_Ob_Desktop: num[0] = new number, num[1] = old number
+       Event_Ob_NumDesktops: num[0] = new number, num[1] = old number
+       Event_Ob_ShowDesktop: num[0] = new show-desktop mode
+     */
+} EventData_Ob;
+
+typedef struct {
     int signal;
+} EventData_Signal;
+
+typedef struct {
+    EventData_X x;      /* for Event_X_* event types */
+    EventData_ObClient c; /* for Event_ObClient_* event types */
+    EventData_Ob o;     /* for Event_Ob_* event types */
+    EventData_Signal s; /* for Event_Signal */
 } EventData;
 
 typedef struct {
@@ -53,15 +83,21 @@ typedef struct {
     EventData data;
 } ObEvent;
 
-typedef void (*EventHandler)(const ObEvent *e);
+typedef void (*EventHandler)(const ObEvent *e, void *data);
 
 typedef unsigned int EventMask;
 
-void dispatch_register(EventHandler h, EventMask mask);
+void dispatch_register(EventMask mask, EventHandler h, void *data);
 
-void dispatch_x(XEvent *e, Client *c);
-void dispatch_client(EventType e, Client *c);
-void dispatch_ob(EventType e);
+void dispatch_x(XEvent *e, ObClient *c);
+void dispatch_client(EventType e, ObClient *c, int num0, int num1);
+void dispatch_ob(EventType e, int num0, int num1);
 void dispatch_signal(int signal);
+/* *x and *y should be set with the destination of the window, they may be
+   changed by the event handlers */
+void dispatch_move(ObClient *c, int *x, int *y);
+/* *w and *h should be set with the destination of the window, they may be
+   changed by the event handlers */
+void dispatch_resize(ObClient *c, int *w, int *h, ObCorner corner);
 
 #endif