From 06a13203ddb9c085b1e514b09b424c19f058fd8d Mon Sep 17 00:00:00 2001 From: Ashkan Kiani Date: Sat, 15 Jun 2019 11:08:53 -0700 Subject: Use a set to track pointer button state. In addition to `button_count`, we keep track of the current buttons pressed just as in `wlr_keyboard`. Add `set_add` and `set_remove` to assist with this. These functions can only be used with values greater than 0 (such as the button/key masks for keyboards and pointers). Partially addresses: - https://github.com/swaywm/wlroots/issues/1716 - https://github.com/swaywm/wlroots/issues/1593 --- include/util/array.h | 15 +++++++++++++++ include/wlr/types/wlr_seat.h | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/util/array.h b/include/util/array.h index 1c046e1d..32bc059f 100644 --- a/include/util/array.h +++ b/include/util/array.h @@ -3,7 +3,22 @@ #include #include +#include size_t push_zeroes_to_end(uint32_t arr[], size_t n); +/** + * Add `target` to `values` if it doesn't exist + * "set"s should only be modified with set_* functions + * Values MUST be greater than 0 + */ +bool set_add(uint32_t values[], size_t *len, size_t cap, uint32_t target); + +/** + * Remove `target` from `values` if it exists + * "set"s should only be modified with set_* functions + * Values MUST be greater than 0 + */ +bool set_remove(uint32_t values[], size_t *len, size_t cap, uint32_t target); + #endif diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 0724136b..bfd3625d 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -131,6 +131,8 @@ struct wlr_seat_pointer_grab { void *data; }; +#define WLR_POINTER_BUTTONS_CAP 16 + struct wlr_seat_pointer_state { struct wlr_seat *seat; struct wlr_seat_client *focused_client; @@ -140,7 +142,8 @@ struct wlr_seat_pointer_state { struct wlr_seat_pointer_grab *grab; struct wlr_seat_pointer_grab *default_grab; - uint32_t button_count; + uint32_t buttons[WLR_POINTER_BUTTONS_CAP]; + size_t button_count; uint32_t grab_button; uint32_t grab_serial; uint32_t grab_time; -- cgit v1.2.3