mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-04 19:36:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when using focus parent/child from an empty workspace

Browse source
This commit is contained in:
Ryan Dwyer 2018-09-02 21:22:38 +10:00
parent 4e0452fce3
commit 7263e39f64
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/commands/focus.c
View file

@ -95,9 +95,6 @@ static struct sway_node *get_node_in_output_direction(
static struct sway_node *node_get_in_direction(struct sway_container *container, static struct sway_node *node_get_in_direction(struct sway_container *container,
struct sway_seat *seat, enum movement_direction dir) { struct sway_seat *seat, enum movement_direction dir) {
if (dir == MOVE_CHILD) {
return seat_get_active_child(seat, &container->node);
}
if (container->is_fullscreen) { if (container->is_fullscreen) {
if (dir == MOVE_PARENT) { if (dir == MOVE_PARENT) {
return NULL; return NULL;
@ -256,8 +253,20 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
"or 'focus output <direction|name>'"); "or 'focus output <direction|name>'");
} }
if (direction == MOVE_CHILD) {
struct sway_node *focus = seat_get_active_child(seat, node);
if (focus) {
seat_set_focus(seat, focus);
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
if (node->type == N_WORKSPACE) { if (node->type == N_WORKSPACE) {
// A workspace is focused, so just jump to the next output if (direction == MOVE_PARENT) {
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
// Jump to the next output
struct sway_output *new_output = struct sway_output *new_output =
output_get_in_direction(workspace->output, direction); output_get_in_direction(workspace->output, direction);
if (!new_output) { if (!new_output) {