X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=790dba5a859cf7e69ad762d09f8bab7fd215cab1;hb=4bcd03b2d0904e2b5443a2383b66055422240255;hp=40c61208ca821113fb65a5c47636ad021c8c9cd9;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 40c61208..790dba5a 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -5,13 +5,12 @@ #include "frame.h" #include "engine.h" #include "event.h" +#include "grab.h" #include "focus.h" #include "stacking.h" -#include "pointer.h" -#include "hooks.h" -#include "openboxwrap.h" -#include "clientwrap.h" +#include "dispatch.h" +#include #include /*! The event mask to grab on client windows */ @@ -32,6 +31,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,10 +121,8 @@ void client_manage(Window window) XWindowAttributes attrib; XSetWindowAttributes attrib_set; /* XWMHints *wmhint; */ - PyObject *cw; - - XGrabServer(ob_display); - XSync(ob_display, FALSE); + + grab_server(TRUE); /* check if it has already been unmapped by the time we started mapping the grab does a sync so we don't have to here */ @@ -132,16 +130,14 @@ void client_manage(Window window) XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) { XPutBackEvent(ob_display, &e); - XUngrabServer(ob_display); - XFlush(ob_display); + grab_server(FALSE); return; /* don't manage it */ } /* make sure it isn't an override-redirect window */ if (!XGetWindowAttributes(ob_display, window, &attrib) || attrib.override_redirect) { - XUngrabServer(ob_display); - XFlush(ob_display); + grab_server(FALSE); return; /* don't manage it */ } @@ -150,8 +146,7 @@ void client_manage(Window window) if ((wmhint->flags & StateHint) && wmhint->initial_state == WithdrawnState) { /\* XXX: make dock apps work! *\/ - XUngrabServer(ob_display); - XFlush(ob_display); + grab_server(FALSE); XFree(wmhint); return; } @@ -186,8 +181,7 @@ void client_manage(Window window) client_apply_startup_state(client); - XUngrabServer(ob_display); - XFlush(ob_display); + grab_server(FALSE); client_list = g_slist_append(client_list, client); stacking_list = g_list_append(stacking_list, client); @@ -197,17 +191,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); + dispatch_client(Event_Client_New, client, 0, 0); - HOOKFIRECLIENT(managed, client); + client_showhide(client); - client_showhide(client, TRUE); + 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 +214,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 +228,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 +246,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 +378,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 +922,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); } } @@ -1223,21 +1199,23 @@ void client_calc_layer(Client *self) } } -void client_showhide(Client *self, gboolean firehook) +gboolean client_should_show(Client *self) { - gboolean show; - - if (self->iconic) show = FALSE; + if (self->iconic) return FALSE; else if (!(self->desktop == screen_desktop || - self->desktop == DESKTOP_ALL)) show = FALSE; - else if (client_normal(self) && screen_showing_desktop) show = FALSE; - else show = TRUE; + self->desktop == DESKTOP_ALL)) return FALSE; + else if (client_normal(self) && screen_showing_desktop) return FALSE; + + return TRUE; +} - if (show) engine_frame_show(self->frame); - else engine_frame_hide(self->frame); +static void client_showhide(Client *self) +{ - if (firehook) - HOOKFIRECLIENT(visible, self); + if (client_should_show(self)) + engine_frame_show(self->frame); + else + engine_frame_hide(self->frame); } gboolean client_normal(Client *self) { @@ -1262,7 +1240,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; @@ -1491,7 +1469,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk) XMapWindow(ob_display, self->window); } client_change_state(self); - client_showhide(self, TRUE); + client_showhide(self); screen_update_struts(); } @@ -1642,23 +1620,26 @@ 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 */ engine_frame_adjust_state(self->frame); /* 'move' the window to the new desktop */ - client_showhide(self, TRUE); + client_showhide(self); screen_update_struts(); + + dispatch_client(Event_Client_Desktop, self, target, old); } static Client *search_modal_tree(Client *node, Client *skip)