From 0f38382e25f484a8da2660f606c30b32a51b600e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Thu, 31 Mar 2022 22:17:08 +0200 Subject: [PATCH] Wayland: Clean up listener struct initialization Adapt style to match the rest of the project. --- src/wl_init.c | 6 ++++-- src/wl_monitor.c | 3 ++- src/wl_window.c | 30 ++++++++++++++++++++---------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/wl_init.c b/src/wl_init.c index 4ea5e1e4..6545c41e 100644 --- a/src/wl_init.c +++ b/src/wl_init.c @@ -62,7 +62,8 @@ static void wmBaseHandlePing(void* userData, xdg_wm_base_pong(wmBase, serial); } -static const struct xdg_wm_base_listener wmBaseListener = { +static const struct xdg_wm_base_listener wmBaseListener = +{ wmBaseHandlePing }; @@ -172,7 +173,8 @@ static void registryHandleGlobalRemove(void* userData, } -static const struct wl_registry_listener registryListener = { +static const struct wl_registry_listener registryListener = +{ registryHandleGlobal, registryHandleGlobalRemove }; diff --git a/src/wl_monitor.c b/src/wl_monitor.c index 07adaa39..568bdc5f 100644 --- a/src/wl_monitor.c +++ b/src/wl_monitor.c @@ -108,7 +108,8 @@ static void outputHandleScale(void* userData, monitor->wl.scale = factor; } -static const struct wl_output_listener outputListener = { +static const struct wl_output_listener outputListener = +{ outputHandleGeometry, outputHandleMode, outputHandleDone, diff --git a/src/wl_window.c b/src/wl_window.c index 57c75cec..3fd4a87b 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -285,7 +285,8 @@ static void xdgDecorationHandleConfigure(void* userData, createDecorations(window); } -static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener = { +static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener = +{ xdgDecorationHandleConfigure, }; @@ -513,7 +514,8 @@ static void xdgToplevelHandleClose(void* userData, _glfwInputWindowCloseRequest(window); } -static const struct xdg_toplevel_listener xdgToplevelListener = { +static const struct xdg_toplevel_listener xdgToplevelListener = +{ xdgToplevelHandleConfigure, xdgToplevelHandleClose }; @@ -1175,7 +1177,8 @@ static void pointerHandleAxis(void* userData, _glfwInputScroll(window, x, y); } -static const struct wl_pointer_listener pointerListener = { +static const struct wl_pointer_listener pointerListener = +{ pointerHandleEnter, pointerHandleLeave, pointerHandleMotion, @@ -1470,7 +1473,8 @@ static void keyboardHandleRepeatInfo(void* userData, } #endif -static const struct wl_keyboard_listener keyboardListener = { +static const struct wl_keyboard_listener keyboardListener = +{ keyboardHandleKeymap, keyboardHandleEnter, keyboardHandleLeave, @@ -1514,7 +1518,8 @@ static void seatHandleName(void* userData, { } -static const struct wl_seat_listener seatListener = { +static const struct wl_seat_listener seatListener = +{ seatHandleCapabilities, seatHandleName, }; @@ -1535,7 +1540,8 @@ static void dataOfferHandleOffer(void* userData, } } -static const struct wl_data_offer_listener dataOfferListener = { +static const struct wl_data_offer_listener dataOfferListener = +{ dataOfferHandleOffer }; @@ -1625,7 +1631,8 @@ static void dataDeviceHandleSelection(void* userData, } } -const struct wl_data_device_listener dataDeviceListener = { +const struct wl_data_device_listener dataDeviceListener = +{ dataDeviceHandleDataOffer, dataDeviceHandleEnter, dataDeviceHandleLeave, @@ -2271,7 +2278,8 @@ static void relativePointerHandleRelativeMotion(void* userData, _glfwInputCursorPos(window, xpos, ypos); } -static const struct zwp_relative_pointer_v1_listener relativePointerListener = { +static const struct zwp_relative_pointer_v1_listener relativePointerListener = +{ relativePointerHandleRelativeMotion }; @@ -2301,7 +2309,8 @@ static void lockedPointerHandleUnlocked(void* userData, { } -static const struct zwp_locked_pointer_v1_listener lockedPointerListener = { +static const struct zwp_locked_pointer_v1_listener lockedPointerListener = +{ lockedPointerHandleLocked, lockedPointerHandleUnlocked }; @@ -2468,7 +2477,8 @@ static void dataSourceHandleCancelled(void* userData, _glfw.wl.selectionSource = NULL; } -static const struct wl_data_source_listener dataSourceListener = { +static const struct wl_data_source_listener dataSourceListener = +{ dataSourceHandleTarget, dataSourceHandleSend, dataSourceHandleCancelled,