diff options
author | Tudor Brindus <me@tbrindus.ca> | 2020-04-25 15:07:17 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-05-02 13:32:28 +0200 |
commit | 0dc1863dce163622371dc3ffb2c6073cbda17075 (patch) | |
tree | 4f0ff981ba6b2d513acb48b355c5c79d613f6909 /include | |
parent | Add a secondary headless backend (diff) | |
download | sway-0dc1863dce163622371dc3ffb2c6073cbda17075.tar.gz sway-0dc1863dce163622371dc3ffb2c6073cbda17075.tar.zst sway-0dc1863dce163622371dc3ffb2c6073cbda17075.zip |
input/cursor: make cursor rebasing cursor type-agnostic
This commit refactors `cursor_rebase` into `cursor_update_image`, and
moves sending pointer events to the two existing call sites. This will
enable this code to be reused for tablets.
Refs #5232
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/cursor.h | 1 | ||||
-rw-r--r-- | include/sway/input/seat.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 3f46c548..1b31143d 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -85,6 +85,7 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat); | |||
85 | */ | 85 | */ |
86 | void cursor_rebase(struct sway_cursor *cursor); | 86 | void cursor_rebase(struct sway_cursor *cursor); |
87 | void cursor_rebase_all(void); | 87 | void cursor_rebase_all(void); |
88 | void cursor_update_image(struct sway_cursor *cursor, struct sway_node *node); | ||
88 | 89 | ||
89 | void cursor_handle_activity(struct sway_cursor *cursor, | 90 | void cursor_handle_activity(struct sway_cursor *cursor, |
90 | enum sway_input_idle_source idle_source); | 91 | enum sway_input_idle_source idle_source); |
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 6d7495dd..ad7cac75 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -220,6 +220,9 @@ bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface); | |||
220 | 220 | ||
221 | void drag_icon_update_position(struct sway_drag_icon *icon); | 221 | void drag_icon_update_position(struct sway_drag_icon *icon); |
222 | 222 | ||
223 | enum wlr_edges find_resize_edge(struct sway_container *cont, | ||
224 | struct wlr_surface *surface, struct sway_cursor *cursor); | ||
225 | |||
223 | void seatop_begin_default(struct sway_seat *seat); | 226 | void seatop_begin_default(struct sway_seat *seat); |
224 | 227 | ||
225 | void seatop_begin_down(struct sway_seat *seat, struct sway_container *con, | 228 | void seatop_begin_down(struct sway_seat *seat, struct sway_container *con, |