koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support moving dock clients to another output.

Browse Source 
This fixes #1883 where a race condition between i3 and i3bar caused two i3bar clients to be put onto the same output.
This commit is contained in:
Ingo Bürk
2015-09-05 12:35:28 +02:00
parent ee2983c791
commit 053020f2db
2 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/handlers.c
View File

@ -386,15 +386,35 @@ static void handle_configure_request(xcb_configure_request_event_t *event) {
return;
}
/* Dock windows can be reconfigured in their height */
/* Dock windows can be reconfigured in their height and moved to another output. */
if (con->parent && con->parent->type == CT_DOCKAREA) {
DLOG("Dock window, only height reconfiguration allowed\n");
DLOG("Reconfiguring dock window (con = %p).\n", con);
if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
DLOG("Height given, changing\n");
DLOG("Dock client wants to change height to %d, we can do that.\n", event->height);
con->geometry.height = event->height;
tree_render();
}
if (event->value_mask & XCB_CONFIG_WINDOW_X || event->value_mask & XCB_CONFIG_WINDOW_Y) {
int16_t x = event->value_mask & XCB_CONFIG_WINDOW_X ? event->x : (int16_t)con->geometry.x;
int16_t y = event->value_mask & XCB_CONFIG_WINDOW_Y ? event->y : (int16_t)con->geometry.y;
Con *current_output = con_get_output(con);
Output *target = get_output_containing(x, y);
if (target != NULL && current_output != target->con) {
DLOG("Dock client is requested to be moved to output %s, moving it there.\n", target->name);
Match *match;
Con *nc = con_for_window(target->con, con->window, &match);
DLOG("Dock client will be moved to container %p.\n", nc);
con_detach(con);
con_attach(con, nc, false);
tree_render();
} else {
DLOG("Dock client will not be moved, we only support moving it to another output.\n");
}
}
}
fake_absolute_configure_notify(con);