diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-15 02:21:46 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-15 09:05:27 +0100 |
commit | 3087942c35ad8982d1cf93313fc1834ab439293f (patch) | |
tree | 1d1dbbd5aec4afb0eb25214069724ed1d527c968 /sway/commands/move.c | |
parent | Merge pull request #3422 from RyanDwyer/resize-immediate-siblings (diff) | |
download | sway-3087942c35ad8982d1cf93313fc1834ab439293f.tar.gz sway-3087942c35ad8982d1cf93313fc1834ab439293f.tar.zst sway-3087942c35ad8982d1cf93313fc1834ab439293f.zip |
Handle hidden scratchpad containers in commands
This fixes the handling of hidden scratchpad containers for some
commands. For the most part, this just prevents running the commands on
hidden scratchpad containers, but there are some commands that have some
special handling for them.
Diffstat (limited to 'sway/commands/move.c')
-rw-r--r-- | sway/commands/move.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index d4fe2f01..d4b55922 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -653,6 +653,10 @@ static struct cmd_results *cmd_move_in_direction( | |||
653 | return cmd_results_new(CMD_FAILURE, | 653 | return cmd_results_new(CMD_FAILURE, |
654 | "Cannot move workspaces in a direction"); | 654 | "Cannot move workspaces in a direction"); |
655 | } | 655 | } |
656 | if (container->scratchpad && !container->workspace) { | ||
657 | return cmd_results_new(CMD_FAILURE, | ||
658 | "Cannot move a hidden scratchpad container"); | ||
659 | } | ||
656 | if (container_is_floating(container)) { | 660 | if (container_is_floating(container)) { |
657 | if (container->is_fullscreen) { | 661 | if (container->is_fullscreen) { |
658 | return cmd_results_new(CMD_FAILURE, | 662 | return cmd_results_new(CMD_FAILURE, |
@@ -720,6 +724,11 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) { | |||
720 | return cmd_results_new(CMD_FAILURE, "Only floating containers " | 724 | return cmd_results_new(CMD_FAILURE, "Only floating containers " |
721 | "can be moved to an absolute position"); | 725 | "can be moved to an absolute position"); |
722 | } | 726 | } |
727 | if (container->scratchpad && !container->workspace) { | ||
728 | return cmd_results_new(CMD_FAILURE, | ||
729 | "Cannot move a hidden scratchpad container"); | ||
730 | } | ||
731 | |||
723 | if (!argc) { | 732 | if (!argc) { |
724 | return cmd_results_new(CMD_FAILURE, expected_position_syntax); | 733 | return cmd_results_new(CMD_FAILURE, expected_position_syntax); |
725 | } | 734 | } |