Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Keep client order across restarts 

This saves the order of clients in a property called AWESOME_CLIENT_ORDER on the
root window during shutdown. During startup, after managing all existing
windows, we force the client list into the order described by this property
(overwriting any changes that Lua possibly did).

This code should safely handle cases where the property doesn't contain all
existing clients or contains a client which doesn't exist anymore.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-07-26 17:03:10 +02:00 committed by Daniel Hahler
parent 86e242b983
commit c945492176
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
awesome.c
View File

@ -85,6 +85,19 @@ awesome_atexit(bool restart)
(*c)->geometry.x, (*c)->geometry.y); (*c)->geometry.x, (*c)->geometry.y);
} }
if (restart)
{
/* Save the client order across restarts */
xcb_window_t *wins = p_alloca(xcb_window_t, globalconf.clients.len);
int n = 0;
foreach(client, globalconf.clients)
wins[n++] = (*client)->window;
xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
globalconf.screen->root,
AWESOME_CLIENT_ORDER, XCB_ATOM_WINDOW, 32, n, wins);
}
a_dbus_cleanup(); a_dbus_cleanup();
systray_cleanup(); systray_cleanup();
@ -109,6 +122,36 @@ awesome_atexit(bool restart)
xcb_disconnect(globalconf.connection); xcb_disconnect(globalconf.connection);
} }
/** Restore the client order after a restart */
static void
restore_client_order(xcb_get_property_cookie_t prop_cookie)
{
int client_idx = 0;
xcb_window_t *windows;
xcb_get_property_reply_t *reply;
reply = xcb_get_property_reply(globalconf.connection, prop_cookie, NULL);
if (!reply || reply->format != 32 || reply->value_len == 0) {
p_delete(&reply);
return;
}
windows = xcb_get_property_value(reply);
for (uint32_t i = 0; i < reply->value_len; i++)
/* Find windows[i] and swap it to where it belongs */
foreach(c, globalconf.clients)
if ((*c)->window == windows[i])
{
client_t *tmp = *c;
*c = globalconf.clients.tab[client_idx];
globalconf.clients.tab[client_idx] = tmp;
client_idx++;
}
luaA_class_emit_signal(globalconf_get_lua_State(), &client_class, "list", 0);
p_delete(&reply);
}
/** Scan X to find windows to manage. /** Scan X to find windows to manage.
*/ */
static void static void
@ -119,6 +162,7 @@ scan(xcb_query_tree_cookie_t tree_c)
xcb_window_t *wins = NULL; xcb_window_t *wins = NULL;
xcb_get_window_attributes_reply_t *attr_r; xcb_get_window_attributes_reply_t *attr_r;
xcb_get_geometry_reply_t *geom_r; xcb_get_geometry_reply_t *geom_r;
xcb_get_property_cookie_t prop_cookie;
long state; long state;
tree_r = xcb_query_tree_reply(globalconf.connection, tree_r = xcb_query_tree_reply(globalconf.connection,
@ -128,6 +172,11 @@ scan(xcb_query_tree_cookie_t tree_c)
if(!tree_r) if(!tree_r)
return; return;
/* This gets the property and deletes it */
prop_cookie = xcb_get_property_unchecked(globalconf.connection, true,
globalconf.screen->root, AWESOME_CLIENT_ORDER,
XCB_ATOM_WINDOW, 0, UINT_MAX);
/* Get the tree of the children windows of the current root window */ /* Get the tree of the children windows of the current root window */
if(!(wins = xcb_query_tree_children(tree_r))) if(!(wins = xcb_query_tree_children(tree_r)))
fatal("cannot get tree children"); fatal("cannot get tree children");
@ -171,6 +220,8 @@ scan(xcb_query_tree_cookie_t tree_c)
} }
p_delete(&tree_r); p_delete(&tree_r);
restore_client_order(prop_cookie);
} }
static void static void

1
common/atoms.list
View File

@ -62,3 +62,4 @@ WM_WINDOW_ROLE
WM_CLIENT_LEADER WM_CLIENT_LEADER
XSEL_DATA XSEL_DATA
WM_TAKE_FOCUS WM_TAKE_FOCUS
AWESOME_CLIENT_ORDER