From 754b7feaa144b22383457f9c0561adc9ebb24fd7 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 29 Sep 2018 21:01:03 +0200 Subject: [PATCH] Wayland: Rename handlers for more unicity --- src/wl_monitor.c | 48 ++++++++++++++++---------------- src/wl_window.c | 72 ++++++++++++++++++++++++------------------------ 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/wl_monitor.c b/src/wl_monitor.c index b4739205..7d8e23eb 100644 --- a/src/wl_monitor.c +++ b/src/wl_monitor.c @@ -32,16 +32,16 @@ #include -static void geometry(void* data, - struct wl_output* output, - int32_t x, - int32_t y, - int32_t physicalWidth, - int32_t physicalHeight, - int32_t subpixel, - const char* make, - const char* model, - int32_t transform) +static void outputHandleGeometry(void* data, + struct wl_output* output, + int32_t x, + int32_t y, + int32_t physicalWidth, + int32_t physicalHeight, + int32_t subpixel, + const char* make, + const char* model, + int32_t transform) { struct _GLFWmonitor *monitor = data; char name[1024]; @@ -55,12 +55,12 @@ static void geometry(void* data, monitor->name = _glfw_strdup(name); } -static void mode(void* data, - struct wl_output* output, - uint32_t flags, - int32_t width, - int32_t height, - int32_t refresh) +static void outputHandleMode(void* data, + struct wl_output* output, + uint32_t flags, + int32_t width, + int32_t height, + int32_t refresh) { struct _GLFWmonitor *monitor = data; GLFWvidmode mode; @@ -81,16 +81,16 @@ static void mode(void* data, monitor->wl.currentMode = monitor->modeCount - 1; } -static void done(void* data, struct wl_output* output) +static void outputHandleDone(void* data, struct wl_output* output) { struct _GLFWmonitor *monitor = data; _glfwInputMonitor(monitor, GLFW_CONNECTED, _GLFW_INSERT_LAST); } -static void scale(void* data, - struct wl_output* output, - int32_t factor) +static void outputHandleScale(void* data, + struct wl_output* output, + int32_t factor) { struct _GLFWmonitor *monitor = data; @@ -98,10 +98,10 @@ static void scale(void* data, } static const struct wl_output_listener outputListener = { - geometry, - mode, - done, - scale, + outputHandleGeometry, + outputHandleMode, + outputHandleDone, + outputHandleScale, }; diff --git a/src/wl_window.c b/src/wl_window.c index 72df68a5..93bb1729 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -39,18 +39,18 @@ #include -static void handlePing(void* data, - struct wl_shell_surface* shellSurface, - uint32_t serial) +static void shellSurfaceHandlePing(void* data, + struct wl_shell_surface* shellSurface, + uint32_t serial) { wl_shell_surface_pong(shellSurface, serial); } -static void handleConfigure(void* data, - struct wl_shell_surface* shellSurface, - uint32_t edges, - int32_t width, - int32_t height) +static void shellSurfaceHandleConfigure(void* data, + struct wl_shell_surface* shellSurface, + uint32_t edges, + int32_t width, + int32_t height) { _GLFWwindow* window = data; float aspectRatio; @@ -94,15 +94,15 @@ static void handleConfigure(void* data, _glfwInputWindowDamage(window); } -static void handlePopupDone(void* data, - struct wl_shell_surface* shellSurface) +static void shellSurfaceHandlePopupDone(void* data, + struct wl_shell_surface* shellSurface) { } static const struct wl_shell_surface_listener shellSurfaceListener = { - handlePing, - handleConfigure, - handlePopupDone + shellSurfaceHandlePing, + shellSurfaceHandleConfigure, + shellSurfaceHandlePopupDone }; static int createTmpfileCloexec(char* tmpname) @@ -387,9 +387,9 @@ static void checkScaleChange(_GLFWwindow* window) } } -static void handleEnter(void *data, - struct wl_surface *surface, - struct wl_output *output) +static void surfaceHandleEnter(void *data, + struct wl_surface *surface, + struct wl_output *output) { _GLFWwindow* window = data; _GLFWmonitor* monitor = wl_output_get_user_data(output); @@ -407,9 +407,9 @@ static void handleEnter(void *data, checkScaleChange(window); } -static void handleLeave(void *data, - struct wl_surface *surface, - struct wl_output *output) +static void surfaceHandleLeave(void *data, + struct wl_surface *surface, + struct wl_output *output) { _GLFWwindow* window = data; _GLFWmonitor* monitor = wl_output_get_user_data(output); @@ -429,8 +429,8 @@ static void handleLeave(void *data, } static const struct wl_surface_listener surfaceListener = { - handleEnter, - handleLeave + surfaceHandleEnter, + surfaceHandleLeave }; static void setIdleInhibitor(_GLFWwindow* window, GLFWbool enable) @@ -1352,14 +1352,14 @@ void _glfwPlatformDestroyCursor(_GLFWcursor* cursor) wl_buffer_destroy(cursor->wl.buffer); } -static void handleRelativeMotion(void* data, - struct zwp_relative_pointer_v1* pointer, - uint32_t timeHi, - uint32_t timeLo, - wl_fixed_t dx, - wl_fixed_t dy, - wl_fixed_t dxUnaccel, - wl_fixed_t dyUnaccel) +static void relativePointerHandleRelativeMotion(void* data, + struct zwp_relative_pointer_v1* pointer, + uint32_t timeHi, + uint32_t timeLo, + wl_fixed_t dx, + wl_fixed_t dy, + wl_fixed_t dxUnaccel, + wl_fixed_t dyUnaccel) { _GLFWwindow* window = data; @@ -1372,11 +1372,11 @@ static void handleRelativeMotion(void* data, } static const struct zwp_relative_pointer_v1_listener relativePointerListener = { - handleRelativeMotion + relativePointerHandleRelativeMotion }; -static void handleLocked(void* data, - struct zwp_locked_pointer_v1* lockedPointer) +static void lockedPointerHandleLocked(void* data, + struct zwp_locked_pointer_v1* lockedPointer) { } @@ -1396,14 +1396,14 @@ static void unlockPointer(_GLFWwindow* window) static void lockPointer(_GLFWwindow* window); -static void handleUnlocked(void* data, - struct zwp_locked_pointer_v1* lockedPointer) +static void lockedPointerHandleUnlocked(void* data, + struct zwp_locked_pointer_v1* lockedPointer) { } static const struct zwp_locked_pointer_v1_listener lockedPointerListener = { - handleLocked, - handleUnlocked + lockedPointerHandleLocked, + lockedPointerHandleUnlocked }; static void lockPointer(_GLFWwindow* window)