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

output_init_con: Restore focus if possible 

Before this, i3 would focus newly created workspaces on output init
This commit is contained in:
Orestis Floros 2018-09-11 20:39:33 +03:00
parent db3b9e4187
commit 5976381012
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/randr.c
View File

@ -421,6 +421,8 @@ void output_init_con(Output *output) {
* *
*/ */
void init_ws_for_output(Output *output, Con *content) { void init_ws_for_output(Output *output, Con *content) {
Con *previous_focus = con_get_workspace(focused);
/* go through all assignments and move the existing workspaces to this output */ /* go through all assignments and move the existing workspaces to this output */
struct Workspace_Assignment *assignment; struct Workspace_Assignment *assignment;
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
@ -451,6 +453,9 @@ void init_ws_for_output(Output *output, Con *content) {
workspace_move_to_output(workspace, output); workspace_move_to_output(workspace, output);
} }
/* Temporarily set the focused container, might not be initialized yet. */
focused = content;
/* if a workspace exists, we are done now */ /* if a workspace exists, we are done now */
if (!TAILQ_EMPTY(&(content->nodes_head))) { if (!TAILQ_EMPTY(&(content->nodes_head))) {
/* ensure that one of the workspaces is actually visible (in fullscreen /* ensure that one of the workspaces is actually visible (in fullscreen
@ -459,10 +464,9 @@ void init_ws_for_output(Output *output, Con *content) {
GREP_FIRST(visible, content, child->fullscreen_mode == CF_OUTPUT); GREP_FIRST(visible, content, child->fullscreen_mode == CF_OUTPUT);
if (!visible) { if (!visible) {
visible = TAILQ_FIRST(&(content->nodes_head)); visible = TAILQ_FIRST(&(content->nodes_head));
focused = content;
workspace_show(visible); workspace_show(visible);
} }
return; goto restore_focus;
} }
/* otherwise, we create the first assigned ws for this output */ /* otherwise, we create the first assigned ws for this output */
@ -473,17 +477,18 @@ void init_ws_for_output(Output *output, Con *content) {
LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n", LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n",
assignment->name, assignment->output); assignment->name, assignment->output);
focused = content;
workspace_show_by_name(assignment->name); workspace_show_by_name(assignment->name);
return; goto restore_focus;
} }
/* if there is still no workspace, we create the first free workspace */ /* if there is still no workspace, we create the first free workspace */
DLOG("Now adding a workspace\n"); DLOG("Now adding a workspace\n");
Con *ws = create_workspace_on_output(output, content); workspace_show(create_workspace_on_output(output, content));
/* TODO: Set focus in main.c */ restore_focus:
con_focus(ws); if (previous_focus) {
workspace_show(previous_focus);
}
} }
/* /*