From 1d9dc05b911441aa2a2303a96cd3820704e84dee Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 3 Mar 2009 02:05:35 +0100 Subject: [PATCH] Little cleanups --- src/handlers.c | 4 ++-- src/util.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/handlers.c b/src/handlers.c index ebedbccf..e644554b 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -331,7 +331,7 @@ int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_n return 1; } - if (client->container->workspace->fullscreen_client == client) { + if (client->fullscreen) { printf("client in fullscreen, not touching\n"); return 1; } @@ -393,7 +393,7 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *c, xcb_unmap_notify_ } /* If this was the fullscreen client, we need to unset it */ - if (con->workspace->fullscreen_client == client) + if (client->fullscreen) con->workspace->fullscreen_client = NULL; /* If the container will be empty now and is in stacking mode, we need to diff --git a/src/util.c b/src/util.c index 497474d6..995d3a54 100644 --- a/src/util.c +++ b/src/util.c @@ -274,13 +274,14 @@ void toggle_fullscreen(xcb_connection_t *conn, Client *client) { values[0] = XCB_STACK_MODE_ABOVE; xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values); - xcb_flush(conn); } else { printf("leaving fullscreen mode\n"); /* Because the coordinates of the window haven’t changed, it would not be re-configured if we don’t set the following flag */ client->force_reconfigure = true; - /* We left fullscreen mode, redraw the layout */ - render_layout(conn); + /* We left fullscreen mode, redraw the container */ + render_container(conn, client->container); } + + xcb_flush(conn); }