X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=6f4dd16a48fae1a3559ea6792eb62c3b91da3898;hb=bf707e7240bbf86be7628c28319d463847738671;hp=40c61208ca821113fb65a5c47636ad021c8c9cd9;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 40c61208..6f4dd16a 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,9 @@ void client_manage(Window window) XWindowAttributes attrib; XSetWindowAttributes attrib_set; /* XWMHints *wmhint; */ - PyObject *cw; - - XGrabServer(ob_display); - XSync(ob_display, FALSE); + guint i; + + 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 +131,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 +147,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,28 +182,30 @@ 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); g_hash_table_insert(client_map, (gpointer)window, client); + /* update the focus lists */ + if (client->desktop == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + focus_order[i] = g_list_append(focus_order[i], client); + } else { + i = client->desktop; + focus_order[i] = g_list_append(focus_order[i], client); + } + stacking_raise(client); 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, TRUE); + client_showhide(client); - /* grab all mouse bindings */ - pointer_grab_all(client, TRUE); + dispatch_client(Event_Client_Mapped, client, 0, 0); /* update the list hints */ client_set_list(); @@ -223,13 +221,13 @@ void client_unmanage_all() void client_unmanage(Client *client) { - int j, seq; - PyObject *cw; + guint i; + 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); @@ -237,11 +235,11 @@ void client_unmanage(Client *client) /* we dont want events no more */ XSelectInput(ob_display, client->window, NoEventMask); - /* ungrab any mouse bindings */ - pointer_grab_all(client, FALSE); - engine_frame_hide(client->frame); + /* dispatch the unmapped event */ + dispatch_client(Event_Client_Unmapped, client, 0, 0); + /* give the client its border back */ client_toggle_border(client, TRUE); @@ -252,23 +250,19 @@ void client_unmanage(Client *client) stacking_list = g_list_remove(stacking_list, client); g_hash_table_remove(client_map, (gpointer)client->window); + /* update the focus lists */ + if (client->desktop == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + focus_order[i] = g_list_remove(focus_order[i], client); + } else { + i = client->desktop; + focus_order[i] = g_list_remove(focus_order[i], client); + } + /* once the client is out of the list, update the struts to remove it's 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 = @@ -280,11 +274,11 @@ void client_unmanage(Client *client) client_calc_layer(it->data); } - /* unfocus the client (calls the focus callbacks) (we're out of the + /* unfocus the client (dispatchs the focus event) (we're out of the transient lists already, so being modal doesn't matter) */ if (client->focused) client_unfocus(client); - + if (ob_state != State_Exiting) { /* these values should not be persisted across a window unmapping/mapping */ @@ -401,7 +395,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 +939,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 +1216,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 +1257,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; @@ -1289,6 +1284,31 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, { gboolean moved = FALSE, resized = FALSE; + /* set the size and position if fullscreen */ + if (self->fullscreen) { + x = 0; + y = 0; + w = screen_physical_size.width; + h = screen_physical_size.height; + } else { + /* set the size and position if maximized */ + if (self->max_horz) { + x = screen_area(self->desktop)->x - self->frame->size.left; + w = screen_area(self->desktop)->x + + screen_area(self->desktop)->width; + } + if (self->max_vert) { + y = screen_area(self->desktop)->y; + h = screen_area(self->desktop)->y + + screen_area(self->desktop)->height - + self->frame->size.top - self->frame->size.bottom; + } + } + + if (x == self->area.x && y == self->area.y && w == self->area.width && + h == self->area.height) + return; /* no change */ + w -= self->base_size.width; h -= self->base_size.height; @@ -1401,7 +1421,6 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, void client_fullscreen(Client *self, gboolean fs, gboolean savearea) { - static int saved_func, saved_decor; int x, y, w, h; if (!(self->functions & Func_Fullscreen) || /* can't */ @@ -1412,11 +1431,11 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea) if (fs) { /* save the functions and remove them */ - saved_func = self->functions; + self->pre_fs_func = self->functions; self->functions &= (Func_Close | Func_Fullscreen | Func_Iconify); /* save the decorations and remove them */ - saved_decor = self->decorations; + self->pre_fs_decor = self->decorations; self->decorations = 0; if (savearea) { long dimensions[4]; @@ -1428,15 +1447,15 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea) PROP_SET32A(self->window, openbox_premax, cardinal, dimensions, 4); } - x = 0; - y = 0; - w = screen_physical_size.width; - h = screen_physical_size.height; + + /* these are not actually used cuz client_configure will set them + as appropriate when the window is fullscreened */ + x = y = w = h = 0; } else { long *dimensions; - self->functions = saved_func; - self->decorations = saved_decor; + self->functions = self->pre_fs_func; + self->decorations = self->pre_fs_decor; if (PROP_GET32A(self->window, openbox_premax, cardinal, dimensions, 4)) { @@ -1473,7 +1492,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk) { if (self->iconic == iconic) return; /* nothing to do */ - g_message("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"), + g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"), self->window); self->iconic = iconic; @@ -1491,7 +1510,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(); } @@ -1547,17 +1566,13 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) PROP_SET32A(self->window, openbox_premax, cardinal, dimensions, 4); } - if (dir == 0 || dir == 1) { /* horz */ - x = screen_area(self->desktop)->x - self->frame->size.left; - w = screen_area(self->desktop)->x + - screen_area(self->desktop)->width; - } - if (dir == 0 || dir == 2) { /* vert */ - y = screen_area(self->desktop)->y; - h = screen_area(self->desktop)->y + - screen_area(self->desktop)->height - - self->frame->size.top - self->frame->size.bottom; - } + + /* pass the client's current position info. the client_configure + will move/size stuff as appropriate for a maximized window */ + x = self->area.x; + y = self->area.y; + w = self->area.width; + h = self->area.height; } else { long *dimensions; @@ -1642,23 +1657,40 @@ 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, i; + 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(); + + /* update the focus lists */ + if (old == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + focus_order[i] = g_list_remove(focus_order[i], self); + } else { + focus_order[old] = g_list_remove(focus_order[old], self); + } + if (target == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + focus_order[i] = g_list_prepend(focus_order[i], self); + } else { + focus_order[target] = g_list_prepend(focus_order[target], self); + } + + dispatch_client(Event_Client_Desktop, self, target, old); } static Client *search_modal_tree(Client *node, Client *skip)