diff options
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index d608a9cf..7d05e942 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -84,7 +84,7 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor, | |||
84 | 84 | ||
85 | // find the focused workspace on the output for this seat | 85 | // find the focused workspace on the output for this seat |
86 | struct sway_container *ws = | 86 | struct sway_container *ws = |
87 | sway_seat_get_focus_inactive(cursor->seat, output->swayc); | 87 | seat_get_focus_inactive(cursor->seat, output->swayc); |
88 | if (ws && ws->type != C_WORKSPACE) { | 88 | if (ws && ws->type != C_WORKSPACE) { |
89 | ws = container_parent(ws, C_WORKSPACE); | 89 | ws = container_parent(ws, C_WORKSPACE); |
90 | } | 90 | } |
@@ -129,7 +129,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor, | |||
129 | double sx, sy; | 129 | double sx, sy; |
130 | struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy); | 130 | struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy); |
131 | if (c && config->focus_follows_mouse) { | 131 | if (c && config->focus_follows_mouse) { |
132 | sway_seat_set_focus_warp(cursor->seat, c, false); | 132 | seat_set_focus_warp(cursor->seat, c, false); |
133 | } | 133 | } |
134 | 134 | ||
135 | // reset cursor if switching between clients | 135 | // reset cursor if switching between clients |
@@ -191,15 +191,15 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) { | |||
191 | if (new_ws && new_ws->type != C_WORKSPACE) { | 191 | if (new_ws && new_ws->type != C_WORKSPACE) { |
192 | new_ws = container_parent(new_ws, C_WORKSPACE); | 192 | new_ws = container_parent(new_ws, C_WORKSPACE); |
193 | } | 193 | } |
194 | struct sway_container *old_ws = sway_seat_get_focus(cursor->seat); | 194 | struct sway_container *old_ws = seat_get_focus(cursor->seat); |
195 | if (old_ws && old_ws->type != C_WORKSPACE) { | 195 | if (old_ws && old_ws->type != C_WORKSPACE) { |
196 | old_ws = container_parent(old_ws, C_WORKSPACE); | 196 | old_ws = container_parent(old_ws, C_WORKSPACE); |
197 | } | 197 | } |
198 | if (new_ws != old_ws) { | 198 | if (new_ws != old_ws) { |
199 | sway_seat_set_focus(cursor->seat, cont); | 199 | seat_set_focus(cursor->seat, cont); |
200 | } | 200 | } |
201 | } else { | 201 | } else { |
202 | sway_seat_set_focus(cursor->seat, cont); | 202 | seat_set_focus(cursor->seat, cont); |
203 | } | 203 | } |
204 | 204 | ||
205 | wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, | 205 | wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, |