mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-09-20 05:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment work

Browse Source
This commit is contained in:
Camilla Berglund 2016-07-24 21:55:36 +02:00
parent d3e288cc4d
commit 370cd14b46
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/x11_window.c
View File

@ -49,7 +49,9 @@
#define Button7 7 #define Button7 7
// Wait for data to arrive // Wait for data to arrive using select
// This avoids blocking other threads via the per-display Xlib lock that also
// covers GLX functions
// //
void selectDisplayConnection(struct timeval* timeout) void selectDisplayConnection(struct timeval* timeout)
{ {
@ -68,9 +70,6 @@ void selectDisplayConnection(struct timeval* timeout)
count = _glfw.linux_js.inotify + 1; count = _glfw.linux_js.inotify + 1;
#endif #endif
// NOTE: We use select instead of an X function like XNextEvent, as the
// wait inside those are guarded by the mutex protecting the display
// struct, locking out other threads from using X (including GLX)
// NOTE: Only retry on EINTR if there is no timeout, as select is not // NOTE: Only retry on EINTR if there is no timeout, as select is not
// required to update it for the time elapsed // required to update it for the time elapsed
// TODO: Update timeout value manually // TODO: Update timeout value manually
@ -1804,9 +1803,8 @@ void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,
base = _glfwPlatformGetTimerValue(); base = _glfwPlatformGetTimerValue();
// HACK: Poll with timeout for the required reply instead of blocking // HACK: Use a timeout because earlier versions of some window managers
// This is done because some window managers (at least Unity, // (at least Unity, Fluxbox and Xfwm) failed to send the reply
// Fluxbox and Xfwm) failed to send the required reply
// They have been fixed but broken versions are still in the wild // They have been fixed but broken versions are still in the wild
// If you are affected by this and your window manager is NOT // If you are affected by this and your window manager is NOT
// listed above, PLEASE report it to their and our issue trackers // listed above, PLEASE report it to their and our issue trackers
@ -2262,8 +2260,6 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
_glfw.x11.GLFW_SELECTION, _glfw.x11.GLFW_SELECTION,
window->x11.handle, CurrentTime); window->x11.handle, CurrentTime);
// XCheckTypedEvent is used instead of XIfEvent in order not to lock
// other threads out from the display during the entire wait period
while (!XCheckTypedEvent(_glfw.x11.display, SelectionNotify, &event)) while (!XCheckTypedEvent(_glfw.x11.display, SelectionNotify, &event))
selectDisplayConnection(NULL); selectDisplayConnection(NULL);