alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2871 from RyanDwyer/untangle-cursor-warp

Browse source 
Remove cursor warping from seat_set_focus
This commit is contained in:
Drew DeVault 2018-10-18 15:18:41 +02:00 committed by GitHub
parent 103b7bc47d 24a90e5d86
commit d88b7a63f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/input/seat.h
View file

@ -52,6 +52,7 @@ struct sway_seat {
bool has_focus; bool has_focus;
struct wl_list focus_stack; // list of containers in focus order struct wl_list focus_stack; // list of containers in focus order
struct sway_workspace *workspace; struct sway_workspace *workspace;
struct sway_node *prev_focus;
// If the focused layer is set, views cannot receive keyboard focus // If the focused layer is set, views cannot receive keyboard focus
struct wlr_layer_surface_v1 *focused_layer; struct wlr_layer_surface_v1 *focused_layer;
@ -121,9 +122,6 @@ void seat_set_focus_workspace(struct sway_seat *seat,
*/ */
void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node); void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node);
void seat_set_focus_warp(struct sway_seat *seat,
struct sway_node *node, bool warp);
void seat_set_focus_surface(struct sway_seat *seat, void seat_set_focus_surface(struct sway_seat *seat,
struct wlr_surface *surface, bool unfocus); struct wlr_surface *surface, bool unfocus);

29
sway/commands/focus.c
View file

@ -34,6 +34,24 @@ 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.
*/ */
@ -181,7 +199,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);
cursor_send_pointer_motion(seat->cursor, 0, true); 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",
@ -214,7 +232,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));
cursor_send_pointer_motion(seat->cursor, 0, true); consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
@ -235,6 +253,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);
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);
} }
@ -264,7 +283,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);
cursor_send_pointer_motion(seat->cursor, 0, true); consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
@ -284,7 +303,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);
cursor_send_pointer_motion(seat->cursor, 0, true); consider_warp_to_focus(seat);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
@ -292,7 +311,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);
cursor_send_pointer_motion(seat->cursor, 0, true); consider_warp_to_focus(seat);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

4
sway/commands/swap.c
View file

@ -61,13 +61,13 @@ static void swap_focus(struct sway_container *con1,
enum sway_container_layout layout2 = container_parent_layout(con2); enum sway_container_layout layout2 = container_parent_layout(con2);
if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) { if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) {
if (workspace_is_visible(ws2)) { if (workspace_is_visible(ws2)) {
seat_set_focus_warp(seat, &con2->node, false); seat_set_focus(seat, &con2->node);
} }
seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
} else if (focus == con2 && (layout1 == L_TABBED } else if (focus == con2 && (layout1 == L_TABBED
|| layout1 == L_STACKED)) { || layout1 == L_STACKED)) {
if (workspace_is_visible(ws1)) { if (workspace_is_visible(ws1)) {
seat_set_focus_warp(seat, &con1->node, false); seat_set_focus(seat, &con1->node);
} }
seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
} else if (ws1 != ws2) { } else if (ws1 != ws2) {

6
sway/input/cursor.c
View file

@ -597,7 +597,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
struct sway_output *focused_output = node_get_output(focus); struct sway_output *focused_output = node_get_output(focus);
struct sway_output *output = node_get_output(node); struct sway_output *output = node_get_output(node);
if (output != focused_output) { if (output != focused_output) {
seat_set_focus_warp(seat, node, false); seat_set_focus(seat, node);
} }
} else if (node->type == N_CONTAINER && node->sway_container->view) { } else if (node->type == N_CONTAINER && node->sway_container->view) {
// Focus node if the following are true: // Focus node if the following are true:
@ -607,14 +607,14 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) &&
node != prev_node && node != prev_node &&
view_is_visible(node->sway_container->view)) { view_is_visible(node->sway_container->view)) {
seat_set_focus_warp(seat, node, false); seat_set_focus(seat, node);
} else { } else {
struct sway_node *next_focus = struct sway_node *next_focus =
seat_get_focus_inactive(seat, &root->node); seat_get_focus_inactive(seat, &root->node);
if (next_focus && next_focus->type == N_CONTAINER && if (next_focus && next_focus->type == N_CONTAINER &&
next_focus->sway_container->view && next_focus->sway_container->view &&
view_is_visible(next_focus->sway_container->view)) { view_is_visible(next_focus->sway_container->view)) {
seat_set_focus_warp(seat, next_focus, false); seat_set_focus(seat, next_focus);
} }
} }
} }

29
sway/input/seat.c
View file

@ -640,13 +640,13 @@ void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) {
node_set_dirty(node_get_parent(node)); node_set_dirty(node_get_parent(node));
} }
void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
bool warp) {
if (seat->focused_layer) { if (seat->focused_layer) {
return; return;
} }
struct sway_node *last_focus = seat_get_focus(seat); struct sway_node *last_focus = seat_get_focus(seat);
seat->prev_focus = last_focus;
if (last_focus == node) { if (last_focus == node) {
return; return;
} }
@ -678,8 +678,6 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
} }
} }
struct sway_output *last_output = last_workspace ?
last_workspace->output : NULL;
struct sway_output *new_output = new_workspace->output; struct sway_output *new_output = new_workspace->output;
if (last_workspace != new_workspace && new_output) { if (last_workspace != new_workspace && new_output) {
@ -774,21 +772,6 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
workspace_consider_destroy(last_workspace); workspace_consider_destroy(last_workspace);
} }
if (last_focus && warp) {
if (container && config->mouse_warping == WARP_CONTAINER) {
cursor_warp_to_container(seat->cursor, container);
cursor_send_pointer_motion(seat->cursor, 0, true);
} else if (new_output != last_output &&
config->mouse_warping >= WARP_OUTPUT) {
if (container) {
cursor_warp_to_container(seat->cursor, container);
} else {
cursor_warp_to_workspace(seat->cursor, new_workspace);
}
cursor_send_pointer_motion(seat->cursor, 0, true);
}
}
seat->has_focus = true; seat->has_focus = true;
if (config->smart_gaps) { if (config->smart_gaps) {
@ -800,18 +783,14 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
update_debug_tree(); update_debug_tree();
} }
void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
seat_set_focus_warp(seat, node, true);
}
void seat_set_focus_container(struct sway_seat *seat, void seat_set_focus_container(struct sway_seat *seat,
struct sway_container *con) { struct sway_container *con) {
seat_set_focus_warp(seat, con ? &con->node : NULL, true); seat_set_focus(seat, con ? &con->node : NULL);
} }
void seat_set_focus_workspace(struct sway_seat *seat, void seat_set_focus_workspace(struct sway_seat *seat,
struct sway_workspace *ws) { struct sway_workspace *ws) {
seat_set_focus_warp(seat, ws ? &ws->node : NULL, true); seat_set_focus(seat, ws ? &ws->node : NULL);
} }
void seat_set_focus_surface(struct sway_seat *seat, void seat_set_focus_surface(struct sway_seat *seat,