Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-21 16:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed X11 clipboard regressions, event waiting.

Browse Source
This commit is contained in:
Camilla Berglund
2013-01-31 00:26:37 +01:00
parent f3e39ce680
commit e209ac7a42
3 changed files with 84 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x11_window.c
+20 -31
View File
@@ -451,7 +451,7 @@ static void leaveFullscreenMode(_GLFWwindow* window)
// Return the GLFW window corresponding to the specified X11 window
//========================================================================
static _GLFWwindow* findWindow(Window handle)
_GLFWwindow* _glfwFindWindowByHandle(Window handle)
{
_GLFWwindow* window;
@@ -475,7 +475,7 @@ static void processEvent(XEvent *event)
if (event->type != GenericEvent)
{
window = findWindow(event->xany.window);
window = _glfwFindWindowByHandle(event->xany.window);
if (window == NULL)
{
// This is either an event for a destroyed GLFW window or an event
@@ -710,20 +710,6 @@ static void processEvent(XEvent *event)
break;
}
case SelectionNotify:
{
// The clipboard selection conversion status is available
XSelectionEvent* request = &event->xselection;
if (_glfwReadSelection(request))
_glfw.x11.selection.status = _GLFW_CONVERSION_SUCCEEDED;
else
_glfw.x11.selection.status = _GLFW_CONVERSION_FAILED;
break;
}
case SelectionRequest:
{
// The contents of the clipboard selection was requested
@@ -993,11 +979,11 @@ void _glfwPlatformHideWindow(_GLFWwindow* window)
void _glfwPlatformPollEvents(void)
{
XEvent event;
while (XCheckMaskEvent(_glfw.x11.display, ~0, &event) ||
XCheckTypedEvent(_glfw.x11.display, ClientMessage, &event))
int count = XPending(_glfw.x11.display);
while (count--)
{
XEvent event;
XNextEvent(_glfw.x11.display, &event);
processEvent(&event);
}
@@ -1026,21 +1012,24 @@ void _glfwPlatformPollEvents(void)
void _glfwPlatformWaitEvents(void)
{
int fd;
fd_set fds;
if (!XPending(_glfw.x11.display))
{
int fd;
fd_set fds;
fd = ConnectionNumber(_glfw.x11.display);
fd = ConnectionNumber(_glfw.x11.display);
FD_ZERO(&fds);
FD_SET(fd, &fds);
FD_ZERO(&fds);
FD_SET(fd, &fds);
XFlush(_glfw.x11.display);
// select(1) is used 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)
if (select(fd + 1, &fds, NULL, NULL, NULL) < 0)
return;
}
// select(1) is used 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)
if (select(fd + 1, &fds, NULL, NULL, NULL) > 0)
_glfwPlatformPollEvents();
_glfwPlatformPollEvents();
}
void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y)