util/array: unclutter

include/util/array.h

@@ -1,27 +1,10 @@
 #ifndef UTIL_ARRAY_H
 #define UTIL_ARRAY_H
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <wayland-util.h>
 
-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);
-
 /**
  * Remove a chunk of memory of the specified size at the specified offset.
  */

include/util/set.h

@@ -0,0 +1,25 @@
+#ifndef UTIL_SET_H
+#define UTIL_SET_H
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+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
+

types/seat/wlr_seat_pointer.c

@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/util/log.h>
 #include "types/wlr_seat.h"
-#include "util/array.h"
+#include "util/set.h"
 
 static void default_pointer_enter(struct wlr_seat_pointer_grab *grab,
 		struct wlr_surface *surface, double sx, double sy) {

types/tablet_v2/wlr_tablet_v2_tool.c

@@ -10,7 +10,7 @@
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
-#include "util/array.h"
+#include "util/set.h"
 #include "util/time.h"
 #include "tablet-unstable-v2-protocol.h"
 

types/wlr_keyboard.c

@@ -8,7 +8,7 @@
 #include <wlr/util/log.h>
 #include "interfaces/wlr_input_device.h"
 #include "types/wlr_keyboard.h"
-#include "util/array.h"
+#include "util/set.h"
 #include "util/shm.h"
 #include "util/time.h"
 

util/array.c

@@ -2,52 +2,6 @@
 #include <assert.h>
 #include <string.h>
 
-// https://www.geeksforgeeks.org/move-zeroes-end-array/
-size_t push_zeroes_to_end(uint32_t arr[], size_t n) {
-	size_t count = 0;
-
-	for (size_t i = 0; i < n; i++) {
-		if (arr[i] != 0) {
-			arr[count++] = arr[i];
-		}
-	}
-
-	size_t ret = count;
-
-	while (count < n) {
-		arr[count++] = 0;
-	}
-
-	return ret;
-}
-
-bool set_add(uint32_t values[], size_t *len, size_t cap, uint32_t target) {
-	if (*len == cap) {
-		return false;
-	}
-	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;
-}
-
 void array_remove_at(struct wl_array *arr, size_t offset, size_t size) {
 	assert(arr->size >= offset + size);
 

util/meson.build

@@ -6,6 +6,7 @@ wlr_files += files(
 	'global.c',
 	'log.c',
 	'region.c',
+	'set.c',
 	'shm.c',
 	'time.c',
 	'token.c',

util/set.c

@@ -0,0 +1,47 @@
+#include "util/set.h"
+
+// https://www.geeksforgeeks.org/move-zeroes-end-array/
+size_t push_zeroes_to_end(uint32_t arr[], size_t n) {
+	size_t count = 0;
+
+	for (size_t i = 0; i < n; i++) {
+		if (arr[i] != 0) {
+			arr[count++] = arr[i];
+		}
+	}
+
+	size_t ret = count;
+
+	while (count < n) {
+		arr[count++] = 0;
+	}
+
+	return ret;
+}
+
+bool set_add(uint32_t values[], size_t *len, size_t cap, uint32_t target) {
+	if (*len == cap) {
+		return false;
+	}
+	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;
+}