Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 05:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

wl: Fix PostEmptyEvent not waking WaitEvents

Browse Source 
Use an eventfd as a means to signal waitEvents to wake up as
wl_display_sync does not always achieve this.

This fixes GitHub Issue #1520
This commit is contained in:
Harry Jeffery 2019-06-22 21:21:08 +01:00
parent d834f01ca4
commit 148b683f53
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wl_init.c
View File

@ -35,6 +35,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/eventfd.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/timerfd.h> #include <sys/timerfd.h>
#include <unistd.h> #include <unistd.h>
@ -1152,6 +1153,8 @@ int _glfwPlatformInit(void)
if (_glfw.wl.seatVersion >= 4) if (_glfw.wl.seatVersion >= 4)
_glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
_glfw.wl.eventfd = eventfd(0, 0);
if (!_glfw.wl.wmBase) if (!_glfw.wl.wmBase)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -1288,6 +1291,8 @@ void _glfwPlatformTerminate(void)
if (_glfw.wl.timerfd >= 0) if (_glfw.wl.timerfd >= 0)
close(_glfw.wl.timerfd); close(_glfw.wl.timerfd);
if (_glfw.wl.eventfd >= 0)
close(_glfw.wl.eventfd);
if (_glfw.wl.cursorTimerfd >= 0) if (_glfw.wl.cursorTimerfd >= 0)
close(_glfw.wl.cursorTimerfd); close(_glfw.wl.cursorTimerfd);

1
src/wl_platform.h
View File

@ -259,6 +259,7 @@ typedef struct _GLFWlibraryWayland
char* clipboardSendString; char* clipboardSendString;
size_t clipboardSendSize; size_t clipboardSendSize;
int timerfd; int timerfd;
int eventfd;
short int keycodes[256]; short int keycodes[256];
short int scancodes[GLFW_KEY_LAST + 1]; short int scancodes[GLFW_KEY_LAST + 1];

12
src/wl_window.c
View File

@ -38,6 +38,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/timerfd.h> #include <sys/timerfd.h>
#include <sys/eventfd.h>
#include <poll.h> #include <poll.h>
@ -709,6 +710,7 @@ static void handleEvents(int timeout)
{ wl_display_get_fd(display), POLLIN }, { wl_display_get_fd(display), POLLIN },
{ _glfw.wl.timerfd, POLLIN }, { _glfw.wl.timerfd, POLLIN },
{ _glfw.wl.cursorTimerfd, POLLIN }, { _glfw.wl.cursorTimerfd, POLLIN },
{ _glfw.wl.eventfd, POLLIN },
}; };
ssize_t read_ret; ssize_t read_ret;
uint64_t repeats, i; uint64_t repeats, i;
@ -731,7 +733,7 @@ static void handleEvents(int timeout)
return; return;
} }
if (poll(fds, 3, timeout) > 0) if (poll(fds, 4, timeout) > 0)
{ {
if (fds[0].revents & POLLIN) if (fds[0].revents & POLLIN)
{ {
@ -763,6 +765,11 @@ static void handleEvents(int timeout)
incrementCursorImage(_glfw.wl.pointerFocus); incrementCursorImage(_glfw.wl.pointerFocus);
} }
if (fds[3].revents & POLLIN)
{
read_ret = read(_glfw.wl.eventfd, &repeats, sizeof(repeats));
}
} }
else else
{ {
@ -1176,7 +1183,8 @@ void _glfwPlatformWaitEventsTimeout(double timeout)
void _glfwPlatformPostEmptyEvent(void) void _glfwPlatformPostEmptyEvent(void)
{ {
wl_display_sync(_glfw.wl.display); uint64_t value = 1;
write(_glfw.wl.eventfd, &value, sizeof value);
} }
void _glfwPlatformGetCursorPos(_GLFWwindow* window, double* xpos, double* ypos) void _glfwPlatformGetCursorPos(_GLFWwindow* window, double* xpos, double* ypos)