anulax
/
glfw
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Wayland: Rename listener user data parameters

Browse Source
master
Camilla Löwy ago%!(EXTRA string=3 years)
parent 4506175023
commit a4460b694e
3 changed files with 49 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      src/wl_init.c
  2. 16
      src/wl_monitor.c
  3. 36
      src/wl_window.c

46
src/wl_init.c
Unescape View File

@ -91,7 +91,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,
@ -122,7 +122,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)
@ -185,7 +185,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,
@ -244,7 +244,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,
@ -329,7 +329,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,
@ -364,7 +364,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,
@ -461,7 +461,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,
@ -484,7 +484,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)
@ -550,7 +550,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,
@ -591,7 +591,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,
@ -638,7 +638,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)
@ -662,7 +662,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)
{
@ -689,7 +689,7 @@ static void seatHandleCapabilities(void* data,
}
}
static void seatHandleName(void* data,
static void seatHandleName(void* userData,
struct wl_seat* seat,
const char* name)
{
@ -700,7 +700,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)
{
@ -710,7 +710,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)
{
@ -721,7 +721,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,
@ -731,12 +731,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,
@ -744,12 +744,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)
{
@ -764,7 +764,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)
{
@ -775,7 +775,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,
@ -863,7 +863,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
Unescape View File

@ -37,7 +37,7 @@
#include "wayland-client-protocol.h"
static void outputHandleGeometry(void* data,
static void outputHandleGeometry(void* userData,
struct wl_output* output,
int32_t x,
int32_t y,
@ -48,7 +48,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;
@ -58,14 +58,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;
@ -84,9 +84,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)
{
@ -99,11 +99,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
Unescape View File

@ -272,11 +272,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);
@ -364,11 +364,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)
@ -384,11 +384,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 = GLFW_FALSE;
@ -441,13 +441,13 @@ static void setFullscreen(_GLFWwindow* window, _GLFWmonitor* monitor,
destroyDecorations(window);
}
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;
@ -505,10 +505,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);
}
@ -517,7 +517,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)
{
@ -1407,7 +1407,7 @@ void _glfwDestroyCursorWayland(_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,
@ -1416,7 +1416,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;
@ -1441,7 +1441,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)
{
}
@ -1462,7 +1462,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)
{
}
@ -1574,7 +1574,7 @@ void _glfwSetCursorWayland(_GLFWwindow* window, _GLFWcursor* cursor)
}
}
static void dataSourceHandleTarget(void* data,
static void dataSourceHandleTarget(void* userData,
struct wl_data_source* source,
const char* mimeType)
{
@ -1586,7 +1586,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)
@ -1636,7 +1636,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);

Write Preview
Loading…
Cancel
Save