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 | |
| parent | b28602aa7425cf435150e6008624429737e037d3 (diff) | |
basic focus overhaul
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/kill.c | 7 | ||||
| -rw-r--r-- | sway/commands/workspace.c | 3 |
2 files changed, 8 insertions, 2 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) { return cmd_results_new(CMD_FAILURE, "kill", "Command 'kill' cannot be used in the config file"); } + if (config->handler_context.current_container == NULL) { + wlr_log(L_DEBUG, "no container to kill"); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); + } enum swayc_types type = config->handler_context.current_container->type; - if (type != C_VIEW || type != C_CONTAINER) { + if (type != C_VIEW && type != C_CONTAINER) { return cmd_results_new(CMD_INVALID, NULL, "Can only kill views and containers with this command"); } + // TODO close arbitrary containers without a view struct sway_view *view = config->handler_context.current_container->sway_view; diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index 12984ed4..e7d6cc9f 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c @@ -90,7 +90,8 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { free(name); } workspace_switch(ws); - current_container = config->handler_context.seat->focus; + current_container = + sway_seat_get_focus(config->handler_context.seat, &root_container); swayc_t *new_output = swayc_parent_by_type(current_container, C_OUTPUT); if (config->mouse_warping && old_output != new_output) { |