Handle strut partial changes for dock clients

Handle changes to the property _NET_WM_STRUT_PARTIAL by reallocating
screen space in the dock area when the dock client requests a new
position.

This will allow changes to the bar config directive `position` to be
effective on the `reload` command.

fixes #1294
This commit is contained in:
Tony Crisci 2015-03-25 19:45:42 -04:00
parent 3f3b2d9a3f
commit 49510427b9
2 changed files with 100 additions and 1 deletions

View File

@ -1159,6 +1159,87 @@ static bool handle_class_change(void *data, xcb_connection_t *conn, uint8_t stat
return true; return true;
} }
/*
* Handles the _NET_WM_STRUT_PARTIAL property for allocating space for dock clients.
*
*/
static bool handle_strut_partial_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
xcb_atom_t name, xcb_get_property_reply_t *prop) {
DLOG("strut partial change for window 0x%08x\n", window);
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL) {
return false;
}
if (prop == NULL) {
xcb_generic_error_t *err = NULL;
xcb_get_property_cookie_t strut_cookie = xcb_get_property(conn, false, window, A__NET_WM_STRUT_PARTIAL,
XCB_GET_PROPERTY_TYPE_ANY, 0, UINT32_MAX);
prop = xcb_get_property_reply(conn, strut_cookie, &err);
if (err != NULL) {
DLOG("got error when getting strut partial property: %d\n", err->error_code);
free(err);
return false;
}
if (prop == NULL) {
return false;
}
}
DLOG("That is con %p / %s\n", con, con->name);
window_update_strut_partial(con->window, prop);
/* we only handle this change for dock clients */
if (con->parent == NULL || con->parent->type != CT_DOCKAREA) {
return true;
}
Con *search_at = croot;
Con *output = con_get_output(con);
if (output != NULL) {
DLOG("Starting search at output %s\n", output->name);
search_at = output;
}
/* find out the desired position of this dock window */
if (con->window->reserved.top > 0 && con->window->reserved.bottom == 0) {
DLOG("Top dock client\n");
con->window->dock = W_DOCK_TOP;
} else if (con->window->reserved.top == 0 && con->window->reserved.bottom > 0) {
DLOG("Bottom dock client\n");
con->window->dock = W_DOCK_BOTTOM;
} else {
DLOG("Ignoring invalid reserved edges (_NET_WM_STRUT_PARTIAL), using position as fallback:\n");
if (con->geometry.y < (int16_t)(search_at->rect.height / 2)) {
DLOG("geom->y = %d < rect.height / 2 = %d, it is a top dock client\n",
con->geometry.y, (search_at->rect.height / 2));
con->window->dock = W_DOCK_TOP;
} else {
DLOG("geom->y = %d >= rect.height / 2 = %d, it is a bottom dock client\n",
con->geometry.y, (search_at->rect.height / 2));
con->window->dock = W_DOCK_BOTTOM;
}
}
/* find the dockarea */
Con *dockarea = con_for_window(search_at, con->window, NULL);
assert(dockarea != NULL);
/* attach the dock to the dock area */
con_detach(con);
con->parent = dockarea;
TAILQ_INSERT_HEAD(&(dockarea->focus_head), con, focused);
TAILQ_INSERT_HEAD(&(dockarea->nodes_head), con, nodes);
tree_render();
return true;
}
/* Returns false if the event could not be processed (e.g. the window could not /* Returns false if the event could not be processed (e.g. the window could not
* be found), true otherwise */ * be found), true otherwise */
typedef bool (*cb_property_handler_t)(void *data, xcb_connection_t *c, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *property); typedef bool (*cb_property_handler_t)(void *data, xcb_connection_t *c, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *property);
@ -1177,7 +1258,8 @@ static struct property_handler_t property_handlers[] = {
{0, UINT_MAX, handle_clientleader_change}, {0, UINT_MAX, handle_clientleader_change},
{0, UINT_MAX, handle_transient_for}, {0, UINT_MAX, handle_transient_for},
{0, 128, handle_windowrole_change}, {0, 128, handle_windowrole_change},
{0, 128, handle_class_change}}; {0, 128, handle_class_change},
{0, UINT_MAX, handle_strut_partial_change}};
#define NUM_HANDLERS (sizeof(property_handlers) / sizeof(struct property_handler_t)) #define NUM_HANDLERS (sizeof(property_handlers) / sizeof(struct property_handler_t))
/* /*
@ -1196,6 +1278,7 @@ void property_handlers_init(void) {
property_handlers[5].atom = XCB_ATOM_WM_TRANSIENT_FOR; property_handlers[5].atom = XCB_ATOM_WM_TRANSIENT_FOR;
property_handlers[6].atom = A_WM_WINDOW_ROLE; property_handlers[6].atom = A_WM_WINDOW_ROLE;
property_handlers[7].atom = XCB_ATOM_WM_CLASS; property_handlers[7].atom = XCB_ATOM_WM_CLASS;
property_handlers[8].atom = A__NET_WM_STRUT_PARTIAL;
} }
static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) { static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) {

View File

@ -143,6 +143,22 @@ wait_for_map $window;
@docked = get_dock_clients('top'); @docked = get_dock_clients('top');
is(@docked, 1, 'dock client on top'); is(@docked, 1, 'dock client on top');
# now change strut_partial to reserve space on the bottom and the dock should
# be moved to the bottom dock area
$x->change_property(
PROP_MODE_REPLACE,
$window->id,
$atomname->id,
$atomtype->id,
32, # 32 bit integer
12,
pack('L12', 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 1280, 0)
);
sync_with_i3;
@docked = get_dock_clients('bottom');
is(@docked, 1, 'dock client on bottom');
$window->destroy; $window->destroy;
wait_for_unmap $window; wait_for_unmap $window;