client: rename oldborder and stop reseting on unmanage
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
parent
27e7b4bc9b
commit
f6917a2288
8
client.c
8
client.c
|
@ -767,13 +767,13 @@ client_setfullscreen(client_t *c, bool s)
|
||||||
|
|
||||||
geometry = screen_area_get(c->screen, NULL, NULL, false);
|
geometry = screen_area_get(c->screen, NULL, NULL, false);
|
||||||
c->geometries.fullscreen = c->geometry;
|
c->geometries.fullscreen = c->geometry;
|
||||||
c->oldborder = c->border;
|
c->border_fs = c->border;
|
||||||
client_setborder(c, 0);
|
client_setborder(c, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
geometry = c->geometries.fullscreen;
|
geometry = c->geometries.fullscreen;
|
||||||
client_setborder(c, c->oldborder);
|
client_setborder(c, c->border_fs);
|
||||||
}
|
}
|
||||||
client_resize(c, geometry, false);
|
client_resize(c, geometry, false);
|
||||||
client_need_arrange(c);
|
client_need_arrange(c);
|
||||||
|
@ -1028,10 +1028,6 @@ client_unmanage(client_t *c)
|
||||||
/* The server grab construct avoids race conditions. */
|
/* The server grab construct avoids race conditions. */
|
||||||
xcb_grab_server(globalconf.connection);
|
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_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY, c->win,
|
||||||
XCB_BUTTON_MASK_ANY);
|
XCB_BUTTON_MASK_ANY);
|
||||||
window_state_set(c->win, XCB_WM_STATE_WITHDRAWN);
|
window_state_set(c->win, XCB_WM_STATE_WITHDRAWN);
|
||||||
|
|
|
@ -168,7 +168,8 @@ struct client_t
|
||||||
strut_t strut;
|
strut_t strut;
|
||||||
/** Respect resize hints */
|
/** Respect resize hints */
|
||||||
bool honorsizehints;
|
bool honorsizehints;
|
||||||
int border, oldborder;
|
/** Border width and pre-fullscreen border width */
|
||||||
|
int border, border_fs;
|
||||||
xcolor_t border_color;
|
xcolor_t border_color;
|
||||||
/** True if the client is sticky */
|
/** True if the client is sticky */
|
||||||
bool issticky;
|
bool issticky;
|
||||||
|
|
Loading…
Reference in New Issue