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

Merge pull request #2771 from hwangcc23/fix-2764 

Support to get the primary output
This commit is contained in:
Ingo Bürk 2017-05-16 18:39:37 +02:00 committed by GitHub
parent 6dd4252cd5 f99727b518
commit 7b6f592b71
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/userguide
View File

@ -1922,7 +1922,7 @@ output::
---------------------------------------------- ----------------------------------------------
focus left|right|down|up focus left|right|down|up
focus parent|child|floating|tiling|mode_toggle focus parent|child|floating|tiling|mode_toggle
focus output left|right|up|down|<output> focus output left|right|up|down|primary|<output>
---------------------------------------------- ----------------------------------------------
*Examples*: *Examples*:
@ -1944,8 +1944,17 @@ bindsym $mod+x focus output right
# Focus the big output # Focus the big output
bindsym $mod+x focus output HDMI-2 bindsym $mod+x focus output HDMI-2
# Focus the primary output
bindsym $mod+x focus output primary
------------------------------------------------- -------------------------------------------------
-------------------------------
Note that you might not have a primary output configured yet. To do so, run:
-------------------------
xrandr --output <output> --primary
-------------------------
=== Moving containers === Moving containers
Use the +move+ command to move a container. Use the +move+ command to move a container.
@ -2195,8 +2204,8 @@ To move a container to another RandR output (addressed by names like +LVDS1+ or
*Syntax*: *Syntax*:
------------------------------------------------------------ ------------------------------------------------------------
move container to output left|right|down|up|current|<output> move container to output left|right|down|up|current|primary|<output>
move workspace to output left|right|down|up|current|<output> move workspace to output left|right|down|up|current|primary|<output>
------------------------------------------------------------ ------------------------------------------------------------
*Examples*: *Examples*:
@ -2207,8 +2216,17 @@ bindsym $mod+x move workspace to output right
# Put this window on the presentation output. # Put this window on the presentation output.
bindsym $mod+x move container to output VGA1 bindsym $mod+x move container to output VGA1
# Put this window on the primary output.
bindsym $mod+x move container to output primary
-------------------------------------------------------- --------------------------------------------------------
-------------------------------
Note that you might not have a primary output configured yet. To do so, run:
-------------------------
xrandr --output <output> --primary
-------------------------
=== Moving containers/windows to marks === Moving containers/windows to marks
To move a container to another container with a specific mark (see <<vim_like_marks>>), To move a container to another container with a specific mark (see <<vim_like_marks>>),

11
src/randr.c
View File

@ -45,10 +45,13 @@ static Output *get_output_by_id(xcb_randr_output_t id) {
*/ */
Output *get_output_by_name(const char *name) { Output *get_output_by_name(const char *name) {
Output *output; Output *output;
TAILQ_FOREACH(output, &outputs, outputs) bool get_primary = (strcasecmp("primary", name) == 0);
if (output->active && TAILQ_FOREACH(output, &outputs, outputs) {
strcasecmp(output->name, name) == 0) if ((output->primary && get_primary) ||
return output; (output->active && strcasecmp(output->name, name) == 0)) {
return output;
}
}
return NULL; return NULL;
} }