X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=556430ec53594ce1d863bf12be441937b23570e1;hb=5d7d6038ca46f6d92fcfa1d46f4ebe76ebc9b2e2;hp=3e5430f02a86f0ad19e65bbfcae781eadf8817c5;hpb=ef43db32ebd9ec3204143038255f91b0b6335d9e;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 3e5430f0..556430ec 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -228,6 +228,7 @@ void client_unmanage(Client *client) g_message("Unmanaging window: %lx", client->window); dispatch_client(Event_Client_Destroy, client, 0, 0); + g_assert(client != NULL); /* remove the window from our save set */ XChangeSaveSet(ob_display, client->window, SetModeDelete); @@ -237,11 +238,16 @@ 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); @@ -273,9 +279,9 @@ void client_unmanage(Client *client) /* unfocus the client (dispatchs the focus event) (we're out of the transient lists already, so being modal doesn't matter) */ - if (client->focused) + if (client_focused(client)) client_unfocus(client); - + if (ob_state != State_Exiting) { /* these values should not be persisted across a window unmapping/mapping */ @@ -296,8 +302,8 @@ void client_unmanage(Client *client) g_free(client->icons); g_free(client->title); g_free(client->icon_title); - g_free(client->res_name); - g_free(client->res_class); + g_free(client->name); + g_free(client->class); g_free(client->role); g_free(client); @@ -380,9 +386,8 @@ static void client_get_all(Client *self) /* defaults */ self->frame = NULL; self->title = self->icon_title = NULL; - self->res_name = self->res_class = self->role = NULL; + self->name = self->class = self->role = NULL; self->wmstate = NormalState; - self->focused = FALSE; self->transient = FALSE; self->transients = NULL; self->transient_for = NULL; @@ -812,10 +817,9 @@ void client_setup_decor_and_functions(Client *self) client_change_allowed_actions(self); if (self->frame) { - /* change the decors on the frame */ - engine_frame_adjust_size(self->frame); - /* with more/less decorations, we may need to be repositioned */ - engine_frame_adjust_position(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); /* with new decor, the window's maximized size may change */ client_remaximize(self); } @@ -944,8 +948,7 @@ void client_update_title(Client *self) { gchar *data = NULL; - if (self->title != NULL) - g_free(self->title); + g_free(self->title); /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, data)) { @@ -979,8 +982,7 @@ void client_update_icon_title(Client *self) { gchar *data = NULL; - if (self->icon_title != NULL) - g_free(self->icon_title); + g_free(self->icon_title); /* try netwm */ if (!PROP_GETS(self->window, net_wm_icon_name, utf8, data)) { @@ -1013,19 +1015,19 @@ void client_update_class(Client *self) gchar *s; guint i; - if (self->res_name) g_free(self->res_name); - if (self->res_class) g_free(self->res_class); + if (self->name) g_free(self->name); + if (self->class) g_free(self->class); if (self->role) g_free(self->role); - self->res_name = self->res_class = self->role = NULL; + self->name = self->class = self->role = NULL; data = g_ptr_array_new(); if (PROP_GETSA(self->window, wm_class, string, data)) { if (data->len > 0) - self->res_name = g_strdup(g_ptr_array_index(data, 0)); + self->name = g_strdup(g_ptr_array_index(data, 0)); if (data->len > 1) - self->res_class = g_strdup(g_ptr_array_index(data, 1)); + self->class = g_strdup(g_ptr_array_index(data, 1)); } for (i = 0; i < data->len; ++i) @@ -1035,8 +1037,8 @@ void client_update_class(Client *self) if (PROP_GETS(self->window, wm_window_role, string, s)) self->role = g_strdup(s); - if (self->res_name == NULL) self->res_name = g_strdup(""); - if (self->res_class == NULL) self->res_class = g_strdup(""); + if (self->name == NULL) self->name = g_strdup(""); + if (self->class == NULL) self->class = g_strdup(""); if (self->role == NULL) self->role = g_strdup(""); } @@ -1168,7 +1170,7 @@ static Client *search_focus_tree(Client *node, Client *skip) Client *c = it->data; if (c == skip) continue; /* circular? */ if ((ret = search_focus_tree(c, skip))) return ret; - if (c->focused) return c; + if (client_focused(c)) return c; } return NULL; } @@ -1281,6 +1283,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; @@ -1360,12 +1387,9 @@ 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) { - /* Adjust the size and then the position, as required by the EWMH */ - if (resized) - engine_frame_adjust_size(self->frame); - if (moved) { - engine_frame_adjust_position(self->frame); + engine_frame_adjust_area(self->frame); + if (moved) { if (!user || final) { XEvent event; event.type = ConfigureNotify; @@ -1393,7 +1417,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 */ @@ -1404,11 +1427,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]; @@ -1420,15 +1443,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)) { @@ -1465,7 +1488,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; @@ -1539,17 +1562,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; @@ -1604,7 +1623,8 @@ void client_shade(Client *self, gboolean shade) self->wmstate = shade ? IconicState : NormalState; self->shaded = shade; client_change_state(self); - engine_frame_adjust_size(self->frame); + /* resize the frame to just the titlebar */ + engine_frame_adjust_area(self->frame); } void client_close(Client *self) @@ -1634,6 +1654,11 @@ void client_close(Client *self) XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); } +void client_kill(Client *self) +{ + XKillClient(ob_display, self->window); +} + void client_set_desktop(Client *self, guint target) { guint old, i; @@ -1875,7 +1900,10 @@ gboolean client_focus(Client *self) return FALSE; } } - + + if (client_focused(self)) + return TRUE; + if (self->can_focus) XSetInputFocus(ob_display, self->window, RevertToNone, CurrentTime); @@ -1894,12 +1922,42 @@ gboolean client_focus(Client *self) XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); } - /*XSync(ob_display, FALSE); XXX Why sync? */ + client_set_focused(self, TRUE); + + /* XSync(ob_display, FALSE); XXX Why sync? */ return TRUE; } void client_unfocus(Client *self) { g_assert(focus_client == self); - focus_set_client(NULL); + client_set_focused(self, FALSE); +} + +void client_set_focused(Client *self, gboolean focused) +{ + if (focused) { + 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; }