aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-03-19 23:07:32 -0400
committerLibravatar emersion <contact@emersion.fr>2019-03-23 08:07:25 +0200
commit8cd7f0171ad8ffc4ce490f6f4b18522cb178c951 (patch)
tree16ee638f5222905b3a7911e77e33c24827ba9944
parentSupport focus <direction> for floating containers (diff)
downloadsway-8cd7f0171ad8ffc4ce490f6f4b18522cb178c951.tar.gz
sway-8cd7f0171ad8ffc4ce490f6f4b18522cb178c951.tar.zst
sway-8cd7f0171ad8ffc4ce490f6f4b18522cb178c951.zip
cmd_mode: allow cmd_set to be a subcommand
This allows set to be used in mode blocks
-rw-r--r--sway/commands/mode.c3
-rw-r--r--sway/sway.5.scd6
2 files changed, 5 insertions, 4 deletions
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index 3e0ee80c..ef2c5d79 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -13,7 +13,8 @@
13static struct cmd_handler mode_handlers[] = { 13static struct cmd_handler mode_handlers[] = {
14 { "bindcode", cmd_bindcode }, 14 { "bindcode", cmd_bindcode },
15 { "bindswitch", cmd_bindswitch }, 15 { "bindswitch", cmd_bindswitch },
16 { "bindsym", cmd_bindsym } 16 { "bindsym", cmd_bindsym },
17 { "set", cmd_set },
17}; 18};
18 19
19struct cmd_results *cmd_mode(int argc, char **argv) { 20struct cmd_results *cmd_mode(int argc, char **argv) {
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 18fc28a3..dbfeefe3 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -573,9 +573,9 @@ The default colors are:
573 Switches to the specified mode. The default mode _default_. 573 Switches to the specified mode. The default mode _default_.
574 574
575*mode* [--pango_markup] <mode> <mode-subcommands...> 575*mode* [--pango_markup] <mode> <mode-subcommands...>
576 The only valid _mode-subcommands..._ are *bindsym*, *bindcode* and 576 The only valid _mode-subcommands..._ are *bindsym*, *bindcode*,
577 *bindswitch*. If _--pango_markup_ is given, then _mode_ will be interpreted 577 *bindswitch*, and *set*. If _--pango_markup_ is given, then _mode_ will be
578 as pango markup. 578 interpreted as pango markup.
579 579
580*mouse_warping* output|container|none 580*mouse_warping* output|container|none
581 If _output_ is specified, the mouse will be moved to new outputs as you 581 If _output_ is specified, the mouse will be moved to new outputs as you