aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-04-18 15:50:54 -0400
committerGitHub <noreply@github.com>2017-04-18 15:50:54 -0400
commit17593ac5593c3bf2de824f26060aae90266f38bb (patch)
treec8f3e5dbcd26d0cde6f24db529b01ce6bfa50a2b
parent3c02aa17cab40a6990524a3dc3428fa8c5b6ec54 (diff)
parentd4ac594264442a33ae06c69a1254951894f3c4e2 (diff)
downloadsway-17593ac5593c3bf2de824f26060aae90266f38bb.zip
sway-17593ac5593c3bf2de824f26060aae90266f38bb.tar.gz
sway-17593ac5593c3bf2de824f26060aae90266f38bb.tar.bz2
Merge pull request #1180 from wasamasa/feature-move-to-scratchpad
Feature move to scratchpad
-rw-r--r--sway/commands/move.c2
-rw-r--r--sway/sway.5.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 3c47cfe..a38687c 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -120,7 +120,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
swayc_t *workspace = swayc_parent_by_type(view, C_WORKSPACE);
move_workspace_to(workspace, output);
}
- } else if (strcasecmp(argv[0], "scratchpad") == 0) {
+ } else if (strcasecmp(argv[0], "scratchpad") == 0 || (strcasecmp(argv[0], "to") == 0 && strcasecmp(argv[1], "scratchpad") == 0)) {
// move scratchpad ...
if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move scratchpad", "Can only move containers and views.");
diff --git a/sway/sway.5.txt b/sway/sway.5.txt
index d76951b..446fbf0 100644
--- a/sway/sway.5.txt
+++ b/sway/sway.5.txt
@@ -118,6 +118,9 @@ They are expected to be used with **bindsym** or at runtime through **swaymsg**(
Moves the focused container or workspace to the output identified by _name_ or
_direction_. _direction_ may be one of _up_, _down_, _left_, _right_.
+**move** [to] scratchpad::
+ Moves the focused window to the scratchpad.
+
**reload**::
Reloads the sway config file without restarting sway.