diff options
author | Simon Ser <contact@emersion.fr> | 2024-02-28 17:49:58 +0100 |
---|---|---|
committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2024-02-28 14:28:11 -0500 |
commit | fca8474e9bd64bff8df16fdaf409d5f575ba9501 (patch) | |
tree | f310c4062fa1bcbd49fc9397a5386953050f1a61 /include | |
parent | text_input: don't destroy scene_node twice (diff) | |
download | sway-fca8474e9bd64bff8df16fdaf409d5f575ba9501.tar.gz sway-fca8474e9bd64bff8df16fdaf409d5f575ba9501.tar.zst sway-fca8474e9bd64bff8df16fdaf409d5f575ba9501.zip |
Convert to new pointer enums
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4575
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/cursor.h | 2 | ||||
-rw-r--r-- | include/sway/input/seat.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 1e21c66f..527d0350 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -114,7 +114,7 @@ void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
114 | 114 | ||
115 | void dispatch_cursor_button(struct sway_cursor *cursor, | 115 | void dispatch_cursor_button(struct sway_cursor *cursor, |
116 | struct wlr_input_device *device, uint32_t time_msec, uint32_t button, | 116 | struct wlr_input_device *device, uint32_t time_msec, uint32_t button, |
117 | enum wlr_button_state state); | 117 | enum wl_pointer_button_state state); |
118 | 118 | ||
119 | void dispatch_cursor_axis(struct sway_cursor *cursor, | 119 | void dispatch_cursor_axis(struct sway_cursor *cursor, |
120 | struct wlr_pointer_axis_event *event); | 120 | struct wlr_pointer_axis_event *event); |
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index e5aa8478..475753d8 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -17,7 +17,7 @@ struct sway_seat; | |||
17 | struct sway_seatop_impl { | 17 | struct sway_seatop_impl { |
18 | void (*button)(struct sway_seat *seat, uint32_t time_msec, | 18 | void (*button)(struct sway_seat *seat, uint32_t time_msec, |
19 | struct wlr_input_device *device, uint32_t button, | 19 | struct wlr_input_device *device, uint32_t button, |
20 | enum wlr_button_state state); | 20 | enum wl_pointer_button_state state); |
21 | void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec); | 21 | void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec); |
22 | void (*pointer_axis)(struct sway_seat *seat, | 22 | void (*pointer_axis)(struct sway_seat *seat, |
23 | struct wlr_pointer_axis_event *event); | 23 | struct wlr_pointer_axis_event *event); |
@@ -286,13 +286,13 @@ struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat, | |||
286 | struct sway_workspace *workspace); | 286 | struct sway_workspace *workspace); |
287 | 287 | ||
288 | void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec, | 288 | void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec, |
289 | uint32_t button, enum wlr_button_state state); | 289 | uint32_t button, enum wl_pointer_button_state state); |
290 | 290 | ||
291 | void seat_consider_warp_to_focus(struct sway_seat *seat); | 291 | void seat_consider_warp_to_focus(struct sway_seat *seat); |
292 | 292 | ||
293 | void seatop_button(struct sway_seat *seat, uint32_t time_msec, | 293 | void seatop_button(struct sway_seat *seat, uint32_t time_msec, |
294 | struct wlr_input_device *device, uint32_t button, | 294 | struct wlr_input_device *device, uint32_t button, |
295 | enum wlr_button_state state); | 295 | enum wl_pointer_button_state state); |
296 | 296 | ||
297 | void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec); | 297 | void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec); |
298 | 298 | ||