diff options
author | Will McKinnon <[email protected]> | 2022-08-15 00:54:07 -0400 |
---|---|---|
committer | Will McKinnon <[email protected]> | 2022-08-15 00:54:07 -0400 |
commit | 7b530bf4487f36273938ffd7236dad8a7629790a (patch) | |
tree | 0c5cdceb7fbda31530d2d32388db8e27f67748a0 /include/sway/input | |
parent | cf1ed777ae56f677bcc0f832c52c04dc65be18ce (diff) |
Revert "merge sway master"
This reverts commit 7460d9f565092836f81b917a040caff57142d91a.
Diffstat (limited to 'include/sway/input')
-rw-r--r-- | include/sway/input/cursor.h | 6 | ||||
-rw-r--r-- | include/sway/input/seat.h | 4 | ||||
-rw-r--r-- | include/sway/input/text_input.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 3a71a35f..7d66e699 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h @@ -4,7 +4,7 @@ #include <stdint.h> #include <wlr/types/wlr_pointer_constraints_v1.h> #include <wlr/types/wlr_pointer_gestures_v1.h> -#include <wlr/types/wlr_compositor.h> +#include <wlr/types/wlr_surface.h> #include "sway/input/seat.h" #include "config.h" @@ -42,8 +42,6 @@ struct sway_cursor { struct wl_listener swipe_begin; struct wl_listener swipe_update; struct wl_listener swipe_end; - struct wl_listener hold_begin; - struct wl_listener hold_end; struct wl_listener motion; struct wl_listener motion_absolute; @@ -112,7 +110,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, enum wlr_button_state state); void dispatch_cursor_axis(struct sway_cursor *cursor, - struct wlr_pointer_axis_event *event); + struct wlr_event_pointer_axis *event); void cursor_set_image(struct sway_cursor *cursor, const char *image, struct wl_client *client); diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 50c4be9b..77c2278d 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h @@ -18,7 +18,7 @@ struct sway_seatop_impl { enum wlr_button_state state); void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec); void (*pointer_axis)(struct sway_seat *seat, - struct wlr_pointer_axis_event *event); + struct wlr_event_pointer_axis *event); void (*rebase)(struct sway_seat *seat, uint32_t time_msec); void (*tablet_tool_motion)(struct sway_seat *seat, struct sway_tablet_tool *tool, uint32_t time_msec); @@ -274,7 +274,7 @@ void seatop_button(struct sway_seat *seat, uint32_t time_msec, void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec); void seatop_pointer_axis(struct sway_seat *seat, - struct wlr_pointer_axis_event *event); + struct wlr_event_pointer_axis *event); void seatop_tablet_tool_tip(struct sway_seat *seat, struct sway_tablet_tool *tool, uint32_t time_msec, diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h index c70fd935..37744266 100644 --- a/include/sway/input/text_input.h +++ b/include/sway/input/text_input.h @@ -3,7 +3,7 @@ #include <wlr/types/wlr_text_input_v3.h> #include <wlr/types/wlr_input_method_v2.h> -#include <wlr/types/wlr_compositor.h> +#include <wlr/types/wlr_surface.h> #include "sway/input/seat.h" /** |