kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-09-22 12:07:15 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'glfw_upstream' of https://github.com/Luflosi/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-25 21:47:56 +05:30
commit 72be402a2d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
glfw/wl_window.c vendored
View File

@ -388,9 +388,9 @@ static const struct zxdg_toplevel_decoration_v1_listener xdgDecorationListener =
xdgDecorationHandleConfigure, xdgDecorationHandleConfigure,
}; };
static void handleEnter(void *data, static void surfaceHandleEnter(void *data,
struct wl_surface *surface UNUSED, struct wl_surface *surface UNUSED,
struct wl_output *output) struct wl_output *output)
{ {
_GLFWwindow* window = data; _GLFWwindow* window = data;
_GLFWmonitor* monitor = wl_output_get_user_data(output); _GLFWmonitor* monitor = wl_output_get_user_data(output);
@ -411,9 +411,9 @@ static void handleEnter(void *data,
} }
} }
static void handleLeave(void *data, static void surfaceHandleLeave(void *data,
struct wl_surface *surface UNUSED, struct wl_surface *surface UNUSED,
struct wl_output *output) struct wl_output *output)
{ {
_GLFWwindow* window = data; _GLFWwindow* window = data;
_GLFWmonitor* monitor = wl_output_get_user_data(output); _GLFWmonitor* monitor = wl_output_get_user_data(output);
@ -436,8 +436,8 @@ static void handleLeave(void *data,
} }
static const struct wl_surface_listener surfaceListener = { static const struct wl_surface_listener surfaceListener = {
handleEnter, surfaceHandleEnter,
handleLeave surfaceHandleLeave
}; };
static void setIdleInhibitor(_GLFWwindow* window, bool enable) static void setIdleInhibitor(_GLFWwindow* window, bool enable)
@ -1340,14 +1340,14 @@ void _glfwPlatformDestroyCursor(_GLFWcursor* cursor)
wl_buffer_destroy(cursor->wl.buffer); wl_buffer_destroy(cursor->wl.buffer);
} }
static void handleRelativeMotion(void* data, static void relativePointerHandleRelativeMotion(void* data,
struct zwp_relative_pointer_v1* pointer UNUSED, struct zwp_relative_pointer_v1* pointer UNUSED,
uint32_t timeHi UNUSED, uint32_t timeHi UNUSED,
uint32_t timeLo UNUSED, uint32_t timeLo UNUSED,
wl_fixed_t dx UNUSED, wl_fixed_t dx UNUSED,
wl_fixed_t dy UNUSED, wl_fixed_t dy UNUSED,
wl_fixed_t dxUnaccel, wl_fixed_t dxUnaccel,
wl_fixed_t dyUnaccel) wl_fixed_t dyUnaccel)
{ {
_GLFWwindow* window = data; _GLFWwindow* window = data;
@ -1360,11 +1360,11 @@ static void handleRelativeMotion(void* data,
} }
static const struct zwp_relative_pointer_v1_listener relativePointerListener = { static const struct zwp_relative_pointer_v1_listener relativePointerListener = {
handleRelativeMotion relativePointerHandleRelativeMotion
}; };
static void handleLocked(void* data UNUSED, static void lockedPointerHandleLocked(void* data UNUSED,
struct zwp_locked_pointer_v1* lockedPointer UNUSED) struct zwp_locked_pointer_v1* lockedPointer UNUSED)
{ {
} }
@ -1384,14 +1384,14 @@ static void unlockPointer(_GLFWwindow* window)
static void lockPointer(_GLFWwindow* window UNUSED); static void lockPointer(_GLFWwindow* window UNUSED);
static void handleUnlocked(void* data UNUSED, static void lockedPointerHandleUnlocked(void* data UNUSED,
struct zwp_locked_pointer_v1* lockedPointer UNUSED) struct zwp_locked_pointer_v1* lockedPointer UNUSED)
{ {
} }
static const struct zwp_locked_pointer_v1_listener lockedPointerListener = { static const struct zwp_locked_pointer_v1_listener lockedPointerListener = {
handleLocked, lockedPointerHandleLocked,
handleUnlocked lockedPointerHandleUnlocked
}; };
static void lockPointer(_GLFWwindow* window) static void lockPointer(_GLFWwindow* window)