X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=b717b914f561323ee9fd2f5ebe12b161a3ec8757;hb=436c85576e99f4df81273f8b510a94605e676cab;hp=556430ec53594ce1d863bf12be441937b23570e1;hpb=ff06051eb797cf5c026b3ea125d964103df3c3c8;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 556430ec..b717b914 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -130,7 +130,7 @@ void client_manage(Window window) if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) || XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) { XPutBackEvent(ob_display, &e); - + grab_server(FALSE); return; /* don't manage it */ } @@ -186,6 +186,7 @@ void client_manage(Window window) client_list = g_slist_append(client_list, client); stacking_list = g_list_append(stacking_list, client); + g_assert(!g_hash_table_lookup(client_map, (gpointer)client->window)); g_hash_table_insert(client_map, (gpointer)window, client); /* update the focus lists */ @@ -238,17 +239,6 @@ void client_unmanage(Client *client) engine_frame_hide(client->frame); - /* dispatch the unmapped event */ - dispatch_client(Event_Client_Unmapped, client, 0, 0); - g_assert(client != NULL); - - /* give the client its border back */ - client_toggle_border(client, TRUE); - - /* reparent the window out of the frame, and free the frame */ - engine_frame_release_client(client->frame, client); - client->frame = NULL; - client_list = g_slist_remove(client_list, client); stacking_list = g_list_remove(stacking_list, client); g_hash_table_remove(client_map, (gpointer)client->window); @@ -277,11 +267,22 @@ void client_unmanage(Client *client) client_calc_layer(it->data); } + /* dispatch the unmapped event */ + dispatch_client(Event_Client_Unmapped, client, 0, 0); + g_assert(client != NULL); + /* 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)) client_unfocus(client); + /* give the client its border back */ + client_toggle_border(client, TRUE); + + /* reparent the window out of the frame, and free the frame */ + engine_frame_release_client(client->frame, client); + client->frame = NULL; + if (ob_state != State_Exiting) { /* these values should not be persisted across a window unmapping/mapping */ @@ -548,11 +549,13 @@ void client_update_transient_for(Client *self) if (c != self->transient_for) { if (self->transient_for) /* remove from old parent */ - g_slist_remove(self->transient_for->transients, self); + self->transient_for->transients = + g_slist_remove(self->transient_for->transients, self); self->transient_for = c; if (self->transient_for) /* add to new parent */ - g_slist_append(self->transient_for->transients, self); + self->transient_for->transients = + g_slist_append(self->transient_for->transients, self); } } @@ -819,7 +822,7 @@ void client_setup_decor_and_functions(Client *self) if (self->frame) { /* change the decors on the frame, and with more/less decorations, we may also need to be repositioned */ - engine_frame_adjust_area(self->frame); + engine_frame_adjust_area(self->frame, TRUE, TRUE); /* with new decor, the window's maximized size may change */ client_remaximize(self); } @@ -935,7 +938,7 @@ void client_update_wmhints(Client *self) if (ur != self->urgent) { self->urgent = ur; - g_message("Urgent Hint for 0x%lx: %s\n", self->window, + g_message("Urgent Hint for 0x%lx: %s", self->window, ur ? "ON" : "OFF"); /* fire the urgent callback if we're mapped, otherwise, wait until after we're mapped */ @@ -1166,7 +1169,7 @@ static Client *search_focus_tree(Client *node, Client *skip) GSList *it; Client *ret; - for (it = node->transients; it != NULL; it = g_slist_next(it)) { + for (it = node->transients; it != NULL; it = it->next) { Client *c = it->data; if (c == skip) continue; /* circular? */ if ((ret = search_focus_tree(c, skip))) return ret; @@ -1387,7 +1390,7 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, /* move/resize the frame to match the request */ if (self->frame) { - engine_frame_adjust_area(self->frame); + engine_frame_adjust_area(self->frame, moved, resized); if (moved) { if (!user || final) { @@ -1508,6 +1511,9 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk) client_change_state(self); client_showhide(self); screen_update_struts(); + + dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped, + self, 0, 0); } void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) @@ -1624,7 +1630,7 @@ void client_shade(Client *self, gboolean shade) self->shaded = shade; client_change_state(self); /* resize the frame to just the titlebar */ - engine_frame_adjust_area(self->frame); + engine_frame_adjust_area(self->frame, FALSE, FALSE); } void client_close(Client *self) @@ -1647,7 +1653,7 @@ void client_close(Client *self) ce.xclient.window = self->window; ce.xclient.format = 32; ce.xclient.data.l[0] = prop_atoms.wm_delete_window; - ce.xclient.data.l[1] = CurrentTime; + ce.xclient.data.l[1] = event_lasttime; ce.xclient.data.l[2] = 0l; ce.xclient.data.l[3] = 0l; ce.xclient.data.l[4] = 0l; @@ -1682,14 +1688,12 @@ void client_set_desktop(Client *self, guint target) if (old == DESKTOP_ALL) { for (i = 0; i < screen_num_desktops; ++i) focus_order[i] = g_list_remove(focus_order[i], self); + focus_order[target] = g_list_prepend(focus_order[target], 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); + if (target == DESKTOP_ALL) + for (i = 0; i < screen_num_desktops; ++i) + focus_order[i] = g_list_prepend(focus_order[i], self); } dispatch_client(Event_Client_Desktop, self, target, old); @@ -1901,11 +1905,9 @@ gboolean client_focus(Client *self) } } - if (client_focused(self)) - return TRUE; - if (self->can_focus) - XSetInputFocus(ob_display, self->window, RevertToNone, CurrentTime); + XSetInputFocus(ob_display, self->window, RevertToNone, + CurrentTime); if (self->focus_notify) { XEvent ce; @@ -1915,15 +1917,13 @@ gboolean client_focus(Client *self) ce.xclient.window = self->window; ce.xclient.format = 32; ce.xclient.data.l[0] = prop_atoms.wm_take_focus; - ce.xclient.data.l[1] = event_lasttime; + ce.xclient.data.l[1] = CurrentTime; ce.xclient.data.l[2] = 0l; ce.xclient.data.l[3] = 0l; ce.xclient.data.l[4] = 0l; XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); } - client_set_focused(self, TRUE); - /* XSync(ob_display, FALSE); XXX Why sync? */ return TRUE; } @@ -1934,30 +1934,23 @@ void client_unfocus(Client *self) client_set_focused(self, FALSE); } +gboolean client_focused(Client *self) +{ + return self == focus_client; +} + void client_set_focused(Client *self, gboolean focused) { if (focused) { - if (focus_client != self) { + if (focus_client != self) focus_set_client(self); - - /* focus state can affect the stacking layer */ - client_calc_layer(self); - - engine_frame_adjust_focus(self->frame); - } } else { if (focus_client == self) focus_set_client(NULL); - - /* focus state can affect the stacking layer */ - client_calc_layer(self); - - if (self->frame != NULL) /* unfocus can happen while being unmanaged */ - engine_frame_adjust_focus(self->frame); } -} -gboolean client_focused(Client *self) -{ - return self == focus_client; + /* focus state can affect the stacking layer */ + client_calc_layer(self); + + engine_frame_adjust_focus(self->frame); }