diff options
Diffstat (limited to 'sway/commands/scratchpad.c')
-rw-r--r-- | sway/commands/scratchpad.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c index 6eab456d..1162d51f 100644 --- a/sway/commands/scratchpad.c +++ b/sway/commands/scratchpad.c | |||
@@ -84,16 +84,14 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) { | |||
84 | return error; | 84 | return error; |
85 | } | 85 | } |
86 | if (strcmp(argv[0], "show") != 0) { | 86 | if (strcmp(argv[0], "show") != 0) { |
87 | return cmd_results_new(CMD_INVALID, "scratchpad", | 87 | return cmd_results_new(CMD_INVALID, "Expected 'scratchpad show'"); |
88 | "Expected 'scratchpad show'"); | ||
89 | } | 88 | } |
90 | if (!root->outputs->length) { | 89 | if (!root->outputs->length) { |
91 | return cmd_results_new(CMD_INVALID, "scratchpad", | 90 | return cmd_results_new(CMD_INVALID, |
92 | "Can't run this command while there's no outputs connected."); | 91 | "Can't run this command while there's no outputs connected."); |
93 | } | 92 | } |
94 | if (!root->scratchpad->length) { | 93 | if (!root->scratchpad->length) { |
95 | return cmd_results_new(CMD_INVALID, "scratchpad", | 94 | return cmd_results_new(CMD_INVALID, "Scratchpad is empty"); |
96 | "Scratchpad is empty"); | ||
97 | } | 95 | } |
98 | 96 | ||
99 | if (config->handler_context.using_criteria) { | 97 | if (config->handler_context.using_criteria) { |
@@ -111,12 +109,12 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) { | |||
111 | // matches the criteria. If this container isn't in the scratchpad, | 109 | // matches the criteria. If this container isn't in the scratchpad, |
112 | // we'll just silently return a success. | 110 | // we'll just silently return a success. |
113 | if (!con->scratchpad) { | 111 | if (!con->scratchpad) { |
114 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 112 | return cmd_results_new(CMD_SUCCESS, NULL); |
115 | } | 113 | } |
116 | scratchpad_toggle_container(con); | 114 | scratchpad_toggle_container(con); |
117 | } else { | 115 | } else { |
118 | scratchpad_toggle_auto(); | 116 | scratchpad_toggle_auto(); |
119 | } | 117 | } |
120 | 118 | ||
121 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 119 | return cmd_results_new(CMD_SUCCESS, NULL); |
122 | } | 120 | } |