X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdispatch.h;h=396558db121e9ae92c202706e6b74d397c374249;hb=4ed3fb89150d05e6fa134798315269c62de1bed9;hp=73220ce612603532a2434dbb6f6f60d7097c58b9;hpb=21c1cd4cb68659d3206056881be5bc15e6c00ae9;p=chaz%2Fopenbox

diff --git a/openbox/dispatch.h b/openbox/dispatch.h
index 73220ce6..396558db 100644
--- a/openbox/dispatch.h
+++ b/openbox/dispatch.h
@@ -15,7 +15,7 @@ typedef enum {
     Event_X_ButtonPress   = 1 << 4, /* mouse button pressed */
     Event_X_ButtonRelease = 1 << 5, /* mouse button released */
     Event_X_MotionNotify  = 1 << 6, /* mouse motion */
-    Event_X_Bell          = 1 << 7, /* an XKB bell event
+    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 */
@@ -29,12 +29,10 @@ typedef enum {
     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_Signal          = 1 << 20, /* a signal from the OS */
+    Event_Signal          = 1 << 18, /* a signal from the OS */
 
-    EVENT_RANGE           = 1 << 21
+    EVENT_RANGE           = 1 << 19
 } EventType;
 
 typedef struct {
@@ -53,11 +51,11 @@ 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);