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 --- util/array.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/array.c b/util/array.c index 9ee39d33..7095870d 100644 --- a/util/array.c +++ b/util/array.c @@ -1,5 +1,5 @@ -#include -#include +#include "util/array.h" +#include // https://www.geeksforgeeks.org/move-zeroes-end-array/ size_t push_zeroes_to_end(uint32_t arr[], size_t n) { @@ -19,3 +19,31 @@ size_t push_zeroes_to_end(uint32_t arr[], size_t n) { return ret; } + +bool set_add(uint32_t values[], size_t *len, size_t cap, uint32_t target) { + if (*len == cap) { + return false; + } + assert(target > 0); + for (uint32_t i = 0; i < *len; ++i) { + if (values[i] == target) { + return false; + } + } + values[(*len)++] = target; + return false; +} + +bool set_remove(uint32_t values[], size_t *len, size_t cap, uint32_t target) { + for (uint32_t i = 0; i < *len; ++i) { + if (values[i] == target) { + // Set to 0 and swap with the end element so that + // zeroes exist only after all the values. + size_t last_elem_pos = --(*len); + values[i] = values[last_elem_pos]; + values[last_elem_pos] = 0; + return true; + } + } + return false; +} -- cgit v1.2.3