X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=c44fe3436de456a527cf340f771e7c76b95b70f8;hb=d33dce48275056fd4492160624d9bc99dd2603c1;hp=3e5430f02a86f0ad19e65bbfcae781eadf8817c5;hpb=ef43db32ebd9ec3204143038255f91b0b6335d9e;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 3e5430f0..c44fe343 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -237,11 +237,15 @@ void client_unmanage(Client *client) 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); /* 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 +277,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 */ @@ -382,7 +386,6 @@ static void client_get_all(Client *self) self->title = self->icon_title = NULL; self->res_name = self->res_class = self->role = NULL; self->wmstate = NormalState; - self->focused = FALSE; self->transient = FALSE; self->transients = NULL; self->transient_for = NULL; @@ -1168,7 +1171,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 +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; @@ -1393,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 */ @@ -1404,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]; @@ -1420,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)) { @@ -1465,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; @@ -1539,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; @@ -1875,7 +1898,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 +1920,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; }