From 6044c6418b9e95a06ba3010c6ba9055fe96907c4 Mon Sep 17 00:00:00 2001 From: Window Maker Date: Tue, 2 Jun 2026 11:58:23 +0200 Subject: [PATCH] decompose wl_backend.c: extract wl_events.c --- src/Makefile.am | 3 ++- src/backend/wayland/wl_backend.c | 35 ---------------------------- src/backend/wayland/wl_events.c | 40 ++++++++++++++++++++++++++++++++ src/backend/wayland/wl_types.h | 4 ++++ 4 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 src/backend/wayland/wl_events.c diff --git a/src/Makefile.am b/src/Makefile.am index b7f8c2c..400f9d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -172,7 +172,8 @@ wmaker_SOURCES += \ backend/wayland/wl_xkb.c \ backend/wayland/wl_badge.c \ backend/wayland/wl_fakeleader.c \ - backend/wayland/wl_extensions.c + backend/wayland/wl_extensions.c \ + backend/wayland/wl_events.c endif if USE_NESTED_FUNC diff --git a/src/backend/wayland/wl_backend.c b/src/backend/wayland/wl_backend.c index 1380927..cbcbe4a 100644 --- a/src/backend/wayland/wl_backend.c +++ b/src/backend/wayland/wl_backend.c @@ -5452,41 +5452,6 @@ wl_keyboard_ungrab(void) } -/* ------------------------------------------------------------------ */ -/* Events */ -/* ------------------------------------------------------------------ */ - -/* ------------------------------------------------------------------ */ -static Bool -wl_noop_screen_get_head_usable_area(WScreen *scr, int head, - int *x1, int *y1, int *x2, int *y2) -{ - (void)scr; (void)head; (void)x1; (void)y1; (void)x2; (void)y2; - /* Layer-shell strut tracking not yet wired; full head is usable. */ - return False; -} - -/* WNativeWindow map / unmap / geometry */ -/* ------------------------------------------------------------------ */ - - - - - - - - - - - -static int -wl_coords_translate(WNativeWindow src, WNativeWindow dst, - int src_x, int src_y, int *dst_x, int *dst_y) -{ - (void)src; (void)dst; - *dst_x = src_x; *dst_y = src_y; - return 0; -} diff --git a/src/backend/wayland/wl_events.c b/src/backend/wayland/wl_events.c new file mode 100644 index 0000000..e5640e5 --- /dev/null +++ b/src/backend/wayland/wl_events.c @@ -0,0 +1,40 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include "wl_types.h" + +/* ------------------------------------------------------------------ */ +/* Events */ +/* ------------------------------------------------------------------ */ + +/* ------------------------------------------------------------------ */ +Bool +wl_noop_screen_get_head_usable_area(WScreen *scr, int head, + int *x1, int *y1, int *x2, int *y2) +{ + (void)scr; (void)head; (void)x1; (void)y1; (void)x2; (void)y2; + /* Layer-shell strut tracking not yet wired; full head is usable. */ + return False; +} + +/* WNativeWindow map / unmap / geometry */ +/* ------------------------------------------------------------------ */ + + + + + + + + + + + +int +wl_coords_translate(WNativeWindow src, WNativeWindow dst, + int src_x, int src_y, int *dst_x, int *dst_y) +{ + (void)src; (void)dst; + *dst_x = src_x; *dst_y = src_y; + return 0; +} diff --git a/src/backend/wayland/wl_types.h b/src/backend/wayland/wl_types.h index 1db5434..c7a22e2 100644 --- a/src/backend/wayland/wl_types.h +++ b/src/backend/wayland/wl_types.h @@ -537,3 +537,7 @@ int wl_signalfd_handler(int fd, uint32_t mask, void *data); void wl_handle_inotify_events(void); void wl_event_loop_run(void); void wl_event_loop_terminate(void); + +/* Events module (extracted to wl_events.c) */ +Bool wl_noop_screen_get_head_usable_area(WScreen *scr, int head, int *x1, int *y1, int *x2, int *y2); +int wl_coords_translate(WNativeWindow src, WNativeWindow dst, int src_x, int src_y, int *dst_x, int *dst_y);