summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2017-04-18 15:50:54 -0400
committerLibravatar GitHub <noreply@github.com>2017-04-18 15:50:54 -0400
commit17593ac5593c3bf2de824f26060aae90266f38bb (patch)
treec8f3e5dbcd26d0cde6f24db529b01ce6bfa50a2b
parentAdd .build.yml (for builds.sr.ht) (diff)
parentImplement and document `move [to] scratchpad` (diff)
downloadsway-17593ac5593c3bf2de824f26060aae90266f38bb.tar.gz
sway-17593ac5593c3bf2de824f26060aae90266f38bb.tar.zst
sway-17593ac5593c3bf2de824f26060aae90266f38bb.zip
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 3c47cfe7..a38687c1 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -120,7 +120,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
120 swayc_t *workspace = swayc_parent_by_type(view, C_WORKSPACE); 120 swayc_t *workspace = swayc_parent_by_type(view, C_WORKSPACE);
121 move_workspace_to(workspace, output); 121 move_workspace_to(workspace, output);
122 } 122 }
123 } else if (strcasecmp(argv[0], "scratchpad") == 0) { 123 } else if (strcasecmp(argv[0], "scratchpad") == 0 || (strcasecmp(argv[0], "to") == 0 && strcasecmp(argv[1], "scratchpad") == 0)) {
124 // move scratchpad ... 124 // move scratchpad ...
125 if (view->type != C_CONTAINER && view->type != C_VIEW) { 125 if (view->type != C_CONTAINER && view->type != C_VIEW) {
126 return cmd_results_new(CMD_FAILURE, "move scratchpad", "Can only move containers and views."); 126 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 d76951b5..446fbf05 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**(
118 Moves the focused container or workspace to the output identified by _name_ or 118 Moves the focused container or workspace to the output identified by _name_ or
119 _direction_. _direction_ may be one of _up_, _down_, _left_, _right_. 119 _direction_. _direction_ may be one of _up_, _down_, _left_, _right_.
120 120
121**move** [to] scratchpad::
122 Moves the focused window to the scratchpad.
123
121**reload**:: 124**reload**::
122 Reloads the sway config file without restarting sway. 125 Reloads the sway config file without restarting sway.
123 126