nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Actually re-attach dock clients when outputs get disabled (Thanks phnom) 

Fixes: #348
This commit is contained in:
Michael Stapelberg 2011-03-20 01:07:21 +01:00
parent e9a9a46795
commit e835888a9e
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/randr.c
View File

@ -643,6 +643,9 @@ void randr_query_outputs() {
if ((first = get_first_output()) == NULL) if ((first = get_first_output()) == NULL)
die("No usable outputs available\n"); die("No usable outputs available\n");
/* TODO: refactor the following code into a nice function. maybe
* use an on_destroy callback which is implement differently for
* different container types (CT_CONTENT vs. CT_DOCKAREA)? */
Con *first_content = output_get_content(first->con); Con *first_content = output_get_content(first->con);
if (output->con != NULL) { if (output->con != NULL) {
@ -673,6 +676,26 @@ void randr_query_outputs() {
con_focus(next); con_focus(next);
} }
/* 3: move the dock clients to the first output */
Con *child;
TAILQ_FOREACH(child, &(output->con->nodes_head), nodes) {
if (child->type != CT_DOCKAREA)
continue;
DLOG("Handling dock con %p\n", child);
Con *dock;
while (!TAILQ_EMPTY(&(child->nodes_head))) {
dock = TAILQ_FIRST(&(child->nodes_head));
Con *nc;
Match *match;
nc = con_for_window(first->con, dock->window, &match);
DLOG("Moving dock client %p to nc %p\n", dock, nc);
con_detach(dock);
DLOG("Re-attaching\n");
con_attach(dock, nc, false);
DLOG("Done\n");
}
}
DLOG("destroying disappearing con %p\n", output->con); DLOG("destroying disappearing con %p\n", output->con);
tree_close(output->con, false, true); tree_close(output->con, false, true);
DLOG("Done. Should be fine now\n"); DLOG("Done. Should be fine now\n");