From 7d6f92a44639c2ba5300d505b0d1fa49d9959f9f Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Thu, 30 Jun 2022 12:22:46 +0200 Subject: [PATCH] Wayland: only use required stub listeners --- src/detection/displayserver/wayland.c | 38 --------------------------- 1 file changed, 38 deletions(-) diff --git a/src/detection/displayserver/wayland.c b/src/detection/displayserver/wayland.c index ee426de22..169e1960a 100644 --- a/src/detection/displayserver/wayland.c +++ b/src/detection/displayserver/wayland.c @@ -41,34 +41,6 @@ static void waylandOutputGeometryListener(void* data, struct wl_output* wl_outpu FF_UNUSED(data, wl_output, x, y, physical_width, physical_height, subpixel, make, model, transform); } -#if WAYLAND_VERSION_MINOR >= 2 - -static void waylandOutputDoneListener(void* data, struct wl_output* wl_output) -{ - FF_UNUSED(data, wl_output); -} - -static void waylandOutputScaleListener(void* data, struct wl_output* wl_output, int32_t factor) -{ - FF_UNUSED(data, wl_output, factor); -} - -#endif - -#if WAYLAND_VERSION_MINOR >= 4 - -static void waylandOutputNameListener(void *data, struct wl_output *wl_output, const char *name) -{ - FF_UNUSED(data, wl_output, name); -} - -static void waylandOutputDescriptionListener(void *data, struct wl_output *wl_output, const char *description) -{ - FF_UNUSED(data, wl_output, description); -} - -#endif - static void waylandOutputModeListener(void* data, struct wl_output* output, uint32_t flags, int32_t width, int32_t height, int32_t refreshRate) { WaylandData* wldata = data; @@ -108,16 +80,6 @@ static void waylandGlobalAddListener(void* data, struct wl_registry* registry, u static struct wl_output_listener outputListener = { .mode = waylandOutputModeListener, //This is the only one we really need .geometry = waylandOutputGeometryListener, - - #if WAYLAND_VERSION_MINOR >= 2 - .done = waylandOutputDoneListener, - .scale = waylandOutputScaleListener, - #endif - - #if WAYLAND_VERSION_MINOR >= 4 - .name = waylandOutputNameListener, - .description = waylandOutputDescriptionListener, - #endif }; wldata->ffwl_proxy_add_listener(output, (void(**)(void)) &outputListener, data);