diff options
Diffstat (limited to '0001-set-O_NONBLOCK-on-repeat-timerfd.patch')
| -rw-r--r-- | 0001-set-O_NONBLOCK-on-repeat-timerfd.patch | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/0001-set-O_NONBLOCK-on-repeat-timerfd.patch b/0001-set-O_NONBLOCK-on-repeat-timerfd.patch index 3d24c220f741..e21cf69be0e3 100644 --- a/0001-set-O_NONBLOCK-on-repeat-timerfd.patch +++ b/0001-set-O_NONBLOCK-on-repeat-timerfd.patch @@ -1,28 +1,33 @@ -From f57907bf3bbce52fbf2c5ca10206ad2b660f6cda Mon Sep 17 00:00:00 2001 +From 963e728881d7551aab0b843c79915f2419d4d36e Mon Sep 17 00:00:00 2001 From: Stone Tickle <lattis@mochiro.moe> Date: Fri, 5 Jun 2020 12:51:25 +0900 -Subject: [PATCH 1/3] set O_NONBLOCK on repeat timerfd +Subject: [PATCH] Wayland: Set O_NONBLOCK on repeat timerfd +Fixes #1710 +Fixes #1711 --- - src/wl_init.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + src/wl_init.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wl_init.c b/src/wl_init.c -index 49e7cc52..7d90e6ee 100644 +index acfe477d4..bba908fa9 100644 --- a/src/wl_init.c +++ b/src/wl_init.c -@@ -1165,8 +1165,9 @@ int _glfwPlatformInit(void) - _glfwInitTimerPOSIX(); +@@ -1336,7 +1336,7 @@ int _glfwInitWayland(void) _glfw.wl.timerfd = -1; -- if (_glfw.wl.seatVersion >= 4) + if (_glfw.wl.seatVersion >= 4) - _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); -+ if (_glfw.wl.seatVersion >= 4) { + _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); -+ } - if (_glfw.wl.pointer && _glfw.wl.shm) + if (!_glfw.wl.wmBase) { --- -2.32.0 - +@@ -1370,7 +1370,7 @@ int _glfwInitWayland(void) + wl_cursor_theme_load(cursorTheme, 2 * cursorSize, _glfw.wl.shm); + _glfw.wl.cursorSurface = + wl_compositor_create_surface(_glfw.wl.compositor); +- _glfw.wl.cursorTimerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); ++ _glfw.wl.cursorTimerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); + } + + if (_glfw.wl.seat && _glfw.wl.dataDeviceManager) |