nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Correctly unmap/remap the stack_win when a container becomes empty

This commit is contained in:
Michael Stapelberg 2009-02-28 01:38:53 +01:00
parent 30d386138b
commit 67fbec2061
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/handlers.c
View File

@ -334,20 +334,34 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *c, xcb_unmap_notify_
} }
if (client->container != NULL) { if (client->container != NULL) {
Client *to_focus = CIRCLEQ_NEXT_OR_NULL(&(client->container->clients), client, clients); Client *to_focus = NULL;
if (to_focus == NULL) Container *con = client->container;
to_focus = CIRCLEQ_PREV_OR_NULL(&(client->container->clients), client, clients);
/* Set focus in data structure to the next/previous window, if any (else NULL) */ /* If the client which is being unmapped was the currently active, we need to find
if (client->container->currently_focused == client) the next possible window to focus in this container */
client->container->currently_focused = to_focus; if (con->currently_focused == client) {
to_focus = CIRCLEQ_NEXT_OR_NULL(&(con->clients), client, clients);
if (to_focus == NULL)
to_focus = CIRCLEQ_PREV_OR_NULL(&(con->clients), client, clients);
/* Set focus in data structure to the next/previous window, if any (else NULL) */
con->currently_focused = to_focus;
}
/* If this was the fullscreen client, we need to unset it */ /* If this was the fullscreen client, we need to unset it */
if (client->container->workspace->fullscreen_client == client) if (con->workspace->fullscreen_client == client)
client->container->workspace->fullscreen_client = NULL; con->workspace->fullscreen_client = NULL;
/* If the container will be empty now and is in stacking mode, we need to
correctly resize the stack_win */
if (con->currently_focused == NULL && con->mode == MODE_STACK) {
struct Stack_Window *stack_win = &(con->stack_win);
stack_win->height = 0;
xcb_unmap_window(c, stack_win->window);
}
/* Remove the client from the list of clients */ /* Remove the client from the list of clients */
CIRCLEQ_REMOVE(&(client->container->clients), client, clients); CIRCLEQ_REMOVE(&(con->clients), client, clients);
/* Actually set focus, if there is a window which should get it */ /* Actually set focus, if there is a window which should get it */
if (to_focus != NULL) if (to_focus != NULL)

5
src/layout.c
View File

@ -221,6 +221,11 @@ void render_container(xcb_connection_t *connection, Container *container) {
int decoration_height = (font->height + 2 + 2); int decoration_height = (font->height + 2 + 2);
struct Stack_Window *stack_win = &(container->stack_win); struct Stack_Window *stack_win = &(container->stack_win);
/* Check if we need to remap our stack title window, it gets unmapped when the container
is empty in src/handlers.c:unmap_notify() */
if (stack_win->height == 0)
xcb_map_window(connection, stack_win->window);
/* Check if we need to reconfigure our stack title window */ /* Check if we need to reconfigure our stack title window */
if ((stack_win->width != (stack_win->width = container->width)) | if ((stack_win->width != (stack_win->width = container->width)) |
(stack_win->height != (stack_win->height = decoration_height * num_clients))) (stack_win->height != (stack_win->height = decoration_height * num_clients)))