mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

basic focus overhaul

Browse source
This commit is contained in:
Tony Crisci 2018-02-04 13:39:10 -05:00
parent b28602aa74
commit 5151502298
12 changed files with 224 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sway/commands/kill.c
View file

@ -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;

3
sway/commands/workspace.c
View file

@ -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) {