瀏覽代碼

Wayland: Clean up listener struct initialization

Adapt style to match the rest of the project.
Camilla Löwy 3 年之前
父節點
當前提交
0f38382e25
共有 3 個文件被更改,包括 26 次插入13 次删除
  1. 4 2
      src/wl_init.c
  2. 2 1
      src/wl_monitor.c
  3. 20 10
      src/wl_window.c

+ 4 - 2
src/wl_init.c

@@ -62,7 +62,8 @@ static void wmBaseHandlePing(void* userData,
     xdg_wm_base_pong(wmBase, serial);
     xdg_wm_base_pong(wmBase, serial);
 }
 }
 
 
-static const struct xdg_wm_base_listener wmBaseListener = {
+static const struct xdg_wm_base_listener wmBaseListener =
+{
     wmBaseHandlePing
     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,
     registryHandleGlobal,
     registryHandleGlobalRemove
     registryHandleGlobalRemove
 };
 };

+ 2 - 1
src/wl_monitor.c

@@ -108,7 +108,8 @@ static void outputHandleScale(void* userData,
     monitor->wl.scale = factor;
     monitor->wl.scale = factor;
 }
 }
 
 
-static const struct wl_output_listener outputListener = {
+static const struct wl_output_listener outputListener =
+{
     outputHandleGeometry,
     outputHandleGeometry,
     outputHandleMode,
     outputHandleMode,
     outputHandleDone,
     outputHandleDone,

+ 20 - 10
src/wl_window.c

@@ -285,7 +285,8 @@ static void xdgDecorationHandleConfigure(void* userData,
         createDecorations(window);
         createDecorations(window);
 }
 }
 
 
-static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener = {
+static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener =
+{
     xdgDecorationHandleConfigure,
     xdgDecorationHandleConfigure,
 };
 };
 
 
@@ -513,7 +514,8 @@ static void xdgToplevelHandleClose(void* userData,
     _glfwInputWindowCloseRequest(window);
     _glfwInputWindowCloseRequest(window);
 }
 }
 
 
-static const struct xdg_toplevel_listener xdgToplevelListener = {
+static const struct xdg_toplevel_listener xdgToplevelListener =
+{
     xdgToplevelHandleConfigure,
     xdgToplevelHandleConfigure,
     xdgToplevelHandleClose
     xdgToplevelHandleClose
 };
 };
@@ -1175,7 +1177,8 @@ static void pointerHandleAxis(void* userData,
     _glfwInputScroll(window, x, y);
     _glfwInputScroll(window, x, y);
 }
 }
 
 
-static const struct wl_pointer_listener pointerListener = {
+static const struct wl_pointer_listener pointerListener =
+{
     pointerHandleEnter,
     pointerHandleEnter,
     pointerHandleLeave,
     pointerHandleLeave,
     pointerHandleMotion,
     pointerHandleMotion,
@@ -1470,7 +1473,8 @@ static void keyboardHandleRepeatInfo(void* userData,
 }
 }
 #endif
 #endif
 
 
-static const struct wl_keyboard_listener keyboardListener = {
+static const struct wl_keyboard_listener keyboardListener =
+{
     keyboardHandleKeymap,
     keyboardHandleKeymap,
     keyboardHandleEnter,
     keyboardHandleEnter,
     keyboardHandleLeave,
     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,
     seatHandleCapabilities,
     seatHandleName,
     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
     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,
     dataDeviceHandleDataOffer,
     dataDeviceHandleEnter,
     dataDeviceHandleEnter,
     dataDeviceHandleLeave,
     dataDeviceHandleLeave,
@@ -2271,7 +2278,8 @@ static void relativePointerHandleRelativeMotion(void* userData,
     _glfwInputCursorPos(window, xpos, ypos);
     _glfwInputCursorPos(window, xpos, ypos);
 }
 }
 
 
-static const struct zwp_relative_pointer_v1_listener relativePointerListener = {
+static const struct zwp_relative_pointer_v1_listener relativePointerListener =
+{
     relativePointerHandleRelativeMotion
     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,
     lockedPointerHandleLocked,
     lockedPointerHandleUnlocked
     lockedPointerHandleUnlocked
 };
 };
@@ -2468,7 +2477,8 @@ static void dataSourceHandleCancelled(void* userData,
     _glfw.wl.selectionSource = NULL;
     _glfw.wl.selectionSource = NULL;
 }
 }
 
 
-static const struct wl_data_source_listener dataSourceListener = {
+static const struct wl_data_source_listener dataSourceListener =
+{
     dataSourceHandleTarget,
     dataSourceHandleTarget,
     dataSourceHandleSend,
     dataSourceHandleSend,
     dataSourceHandleCancelled,
     dataSourceHandleCancelled,