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 77ab9e31..97b4473c 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -85,7 +85,7 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor, | |||
85 | 85 | ||
86 | // find the focused workspace on the output for this seat | 86 | // find the focused workspace on the output for this seat |
87 | struct sway_container *ws = | 87 | struct sway_container *ws = |
88 | sway_seat_get_focus_inactive(cursor->seat, output->swayc); | 88 | seat_get_focus_inactive(cursor->seat, output->swayc); |
89 | if (ws && ws->type != C_WORKSPACE) { | 89 | if (ws && ws->type != C_WORKSPACE) { |
90 | ws = container_parent(ws, C_WORKSPACE); | 90 | ws = container_parent(ws, C_WORKSPACE); |
91 | } | 91 | } |
@@ -130,7 +130,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor, | |||
130 | double sx, sy; | 130 | double sx, sy; |
131 | struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy); | 131 | struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy); |
132 | if (c && config->focus_follows_mouse) { | 132 | if (c && config->focus_follows_mouse) { |
133 | sway_seat_set_focus_warp(cursor->seat, c, false); | 133 | seat_set_focus_warp(cursor->seat, c, false); |
134 | } | 134 | } |
135 | 135 | ||
136 | // reset cursor if switching between clients | 136 | // reset cursor if switching between clients |
@@ -192,15 +192,15 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) { | |||
192 | if (new_ws && new_ws->type != C_WORKSPACE) { | 192 | if (new_ws && new_ws->type != C_WORKSPACE) { |
193 | new_ws = container_parent(new_ws, C_WORKSPACE); | 193 | new_ws = container_parent(new_ws, C_WORKSPACE); |
194 | } | 194 | } |
195 | struct sway_container *old_ws = sway_seat_get_focus(cursor->seat); | 195 | struct sway_container *old_ws = seat_get_focus(cursor->seat); |
196 | if (old_ws && old_ws->type != C_WORKSPACE) { | 196 | if (old_ws && old_ws->type != C_WORKSPACE) { |
197 | old_ws = container_parent(old_ws, C_WORKSPACE); | 197 | old_ws = container_parent(old_ws, C_WORKSPACE); |
198 | } | 198 | } |
199 | if (new_ws != old_ws) { | 199 | if (new_ws != old_ws) { |
200 | sway_seat_set_focus(cursor->seat, cont); | 200 | seat_set_focus(cursor->seat, cont); |
201 | } | 201 | } |
202 | } else { | 202 | } else { |
203 | sway_seat_set_focus(cursor->seat, cont); | 203 | seat_set_focus(cursor->seat, cont); |
204 | } | 204 | } |
205 | 205 | ||
206 | wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, | 206 | wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, |