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

Properly close disabled outputs restored during a restart. (#2337)

Browse Source 
If an output is disabled during a restart, for example because a binding
such as

    bindsym $mod+Shift+r exec "xrandr --auto", restart

is used, it can happen that we first write the layout to disk and only
then receive the RandR change events. This leads to a situation where
the restored tree will contain these outputs, but the restarted i3
process will not receive the RandR events, thus the internal output in i3
is marked disabled.

This patch finds these cases after a restart and force-disables the
affected outputs.

fixes #2326
This commit is contained in:
Ingo Bürk
2016-05-08 12:49:24 +02:00
committed by Michael Stapelberg
parent a8757625c3
commit dbafb3cf23
3 changed files with 124 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.c
View File

@ -623,7 +623,7 @@ int main(int argc, char *argv[]) {
grab_all_keys(conn);
bool needs_tree_init = true;
if (layout_path) {
if (layout_path != NULL) {
LOG("Trying to restore the layout from \"%s\".\n", layout_path);
needs_tree_init = !tree_restore(layout_path, greply);
if (delete_layout_path) {
@ -633,7 +633,6 @@ int main(int argc, char *argv[]) {
* sockets) left. */
rmdir(dir);
}
free(layout_path);
}
if (needs_tree_init)
tree_init(greply);
@ -658,6 +657,33 @@ int main(int argc, char *argv[]) {
randr_init(&randr_base);
}
/* We need to force disabling outputs which have been loaded from the
* layout file but are no longer active. This can happen if the output has
* been disabled in the short time between writing the restart layout file
* and restarting i3. See #2326. */
if (layout_path != NULL && randr_base > -1) {
Con *con;
TAILQ_FOREACH(con, &(croot->nodes_head), nodes) {
Output *output;
TAILQ_FOREACH(output, &outputs, outputs) {
if (output->active || strcmp(con->name, output->name) != 0)
continue;
/* This will correctly correlate the output with its content
* container. We need to make the connection to properly
* disable the output. */
if (output->con == NULL) {
output_init_con(output);
output->changed = false;
}
output->to_be_disabled = true;
randr_disable_output(output);
}
}
}
FREE(layout_path);
scratchpad_fix_resolution();
xcb_query_pointer_reply_t *pointerreply;