From f6917a228893960431e7718be0c519d4f0e58c5d Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 9 Dec 2008 11:18:16 +0100 Subject: [PATCH] client: rename oldborder and stop reseting on unmanage Signed-off-by: Julien Danjou --- client.c | 8 ++------ structs.h | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/client.c b/client.c index 6f8c905d..8ebf57ae 100644 --- a/client.c +++ b/client.c @@ -767,13 +767,13 @@ client_setfullscreen(client_t *c, bool s) geometry = screen_area_get(c->screen, NULL, NULL, false); c->geometries.fullscreen = c->geometry; - c->oldborder = c->border; + c->border_fs = c->border; client_setborder(c, 0); } else { geometry = c->geometries.fullscreen; - client_setborder(c, c->oldborder); + client_setborder(c, c->border_fs); } client_resize(c, geometry, false); client_need_arrange(c); @@ -1028,10 +1028,6 @@ client_unmanage(client_t *c) /* The server grab construct avoids race conditions. */ xcb_grab_server(globalconf.connection); - xcb_configure_window(globalconf.connection, c->win, - XCB_CONFIG_WINDOW_BORDER_WIDTH, - (uint32_t *) &c->oldborder); - xcb_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY, c->win, XCB_BUTTON_MASK_ANY); window_state_set(c->win, XCB_WM_STATE_WITHDRAWN); diff --git a/structs.h b/structs.h index 19138a80..c2700d3b 100644 --- a/structs.h +++ b/structs.h @@ -168,7 +168,8 @@ struct client_t strut_t strut; /** Respect resize hints */ bool honorsizehints; - int border, oldborder; + /** Border width and pre-fullscreen border width */ + int border, border_fs; xcolor_t border_color; /** True if the client is sticky */ bool issticky;