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

Merge pull request #3364 from orestisf1993/warp-randr_query 

randr_query_outputs: con_activate -> workspace_show
This commit is contained in:
Ingo Bürk 2018-08-17 11:55:15 +02:00 committed by GitHub
parent 2d3c2f0615 789a09a6e7
commit e8dee4308a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output.c
View File

@ -10,7 +10,7 @@
#include "all.h" #include "all.h"
/* /*
* Returns the output container below the given output container. * Returns the content container below the given output container.
* *
*/ */
Con *output_get_content(Con *output) { Con *output_get_content(Con *output) {

6
src/randr.c
View File

@ -517,7 +517,7 @@ void init_ws_for_output(Output *output, Con *content) {
Con *ws = create_workspace_on_output(output, content); Con *ws = create_workspace_on_output(output, content);
/* TODO: Set focus in main.c */ /* TODO: Set focus in main.c */
con_activate(ws); con_focus(ws);
} }
/* /*
@ -946,7 +946,9 @@ void randr_query_outputs(void) {
continue; continue;
DLOG("Focusing primary output %s\n", output_primary_name(output)); DLOG("Focusing primary output %s\n", output_primary_name(output));
con_activate(con_descend_focused(output->con)); Con *content = output_get_content(output->con);
Con *ws = TAILQ_FIRST(&(content)->focus_head);
workspace_show(ws);
} }
/* render_layout flushes */ /* render_layout flushes */