diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-02-04 13:39:10 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-02-04 14:08:54 -0500 |
commit | 515150229847c9ebdfd0cabb6f0026fca9d57a23 (patch) | |
tree | 8a50ce0ac8ce4dc2ec973c63c68dc45378c50737 /sway/commands/kill.c | |
parent | Implement workspaces (diff) | |
download | sway-515150229847c9ebdfd0cabb6f0026fca9d57a23.tar.gz sway-515150229847c9ebdfd0cabb6f0026fca9d57a23.tar.zst sway-515150229847c9ebdfd0cabb6f0026fca9d57a23.zip |
basic focus overhaul
Diffstat (limited to 'sway/commands/kill.c')
-rw-r--r-- | sway/commands/kill.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sway/commands/kill.c b/sway/commands/kill.c index cebf7f3c..4b3666be 100644 --- a/sway/commands/kill.c +++ b/sway/commands/kill.c | |||
@@ -10,11 +10,16 @@ struct cmd_results *cmd_kill(int argc, char **argv) { | |||
10 | return cmd_results_new(CMD_FAILURE, "kill", | 10 | return cmd_results_new(CMD_FAILURE, "kill", |
11 | "Command 'kill' cannot be used in the config file"); | 11 | "Command 'kill' cannot be used in the config file"); |
12 | } | 12 | } |
13 | if (config->handler_context.current_container == NULL) { | ||
14 | wlr_log(L_DEBUG, "no container to kill"); | ||
15 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
16 | } | ||
13 | enum swayc_types type = config->handler_context.current_container->type; | 17 | enum swayc_types type = config->handler_context.current_container->type; |
14 | if (type != C_VIEW || type != C_CONTAINER) { | 18 | if (type != C_VIEW && type != C_CONTAINER) { |
15 | return cmd_results_new(CMD_INVALID, NULL, | 19 | return cmd_results_new(CMD_INVALID, NULL, |
16 | "Can only kill views and containers with this command"); | 20 | "Can only kill views and containers with this command"); |
17 | } | 21 | } |
22 | |||
18 | // TODO close arbitrary containers without a view | 23 | // TODO close arbitrary containers without a view |
19 | struct sway_view *view = | 24 | struct sway_view *view = |
20 | config->handler_context.current_container->sway_view; | 25 | config->handler_context.current_container->sway_view; |