awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Stack clients without causing X11 errors 

Previously, the bottom-most window in the stacking order would cause an error
because we tried to stack it above it's sibling XCB_NONE. This was invalid. That
X11 error didn't hurt, but it does look weird. Fix this by not issuing that
invalid ConfigureWindow request.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2010-07-31 10:40:01 +02:00
parent 37756c0589
commit e438e3aec9
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
stack.c
View File

@ -70,6 +70,24 @@ stack_windows(void)
need_stack_refresh = true; need_stack_refresh = true;
} }
/** Stack a window above another window, without causing errors.
* \param w The window.
* \param previous The window which should be below this window.
*/
static void
stack_window_above(xcb_window_t w, xcb_window_t previous)
{
if (previous == XCB_NONE)
/* This would cause an error from the X server. Also, if we really
* changed the stacking order of all windows, they'd all have to redraw
* themselves. Doing it like this is better. */
return;
xcb_configure_window(globalconf.connection, w,
XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE,
(uint32_t[]) { previous, XCB_STACK_MODE_ABOVE });
}
/** Stack a client above. /** Stack a client above.
* \param client The client. * \param client The client.
* \param previous The previous client on the stack. * \param previous The previous client on the stack.
@ -78,9 +96,7 @@ stack_windows(void)
static xcb_window_t static xcb_window_t
stack_client_above(client_t *c, xcb_window_t previous) stack_client_above(client_t *c, xcb_window_t previous)
{ {
xcb_configure_window(globalconf.connection, c->window, stack_window_above(c->window, previous);
XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE,
(uint32_t[]) { previous, XCB_STACK_MODE_ABOVE });
previous = c->window; previous = c->window;
@ -150,9 +166,6 @@ stack_refresh()
if(!need_stack_refresh) if(!need_stack_refresh)
return; return;
/* XCB_NONE is an invalid value for XCB_CONFIG_WINDOW_SIBLING and will cause
* an error instead of changing the stacking order. This is a *good* thing.
* Else we would be forcing windows to redraw themselves. */
xcb_window_t next = XCB_NONE; xcb_window_t next = XCB_NONE;
/* stack desktop windows */ /* stack desktop windows */
@ -165,10 +178,7 @@ stack_refresh()
foreach(wibox, globalconf.wiboxes) foreach(wibox, globalconf.wiboxes)
if(!(*wibox)->ontop) if(!(*wibox)->ontop)
{ {
xcb_configure_window(globalconf.connection, stack_window_above((*wibox)->window, next);
(*wibox)->window,
XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE,
(uint32_t[]) { next, XCB_STACK_MODE_ABOVE });
next = (*wibox)->window; next = (*wibox)->window;
} }
@ -182,10 +192,7 @@ stack_refresh()
foreach(wibox, globalconf.wiboxes) foreach(wibox, globalconf.wiboxes)
if((*wibox)->ontop) if((*wibox)->ontop)
{ {
xcb_configure_window(globalconf.connection, stack_window_above((*wibox)->window, next);
(*wibox)->window,
XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE,
(uint32_t[]) { next, XCB_STACK_MODE_ABOVE });
next = (*wibox)->window; next = (*wibox)->window;
} }