add actions for key/mouse bindings etc

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index fcc7fd6ae2a2e6820ede0bf1df35409ceb5ff3ed..c8d33e833faa911e3cc9c04f8cb8aed4ed7e96ee 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -7,6 +7,7 @@
 #include "event.h"
 #include "focus.h"
 #include "stacking.h"
+#include "dispatch.h"
 
 #include <glib.h>
 #include <X11/Xutil.h>
@@ -194,10 +195,12 @@ void client_manage(Window window)
 
     screen_update_struts();
 
-    /*HOOKFIRECLIENT(managed, client);XXX*/
+    dispatch_client(Event_Client_New, client, 0, 0);
 
     client_showhide(client);
 
+    dispatch_client(Event_Client_Mapped, client, 0, 0);
+
     /* grab all mouse bindings */
     /*pointer_grab_all(client, TRUE);XXX*/
 
@@ -220,7 +223,7 @@ void client_unmanage(Client *client)
 
     g_message("Unmanaging window: %lx", client->window);
 
-    /*HOOKFIRECLIENT(closed, client);XXX*/
+    dispatch_client(Event_Client_Destroy, client, 0, 0);
 
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, client->window, SetModeDelete);
@@ -923,7 +926,7 @@ void client_update_wmhints(Client *self)
        /* fire the urgent callback if we're mapped, otherwise, wait until
           after we're mapped */
        if (self->frame)
-           /*HOOKFIRECLIENT(urgent, self)XXX*/;
+            dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
     }
 }
 
@@ -1217,8 +1220,6 @@ static void client_showhide(Client *self)
         engine_frame_show(self->frame);
     else
         engine_frame_hide(self->frame);
-
-    /*HOOKFIRECLIENT(visible, self);XXX*/
 }
 
 gboolean client_normal(Client *self) {
@@ -1243,7 +1244,7 @@ static void client_apply_startup_state(Client *self)
        client_shade(self, TRUE);
     }
     if (self->urgent)
-       /*HOOKFIRECLIENT(urgent, self)XXX*/;
+        dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
   
     if (self->max_vert && self->max_horz) {
        self->max_vert = self->max_horz = FALSE;
@@ -1623,16 +1624,17 @@ void client_close(Client *self)
     XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
 }
 
-void client_set_desktop(Client *self, unsigned int target)
+void client_set_desktop(Client *self, guint target)
 {
+    guint old;
+
     if (target == self->desktop) return;
   
     g_message("Setting desktop %u\n", target);
 
-    if (!(target < screen_num_desktops ||
-         target == DESKTOP_ALL))
-       return;
+    g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
 
+    old = self->desktop;
     self->desktop = target;
     PROP_SET32(self->window, net_wm_desktop, cardinal, target);
     /* the frame can display the current desktop state */
@@ -1640,6 +1642,8 @@ void client_set_desktop(Client *self, unsigned int target)
     /* 'move' the window to the new desktop */
     client_showhide(self);
     screen_update_struts();
+
+    dispatch_client(Event_Client_Desktop, self, target, old);
 }
 
 static Client *search_modal_tree(Client *node, Client *skip)