mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 21:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consider cursor warp when switching workspaces

Browse Source 
Fixes a regression introduced in
24a90e5d86.

consider_warp_to_focus has been renamed to seat_consider_warp_to_focus,
moved to seat.c and made public. It is now called when switching
workspaces via `workspace <ws>`.
This commit is contained in:
Ryan Dwyer 2018-10-19 07:57:50 +10:00
parent 30dbb8eba0
commit a2fdac2c4b
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sway/input/seat.h
View File

@ -203,4 +203,6 @@ void seat_end_mouse_operation(struct sway_seat *seat);
void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec, void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
uint32_t button, enum wlr_button_state state); uint32_t button, enum wlr_button_state state);
void seat_consider_warp_to_focus(struct sway_seat *seat);
#endif #endif

30
sway/commands/focus.c
View File

@ -34,24 +34,6 @@ static bool parse_movement_direction(const char *name,
return true; return true;
} }
static void consider_warp_to_focus(struct sway_seat *seat) {
struct sway_node *focus = seat_get_focus(seat);
if (config->mouse_warping == WARP_NO || !focus || !seat->prev_focus) {
return;
}
if (config->mouse_warping == WARP_OUTPUT &&
node_get_output(focus) == node_get_output(seat->prev_focus)) {
return;
}
if (focus->type == N_CONTAINER) {
cursor_warp_to_container(seat->cursor, focus->sway_container);
} else {
cursor_warp_to_workspace(seat->cursor, focus->sway_workspace);
}
cursor_send_pointer_motion(seat->cursor, 0, false);
}
/** /**
* Get node in the direction of newly entered output. * Get node in the direction of newly entered output.
*/ */
@ -199,7 +181,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
} }
if (new_focus) { if (new_focus) {
seat_set_focus_container(seat, new_focus); seat_set_focus_container(seat, new_focus);
consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
} else { } else {
return cmd_results_new(CMD_FAILURE, "focus", return cmd_results_new(CMD_FAILURE, "focus",
"Failed to find a %s container in workspace", "Failed to find a %s container in workspace",
@ -232,7 +214,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
free(identifier); free(identifier);
if (output) { if (output) {
seat_set_focus(seat, seat_get_focus_inactive(seat, &output->node)); seat_set_focus(seat, seat_get_focus_inactive(seat, &output->node));
consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
@ -253,7 +235,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
if (argc == 0 && container) { if (argc == 0 && container) {
seat_set_focus_container(seat, container); seat_set_focus_container(seat, container);
consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
cursor_send_pointer_motion(seat->cursor, 0, true); cursor_send_pointer_motion(seat->cursor, 0, true);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
@ -283,7 +265,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
struct sway_node *focus = seat_get_active_tiling_child(seat, node); struct sway_node *focus = seat_get_active_tiling_child(seat, node);
if (focus) { if (focus) {
seat_set_focus(seat, focus); seat_set_focus(seat, focus);
consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
@ -303,7 +285,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
struct sway_node *node = struct sway_node *node =
get_node_in_output_direction(new_output, direction); get_node_in_output_direction(new_output, direction);
seat_set_focus(seat, node); seat_set_focus(seat, node);
consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
@ -311,7 +293,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
node_get_in_direction(container, seat, direction); node_get_in_direction(container, seat, direction);
if (next_focus) { if (next_focus) {
seat_set_focus(seat, next_focus); seat_set_focus(seat, next_focus);
consider_warp_to_focus(seat); seat_consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

1
sway/commands/workspace.c
View File

@ -157,6 +157,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
free(name); free(name);
} }
workspace_switch(ws, no_auto_back_and_forth); workspace_switch(ws, no_auto_back_and_forth);
seat_consider_warp_to_focus(config->handler_context.seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }

18
sway/input/seat.c
View File

@ -1187,3 +1187,21 @@ void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat, seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
time_msec, button, state); time_msec, button, state);
} }
void seat_consider_warp_to_focus(struct sway_seat *seat) {
struct sway_node *focus = seat_get_focus(seat);
if (config->mouse_warping == WARP_NO || !focus || !seat->prev_focus) {
return;
}
if (config->mouse_warping == WARP_OUTPUT &&
node_get_output(focus) == node_get_output(seat->prev_focus)) {
return;
}
if (focus->type == N_CONTAINER) {
cursor_warp_to_container(seat->cursor, focus->sway_container);
} else {
cursor_warp_to_workspace(seat->cursor, focus->sway_workspace);
}
cursor_send_pointer_motion(seat->cursor, 0, false);
}