summaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/border.c2
-rw-r--r--sway/commands/seat/cursor.c4
-rw-r--r--sway/input/cursor.c54
-rw-r--r--sway/input/seat.c4
4 files changed, 41 insertions, 23 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c
index 4ba361da..5160eaa6 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -41,7 +41,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat->cursor) {
- cursor_send_pointer_motion(seat->cursor, 0, false);
+ cursor_send_pointer_motion(seat->cursor, 0, 0, 0, false);
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 4d0a22c7..81fee31f 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -36,7 +36,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
int delta_x = strtol(argv[1], NULL, 10);
int delta_y = strtol(argv[2], NULL, 10);
wlr_cursor_move(cursor->cursor, NULL, delta_x, delta_y);
- cursor_send_pointer_motion(cursor, 0, true);
+ cursor_send_pointer_motion(cursor, 0, 0, 0, true);
} else if (strcasecmp(argv[0], "set") == 0) {
if (argc < 3) {
return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
@@ -45,7 +45,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
float x = strtof(argv[1], NULL) / root_container.width;
float y = strtof(argv[2], NULL) / root_container.height;
wlr_cursor_warp_absolute(cursor->cursor, NULL, x, y);
- cursor_send_pointer_motion(cursor, 0, true);
+ cursor_send_pointer_motion(cursor, 0, 0, 0, true);
} else {
if (argc < 2) {
return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 1cf432f3..cc8d344f 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -135,15 +135,25 @@ static struct sway_container *container_at_coords(
return output->swayc;
}
-void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
- bool allow_refocusing) {
+void cursor_send_pointer_motion(struct sway_cursor *cursor,
+ double delta_x, double delta_y, uint32_t time_msec, bool allow_refocusing) {
+ struct sway_container *prev_c = NULL;
+ struct wlr_surface *surface = NULL;
+ double sx, sy;
+
+ if (delta_x != 0 || delta_y != 0) {
+ // Use the motion delta to find the container the pointer was previously
+ // over.
+ prev_c = container_at_coords(cursor->seat,
+ cursor->cursor->x - delta_x, cursor->cursor->y - delta_y,
+ &surface, &sx, &sy);
+ }
+
if (time_msec == 0) {
time_msec = get_current_time_msec();
}
struct wlr_seat *seat = cursor->seat->wlr_seat;
- struct wlr_surface *surface = NULL;
- double sx, sy;
struct sway_container *c = container_at_coords(cursor->seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
if (c && config->focus_follows_mouse && allow_refocusing) {
@@ -162,20 +172,27 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
seat_set_focus_warp(cursor->seat, c, false);
}
} else if (c->type == C_VIEW) {
- // Don't switch focus on title mouseover for
- // stacked and tabbed layouts
- // If pointed container is in nested containers which are
- // inside tabbed/stacked layout we should skip them
bool do_mouse_focus = true;
- bool is_visible = view_is_visible(c->sway_view);
struct sway_container *p = c->parent;
- while (p) {
- if ((p->layout == L_TABBED || p->layout == L_STACKED)
- && !is_visible) {
- do_mouse_focus = false;
- break;
+ // Don't switch focus unless we have moved from one container to another.
+ if (c && prev_c && c == prev_c) {
+ do_mouse_focus = false;
+ }
+ // Skip check if we already know not to focus.
+ if (do_mouse_focus) {
+ // Don't switch focus on title mouseover for
+ // stacked and tabbed layouts
+ // If pointed container is in nested containers which are
+ // inside tabbed/stacked layout we should skip them
+ bool is_visible = view_is_visible(c->sway_view);
+ while (p) {
+ if ((p->layout == L_TABBED || p->layout == L_STACKED)
+ && !is_visible) {
+ do_mouse_focus = false;
+ break;
+ }
+ p = p->parent;
}
- p = p->parent;
}
if (!do_mouse_focus) {
struct sway_container *next_focus = seat_get_focus_inactive(
@@ -221,7 +238,8 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(cursor->cursor, event->device,
event->delta_x, event->delta_y);
- cursor_send_pointer_motion(cursor, event->time_msec, true);
+ cursor_send_pointer_motion(cursor, event->delta_x, event->delta_y,
+ event->time_msec, true);
}
static void handle_cursor_motion_absolute(
@@ -231,7 +249,7 @@ static void handle_cursor_motion_absolute(
wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
- cursor_send_pointer_motion(cursor, event->time_msec, true);
+ cursor_send_pointer_motion(cursor, 0, 0, event->time_msec, true);
}
void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -401,7 +419,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
}
wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y);
- cursor_send_pointer_motion(cursor, event->time_msec, true);
+ cursor_send_pointer_motion(cursor, 0, 0, event->time_msec, true);
}
static void handle_tool_tip(struct wl_listener *listener, void *data) {
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 7a3e928a..bb583286 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -602,7 +602,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
wlr_output, seat->cursor->cursor->x,
seat->cursor->cursor->y)) {
wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
- cursor_send_pointer_motion(seat->cursor, 0, true);
+ cursor_send_pointer_motion(seat->cursor, 0, 0, 0, true);
}
}
}
@@ -613,7 +613,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
}
if (last_workspace && last_workspace != new_workspace) {
- cursor_send_pointer_motion(seat->cursor, 0, true);
+ cursor_send_pointer_motion(seat->cursor, 0, 0, 0, true);
}
seat->has_focus = (container != NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 02:08:37 +0000