Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-11 13:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Rename listener user data parameters

Browse Source 
(cherry picked from commit a4460b694e)
This commit is contained in:
Camilla Löwy 2022-03-23 18:58:08 +01:00
parent 3599fe4a78
commit f51ec79951
3 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/wl_init.c
View File

@ -77,7 +77,7 @@ static _GLFWwindow* findWindowFromDecorationSurface(struct wl_surface* surface,
return window;
}
static void pointerHandleEnter(void* data,
static void pointerHandleEnter(void* userData,
struct wl_pointer* pointer,
uint32_t serial,
struct wl_surface* surface,
@ -108,7 +108,7 @@ static void pointerHandleEnter(void* data,
_glfwInputCursorEnter(window, GLFW_TRUE);
}
static void pointerHandleLeave(void* data,
static void pointerHandleLeave(void* userData,
struct wl_pointer* pointer,
uint32_t serial,
struct wl_surface* surface)
@ -171,7 +171,7 @@ static void setCursor(_GLFWwindow* window, const char* name)
_glfw.wl.cursorPreviousName = name;
}
static void pointerHandleMotion(void* data,
static void pointerHandleMotion(void* userData,
struct wl_pointer* pointer,
uint32_t time,
wl_fixed_t sx,
@ -230,7 +230,7 @@ static void pointerHandleMotion(void* data,
setCursor(window, cursorName);
}
static void pointerHandleButton(void* data,
static void pointerHandleButton(void* userData,
struct wl_pointer* pointer,
uint32_t serial,
uint32_t time,
@ -326,7 +326,7 @@ static void pointerHandleButton(void* data,
_glfw.wl.xkb.modifiers);
}
static void pointerHandleAxis(void* data,
static void pointerHandleAxis(void* userData,
struct wl_pointer* pointer,
uint32_t time,
uint32_t axis,
@ -361,7 +361,7 @@ static const struct wl_pointer_listener pointerListener = {
pointerHandleAxis,
};
static void keyboardHandleKeymap(void* data,
static void keyboardHandleKeymap(void* userData,
struct wl_keyboard* keyboard,
uint32_t format,
int fd,
@ -457,7 +457,7 @@ static void keyboardHandleKeymap(void* data,
1 << xkb_keymap_mod_get_index(_glfw.wl.xkb.keymap, "Mod2");
}
static void keyboardHandleEnter(void* data,
static void keyboardHandleEnter(void* userData,
struct wl_keyboard* keyboard,
uint32_t serial,
struct wl_surface* surface,
@ -480,7 +480,7 @@ static void keyboardHandleEnter(void* data,
_glfwInputWindowFocus(window, GLFW_TRUE);
}
static void keyboardHandleLeave(void* data,
static void keyboardHandleLeave(void* userData,
struct wl_keyboard* keyboard,
uint32_t serial,
struct wl_surface* surface)
@ -546,7 +546,7 @@ GLFWbool _glfwInputTextWayland(_GLFWwindow* window, uint32_t scancode)
return xkb_keymap_key_repeats(_glfw.wl.xkb.keymap, keycode);
}
static void keyboardHandleKey(void* data,
static void keyboardHandleKey(void* userData,
struct wl_keyboard* keyboard,
uint32_t serial,
uint32_t time,
@ -587,7 +587,7 @@ static void keyboardHandleKey(void* data,
timerfd_settime(_glfw.wl.timerfd, 0, &timer, NULL);
}
static void keyboardHandleModifiers(void* data,
static void keyboardHandleModifiers(void* userData,
struct wl_keyboard* keyboard,
uint32_t serial,
uint32_t modsDepressed,
@ -634,7 +634,7 @@ static void keyboardHandleModifiers(void* data,
}
#ifdef WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION
static void keyboardHandleRepeatInfo(void* data,
static void keyboardHandleRepeatInfo(void* userData,
struct wl_keyboard* keyboard,
int32_t rate,
int32_t delay)
@ -658,7 +658,7 @@ static const struct wl_keyboard_listener keyboardListener = {
#endif
};
static void seatHandleCapabilities(void* data,
static void seatHandleCapabilities(void* userData,
struct wl_seat* seat,
enum wl_seat_capability caps)
{
@ -685,7 +685,7 @@ static void seatHandleCapabilities(void* data,
}
}
static void seatHandleName(void* data,
static void seatHandleName(void* userData,
struct wl_seat* seat,
const char* name)
{
@ -696,7 +696,7 @@ static const struct wl_seat_listener seatListener = {
seatHandleName,
};
static void dataOfferHandleOffer(void* data,
static void dataOfferHandleOffer(void* userData,
struct wl_data_offer* offer,
const char* mimeType)
{
@ -706,7 +706,7 @@ static const struct wl_data_offer_listener dataOfferListener = {
dataOfferHandleOffer,
};
static void dataDeviceHandleDataOffer(void* data,
static void dataDeviceHandleDataOffer(void* userData,
struct wl_data_device* device,
struct wl_data_offer* offer)
{
@ -717,7 +717,7 @@ static void dataDeviceHandleDataOffer(void* data,
wl_data_offer_add_listener(_glfw.wl.dataOffer, &dataOfferListener, NULL);
}
static void dataDeviceHandleEnter(void* data,
static void dataDeviceHandleEnter(void* userData,
struct wl_data_device* device,
uint32_t serial,
struct wl_surface* surface,
@ -727,12 +727,12 @@ static void dataDeviceHandleEnter(void* data,
{
}
static void dataDeviceHandleLeave(void* data,
static void dataDeviceHandleLeave(void* userData,
struct wl_data_device* device)
{
}
static void dataDeviceHandleMotion(void* data,
static void dataDeviceHandleMotion(void* userData,
struct wl_data_device* device,
uint32_t time,
wl_fixed_t x,
@ -740,12 +740,12 @@ static void dataDeviceHandleMotion(void* data,
{
}
static void dataDeviceHandleDrop(void* data,
static void dataDeviceHandleDrop(void* userData,
struct wl_data_device* device)
{
}
static void dataDeviceHandleSelection(void* data,
static void dataDeviceHandleSelection(void* userData,
struct wl_data_device* device,
struct wl_data_offer* offer)
{
@ -760,7 +760,7 @@ static const struct wl_data_device_listener dataDeviceListener = {
dataDeviceHandleSelection,
};
static void wmBaseHandlePing(void* data,
static void wmBaseHandlePing(void* userData,
struct xdg_wm_base* wmBase,
uint32_t serial)
{
@ -771,7 +771,7 @@ static const struct xdg_wm_base_listener wmBaseListener = {
wmBaseHandlePing
};
static void registryHandleGlobal(void* data,
static void registryHandleGlobal(void* userData,
struct wl_registry* registry,
uint32_t name,
const char* interface,
@ -864,7 +864,7 @@ static void registryHandleGlobal(void* data,
}
}
static void registryHandleGlobalRemove(void* data,
static void registryHandleGlobalRemove(void* userData,
struct wl_registry* registry,
uint32_t name)
{

16
src/wl_monitor.c
View File

@ -35,7 +35,7 @@
#include <math.h>
static void outputHandleGeometry(void* data,
static void outputHandleGeometry(void* userData,
struct wl_output* output,
int32_t x,
int32_t y,
@ -46,7 +46,7 @@ static void outputHandleGeometry(void* data,
const char* model,
int32_t transform)
{
struct _GLFWmonitor* monitor = data;
struct _GLFWmonitor* monitor = userData;
monitor->wl.x = x;
monitor->wl.y = y;
@ -56,14 +56,14 @@ static void outputHandleGeometry(void* data,
snprintf(monitor->name, sizeof(monitor->name), "%s %s", make, model);
}
static void outputHandleMode(void* data,
static void outputHandleMode(void* userData,
struct wl_output* output,
uint32_t flags,
int32_t width,
int32_t height,
int32_t refresh)
{
struct _GLFWmonitor* monitor = data;
struct _GLFWmonitor* monitor = userData;
GLFWvidmode mode;
mode.width = width;
@ -82,9 +82,9 @@ static void outputHandleMode(void* data,
monitor->wl.currentMode = monitor->modeCount - 1;
}
static void outputHandleDone(void* data, struct wl_output* output)
static void outputHandleDone(void* userData, struct wl_output* output)
{
struct _GLFWmonitor* monitor = data;
struct _GLFWmonitor* monitor = userData;
if (monitor->widthMM <= 0 || monitor->heightMM <= 0)
{
@ -97,11 +97,11 @@ static void outputHandleDone(void* data, struct wl_output* output)
_glfwInputMonitor(monitor, GLFW_CONNECTED, _GLFW_INSERT_LAST);
}
static void outputHandleScale(void* data,
static void outputHandleScale(void* userData,
struct wl_output* output,
int32_t factor)
{
struct _GLFWmonitor* monitor = data;
struct _GLFWmonitor* monitor = userData;
monitor->wl.scale = factor;
}

36
src/wl_window.c
View File

@ -379,11 +379,11 @@ static void destroyDecorations(_GLFWwindow* window)
destroyDecoration(&window->wl.decorations.bottom);
}
static void xdgDecorationHandleConfigure(void* data,
static void xdgDecorationHandleConfigure(void* userData,
struct zxdg_toplevel_decoration_v1* decoration,
uint32_t mode)
{
_GLFWwindow* window = data;
_GLFWwindow* window = userData;
window->wl.decorations.serverSide = (mode == ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
@ -471,11 +471,11 @@ static void checkScaleChange(_GLFWwindow* window)
}
}
static void surfaceHandleEnter(void* data,
static void surfaceHandleEnter(void* userData,
struct wl_surface* surface,
struct wl_output* output)
{
_GLFWwindow* window = data;
_GLFWwindow* window = userData;
_GLFWmonitor* monitor = wl_output_get_user_data(output);
if (window->wl.monitorsCount + 1 > window->wl.monitorsSize)
@ -491,11 +491,11 @@ static void surfaceHandleEnter(void* data,
checkScaleChange(window);
}
static void surfaceHandleLeave(void* data,
static void surfaceHandleLeave(void* userData,
struct wl_surface* surface,
struct wl_output* output)
{
_GLFWwindow* window = data;
_GLFWwindow* window = userData;
_GLFWmonitor* monitor = wl_output_get_user_data(output);
GLFWbool found;
int i;
@ -604,13 +604,13 @@ static GLFWbool createShellSurface(_GLFWwindow* window)
return GLFW_TRUE;
}
static void xdgToplevelHandleConfigure(void* data,
static void xdgToplevelHandleConfigure(void* userData,
struct xdg_toplevel* toplevel,
int32_t width,
int32_t height,
struct wl_array* states)
{
_GLFWwindow* window = data;
_GLFWwindow* window = userData;
float aspectRatio;
float targetRatio;
uint32_t* state;
@ -668,10 +668,10 @@ static void xdgToplevelHandleConfigure(void* data,
window->wl.wasFullscreen = GLFW_TRUE;
}
static void xdgToplevelHandleClose(void* data,
static void xdgToplevelHandleClose(void* userData,
struct xdg_toplevel* toplevel)
{
_GLFWwindow* window = data;
_GLFWwindow* window = userData;
_glfwInputWindowCloseRequest(window);
}
@ -680,7 +680,7 @@ static const struct xdg_toplevel_listener xdgToplevelListener = {
xdgToplevelHandleClose
};
static void xdgSurfaceHandleConfigure(void* data,
static void xdgSurfaceHandleConfigure(void* userData,
struct xdg_surface* surface,
uint32_t serial)
{
@ -1541,7 +1541,7 @@ void _glfwPlatformDestroyCursor(_GLFWcursor* cursor)
wl_buffer_destroy(cursor->wl.buffer);
}
static void relativePointerHandleRelativeMotion(void* data,
static void relativePointerHandleRelativeMotion(void* userData,
struct zwp_relative_pointer_v1* pointer,
uint32_t timeHi,
uint32_t timeLo,
@ -1550,7 +1550,7 @@ static void relativePointerHandleRelativeMotion(void* data,
wl_fixed_t dxUnaccel,
wl_fixed_t dyUnaccel)
{
_GLFWwindow* window = data;
_GLFWwindow* window = userData;
double xpos = window->virtualCursorPosX;
double ypos = window->virtualCursorPosY;
@ -1575,7 +1575,7 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener = {
relativePointerHandleRelativeMotion
};
static void lockedPointerHandleLocked(void* data,
static void lockedPointerHandleLocked(void* userData,
struct zwp_locked_pointer_v1* lockedPointer)
{
}
@ -1596,7 +1596,7 @@ static void unlockPointer(_GLFWwindow* window)
static void lockPointer(_GLFWwindow* window);
static void lockedPointerHandleUnlocked(void* data,
static void lockedPointerHandleUnlocked(void* userData,
struct zwp_locked_pointer_v1* lockedPointer)
{
}
@ -1708,7 +1708,7 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
}
}
static void dataSourceHandleTarget(void* data,
static void dataSourceHandleTarget(void* userData,
struct wl_data_source* source,
const char* mimeType)
{
@ -1720,7 +1720,7 @@ static void dataSourceHandleTarget(void* data,
}
}
static void dataSourceHandleSend(void* data,
static void dataSourceHandleSend(void* userData,
struct wl_data_source* source,
const char* mimeType,
int fd)
@ -1770,7 +1770,7 @@ static void dataSourceHandleSend(void* data,
close(fd);
}
static void dataSourceHandleCancelled(void* data,
static void dataSourceHandleCancelled(void* userData,
struct wl_data_source* source)
{
wl_data_source_destroy(source);