chore: more refactors

Author: dy-tea

include/config.h

@@ -103,6 +103,13 @@ typedef struct {
 	const char *submap_name, *external_cmd;
 } bind_t;
 
+#define MOUSE_BUTTON_SYNTH_KEYCODE_BASE 0x20000000
+#define MOUSE_BUTTON_KEYCODE_OFFSET 272
+#define mouse_button_to_keycode(button_index) \
+	(MOUSE_BUTTON_SYNTH_KEYCODE_BASE + ((button_index) + MOUSE_BUTTON_KEYCODE_OFFSET))
+#define keycode_to_mouse_button_index(keycode) \
+	((int)(keycode) - MOUSE_BUTTON_SYNTH_KEYCODE_BASE - MOUSE_BUTTON_KEYCODE_OFFSET)
+
 typedef struct {
 	uint32_t modifiers;
 	xkb_keysym_t keysym;
@@ -159,6 +166,9 @@ void load_hotkeys(const char *config_path);
 void reload_hotkeys(void);
 bool keybind_matches(const keybind_t *kb, uint32_t modifiers, xkb_keysym_t keysym,
 	uint32_t keycode);
+keybind_t *find_keybind(uint32_t modifiers, xkb_keysym_t keysym, uint32_t keycode,
+	bool prefer_keycode, bool fallback_to_global);
+bool is_interactive_bind(const keybind_t *kb);
 void execute_keybind(const keybind_t *kb);
 void execute_bell_bind(void);
 void setup_hotkey_event_listener(struct wl_event_loop *event_loop);

include/keyboard.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "config.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <wlr/types/wlr_input_device.h>
@@ -100,3 +101,4 @@ void cancel_presel(void);
 
 // keybind processing
 bool handle_keybind(uint32_t modifiers, xkb_keysym_t sym);
+keybind_t *handle_keybind_raw(uint32_t modifiers, uint32_t keycode, bool pressed);

include/toplevel.h

@@ -96,7 +96,7 @@ void toplevel_apply_decoration_mode(toplevel_t *tl);
 
 bool toplevel_can_tear(toplevel_t *toplevel);
 
-void toplevel_send_frame_done_interator(struct wlr_scene_buffer *scene_buffer, int x, int y,
+void toplevel_send_frame_done_iterator(struct wlr_scene_buffer *scene_buffer, int x, int y,
 	void *data);
 
 toplevel_t *toplevel_create(struct wlr_xdg_toplevel *xdg_toplevel);

src/config.c

@@ -109,9 +109,6 @@ xkb_keysym_t parse_keysym(const char *name) {
 	if (!name || name[0] == '\0')
 		return XKB_KEY_NoSymbol;
 
-	if (strlen(name) == 1)
-		return xkb_keysym_from_name(name, XKB_KEYSYM_CASE_INSENSITIVE);
-
 	return xkb_keysym_from_name(name, XKB_KEYSYM_CASE_INSENSITIVE);
 }
 
@@ -129,7 +126,7 @@ uint32_t parse_keycode(const char *name) {
 
 	for (size_t i = 0; i < sizeof(mouse_buttons) / sizeof(mouse_buttons[0]); i++)
 		if (strcmp(name, mouse_buttons[i]) == 0)
-			return 0x20000000 + i + 272;
+			return mouse_button_to_keycode(i);
 
 	if (name[0] >= '1' && name[0] <= '9' && name[1] == '\0')
 		return name[0] - '0' + 1;
@@ -1056,6 +1053,32 @@ bool keybind_matches(const keybind_t *kb, uint32_t modifiers, xkb_keysym_t keysy
 	}
 }
 
+keybind_t *find_keybind(uint32_t modifiers, xkb_keysym_t keysym, uint32_t keycode,
+		bool prefer_keycode, bool fallback_to_global) {
+	if (active_submap) {
+		for (size_t i = 0; i < active_submap->num_keybinds; i++) {
+			keybind_t *kb = &active_submap->keybinds[i];
+			if (kb->use_keycode == prefer_keycode && keybind_matches(kb, modifiers, keysym, keycode))
+				return kb;
+		}
+		if (!fallback_to_global)
+			return NULL;
+	}
+
+	for (size_t i = 0; i < num_keybinds; i++) {
+		keybind_t *kb = &keybinds[i];
+		if (kb->use_keycode == prefer_keycode && keybind_matches(kb, modifiers, keysym, keycode))
+			return kb;
+	}
+
+	return NULL;
+}
+
+bool is_interactive_bind(const keybind_t *kb) {
+	return kb && (kb->action == BIND_INTERACTIVE_MOVE || kb->action == BIND_INTERACTIVE_RESIZE ||
+		kb->action == BIND_TILING_DRAG);
+}
+
 void execute_bind(bind_t b) {
 	switch (b.action) {
 	case BIND_QUIT: