commit 5e2f2b5
uint
·
2026-08-04 00:41:29 +0000 UTC
parent fbfe662
Wayland: reformat handlers
1 files changed,
+23,
-40
+23,
-40
1@@ -14,54 +14,35 @@
2
3 static void registry_global_remove(void *data, struct wl_registry *wl_registry, uint32_t name);
4 static void xdg_surface_configure(void* data, struct xdg_surface* xdg_surface, uint32_t serial);
5-static void xdg_toplevel_configure(void* data, struct xdg_toplevel* xdg_toplevel,
6- int32_t width, int32_t height, struct wl_array* states);
7+static void xdg_toplevel_configure(void* data, struct xdg_toplevel* xdg_toplevel, int32_t width, int32_t height, struct wl_array* states);
8 static void xdg_toplevel_close(void* data, struct xdg_toplevel* xdg_toplevel);
9-static void xdg_toplevel_configure_bounds(void* data, struct xdg_toplevel* xdg_toplevel,
10- int32_t width, int32_t height);
11-static void xdg_toplevel_wm_capabilities(void* data, struct xdg_toplevel* xdg_toplevel,
12- struct wl_array* capabilities);
13+static void xdg_toplevel_configure_bounds(void* data, struct xdg_toplevel* xdg_toplevel, int32_t width, int32_t height);
14+static void xdg_toplevel_wm_capabilities(void* data, struct xdg_toplevel* xdg_toplevel, struct wl_array* capabilities);
15 static void wm_base_ping(void* data, struct xdg_wm_base* wm_base, uint32_t serial);
16 static void seat_capabilities(void* data, struct wl_seat* seat, uint32_t capabilities);
17 static void seat_name(void* data, struct wl_seat* seat, const char* name);
18-static void pointer_enter(void* data, struct wl_pointer* pointer, uint32_t serial,
19- struct wl_surface* surface, wl_fixed_t sx, wl_fixed_t sy);
20-static void pointer_leave(void* data, struct wl_pointer* pointer, uint32_t serial,
21- struct wl_surface* surface);
22-static void pointer_motion(void* data, struct wl_pointer* pointer, uint32_t time,
23- wl_fixed_t sx, wl_fixed_t sy);
24-static void pointer_button(void* data, struct wl_pointer* pointer, uint32_t serial,
25- uint32_t time, uint32_t button, uint32_t state);
26-static void pointer_axis(void* data, struct wl_pointer* pointer, uint32_t time,
27- uint32_t axis, wl_fixed_t value);
28+static void pointer_enter(void* data, struct wl_pointer* pointer, uint32_t serial, struct wl_surface* surface, wl_fixed_t sx, wl_fixed_t sy);
29+static void pointer_leave(void* data, struct wl_pointer* pointer, uint32_t serial, struct wl_surface* surface);
30+static void pointer_motion(void* data, struct wl_pointer* pointer, uint32_t time, wl_fixed_t sx, wl_fixed_t sy);
31+static void pointer_button(void* data, struct wl_pointer* pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state);
32+static void pointer_axis(void* data, struct wl_pointer* pointer, uint32_t time, uint32_t axis, wl_fixed_t value);
33 static void pointer_frame(void* data, struct wl_pointer* pointer);
34 static void pointer_axis_source(void* data, struct wl_pointer* pointer, uint32_t axis_source);
35-static void pointer_axis_stop(void* data, struct wl_pointer* pointer, uint32_t time,
36- uint32_t axis);
37-static void pointer_axis_discrete(void* data, struct wl_pointer* pointer, uint32_t axis,
38- int32_t discrete);
39-static void pointer_axis_value120(void* data, struct wl_pointer* pointer, uint32_t axis,
40- int32_t value120);
41-static void pointer_axis_relative_direction(void* data, struct wl_pointer* pointer,
42- uint32_t axis, uint32_t direction);
43-static void keyboard_keymap(void* data, struct wl_keyboard* keyboard, uint32_t format,
44- int32_t fd, uint32_t size);
45-static void keyboard_enter(void* data, struct wl_keyboard* keyboard, uint32_t serial,
46- struct wl_surface* surface, struct wl_array* keys);
47-static void keyboard_leave(void* data, struct wl_keyboard* keyboard, uint32_t serial,
48- struct wl_surface* surface);
49-static void keyboard_key(void* data, struct wl_keyboard* keyboard, uint32_t serial,
50- uint32_t time, uint32_t key, uint32_t state);
51-static void keyboard_modifiers(void* data, struct wl_keyboard* keyboard, uint32_t serial,
52- uint32_t mods_depressed, uint32_t mods_latched,
53- uint32_t mods_locked, uint32_t group);
54-static void keyboard_repeat_info(void* data, struct wl_keyboard* keyboard,
55- int32_t rate, int32_t delay);
56-static void registry_global(void* data, struct wl_registry* registry,
57- uint32_t name, const char* interface,
58- uint32_t version);
59+static void pointer_axis_stop(void* data, struct wl_pointer* pointer, uint32_t time, uint32_t axis);
60+static void pointer_axis_discrete(void* data, struct wl_pointer* pointer, uint32_t axis, int32_t discrete);
61+static void pointer_axis_value120(void* data, struct wl_pointer* pointer, uint32_t axis, int32_t value120);
62+static void pointer_axis_relative_direction(void* data, struct wl_pointer* pointer, uint32_t axis, uint32_t direction);
63+static void keyboard_keymap(void* data, struct wl_keyboard* keyboard, uint32_t format, int32_t fd, uint32_t size);
64+static void keyboard_enter(void* data, struct wl_keyboard* keyboard, uint32_t serial, struct wl_surface* surface, struct wl_array* keys);
65+static void keyboard_leave(void* data, struct wl_keyboard* keyboard, uint32_t serial, struct wl_surface* surface);
66+static void keyboard_key(void* data, struct wl_keyboard* keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state);
67+static void keyboard_modifiers(void* data, struct wl_keyboard* keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group);
68+static void keyboard_repeat_info(void* data, struct wl_keyboard* keyboard, int32_t rate, int32_t delay);
69+static void registry_global(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version);
70+
71 static MausKey keysym_to_mauskey(xkb_keysym_t sym);
72 static MausMouseButton wl_button_to_maus(uint32_t button);
73+
74 static struct wl_registry_listener registry_listener = { registry_global, registry_global_remove };
75 static struct xdg_surface_listener xdg_surface_listener = { xdg_surface_configure };
76 static struct xdg_toplevel_listener xdg_toplevel_listener = {
77@@ -334,6 +315,8 @@ static void keyboard_key(void* data, struct wl_keyboard* keyboard, uint32_t seri
78 be->pending.key_code = code;
79 be->pending.key_sym = keysym_to_mauskey(sym);
80 be->pending.key_text = text[0];
81+ if (be->pending.key_sym == MAUS_KEY_ENTER)
82+ be->pending.key_text = '\n';
83 be->pending.key_pressed = state == WL_KEYBOARD_KEY_STATE_PRESSED;
84
85 if (code < MAUS_KEYCODE_LAST)