add actions for key/mouse bindings etc

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 2b95a598ea21c57c5e0cb56ea53d7168771f102f..c8d33e833faa911e3cc9c04f8cb8aed4ed7e96ee 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -7,11 +7,9 @@
 #include "event.h"
 #include "focus.h"
 #include "stacking.h"
-#include "pointer.h"
-#include "hooks.h"
-#include "openboxwrap.h"
-#include "clientwrap.h"
+#include "dispatch.h"
 
+#include <glib.h>
 #include <X11/Xutil.h>
 
 /*! The event mask to grab on client windows */
@@ -32,6 +30,7 @@ static void client_get_state(Client *self);
 static void client_get_shaped(Client *self);
 static void client_get_mwm_hints(Client *self);
 static void client_get_gravity(Client *self);
+static void client_showhide(Client *self);
 static void client_change_allowed_actions(Client *self);
 static void client_change_state(Client *self);
 static Client *search_focus_tree(Client *node, Client *skip);
@@ -121,7 +120,6 @@ void client_manage(Window window)
     XWindowAttributes attrib;
     XSetWindowAttributes attrib_set;
 /*    XWMHints *wmhint; */
-    PyObject *cw;
      
     XGrabServer(ob_display);
     XSync(ob_display, FALSE);
@@ -197,17 +195,14 @@ void client_manage(Window window)
 
     screen_update_struts();
 
-    /* add to the python list */
-    cw = clientwrap_new(client);
-    PyList_Append(openboxwrap_obj->client_list, cw);
-    Py_DECREF(cw);
-
-    HOOKFIRECLIENT(managed, client);
+    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);
+    /*pointer_grab_all(client, TRUE);XXX*/
 
     /* update the list hints */
     client_set_list();
@@ -223,13 +218,12 @@ void client_unmanage_all()
 
 void client_unmanage(Client *client)
 {
-    int j, seq;
-    PyObject *cw;
+    int j;
     GSList *it;
 
     g_message("Unmanaging window: %lx", client->window);
 
-    HOOKFIRECLIENT(closed, client);
+    dispatch_client(Event_Client_Destroy, client, 0, 0);
 
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, client->window, SetModeDelete);
@@ -238,7 +232,7 @@ void client_unmanage(Client *client)
     XSelectInput(ob_display, client->window, NoEventMask);
 
     /* ungrab any mouse bindings */
-    pointer_grab_all(client, FALSE);
+    /*pointer_grab_all(client, FALSE);XXX*/
      
     engine_frame_hide(client->frame);
 
@@ -256,19 +250,6 @@ void client_unmanage(Client *client)
        influence */
     screen_update_struts();
 
-    /* remove from the python list */
-    cw = clientwrap_new(client);
-    seq = PySequence_Index(openboxwrap_obj->client_list, cw);
-    if (seq == -1)
-       PyErr_Clear();
-    else
-       PySequence_DelItem(openboxwrap_obj->client_list, seq);
-    Py_DECREF(cw);
-
-    /* notify the wrapper that its useless now */
-    if (client->wrap != NULL)
-       client->wrap->client = NULL;
-
     /* tell our parent that we're gone */
     if (client->transient_for != NULL)
        client->transient_for->transients =
@@ -401,7 +382,6 @@ static void client_get_all(Client *self)
     self->disabled_decorations = 0;
     self->group = None;
     self->nicons = 0;
-    self->wrap = NULL;
 
     client_get_area(self);
     client_get_desktop(self);
@@ -946,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);
+            dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
     }
 }
 
@@ -1233,15 +1213,13 @@ gboolean client_should_show(Client *self)
     return TRUE;
 }
 
-void client_showhide(Client *self)
+static void client_showhide(Client *self)
 {
 
     if (client_should_show(self))
         engine_frame_show(self->frame);
     else
         engine_frame_hide(self->frame);
-
-    HOOKFIRECLIENT(visible, self);
 }
 
 gboolean client_normal(Client *self) {
@@ -1266,7 +1244,7 @@ static void client_apply_startup_state(Client *self)
        client_shade(self, TRUE);
     }
     if (self->urgent)
-       HOOKFIRECLIENT(urgent, self);
+        dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
   
     if (self->max_vert && self->max_horz) {
        self->max_vert = self->max_horz = FALSE;
@@ -1646,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 */
@@ -1663,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)