mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed one multi-window bug, clarified missing window struct messages.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-10 00:30:48 +02:00
parent 44acfaa0b1
commit e90ace63bd
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/x11/x11_window.c
View File

@ -1063,7 +1063,7 @@ static void processSingleEvent(void)
window = findWindow(event.xkey.window); window = findWindow(event.xkey.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for KeyPress event\n");
return; return;
} }
@ -1082,7 +1082,7 @@ static void processSingleEvent(void)
window = findWindow(event.xkey.window); window = findWindow(event.xkey.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for KeyRelease event\n");
return; return;
} }
@ -1124,7 +1124,7 @@ static void processSingleEvent(void)
window = findWindow(event.xbutton.window); window = findWindow(event.xbutton.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for ButtonPress event\n");
return; return;
} }
@ -1158,7 +1158,7 @@ static void processSingleEvent(void)
window = findWindow(event.xbutton.window); window = findWindow(event.xbutton.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for ButtonRelease event\n");
return; return;
} }
@ -1189,7 +1189,7 @@ static void processSingleEvent(void)
window = findWindow(event.xmotion.window); window = findWindow(event.xmotion.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for MotionNotify event\n");
return; return;
} }
@ -1234,7 +1234,7 @@ static void processSingleEvent(void)
window = findWindow(event.xconfigure.window); window = findWindow(event.xconfigure.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for ConfigureNotify event\n");
return; return;
} }
@ -1261,7 +1261,7 @@ static void processSingleEvent(void)
window = findWindow(event.xclient.window); window = findWindow(event.xclient.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for ClientMessage event\n");
return; return;
} }
@ -1295,7 +1295,7 @@ static void processSingleEvent(void)
window = findWindow(event.xmap.window); window = findWindow(event.xmap.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for MapNotify event\n");
return; return;
} }
@ -1309,7 +1309,7 @@ static void processSingleEvent(void)
window = findWindow(event.xmap.window); window = findWindow(event.xmap.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for UnmapNotify event\n");
return; return;
} }
@ -1323,7 +1323,7 @@ static void processSingleEvent(void)
window = findWindow(event.xfocus.window); window = findWindow(event.xfocus.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for FocusIn event\n");
return; return;
} }
@ -1341,7 +1341,7 @@ static void processSingleEvent(void)
window = findWindow(event.xfocus.window); window = findWindow(event.xfocus.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for FocusOut event\n");
return; return;
} }
@ -1360,7 +1360,7 @@ static void processSingleEvent(void)
window = findWindow(event.xexpose.window); window = findWindow(event.xexpose.window);
if (window == NULL) if (window == NULL)
{ {
fprintf(stderr, "Cannot find GLFW window structure for event\n"); fprintf(stderr, "Cannot find GLFW window structure for Expose event\n");
return; return;
} }
@ -1800,7 +1800,7 @@ void _glfwPlatformPollEvents(void)
} }
} }
for (window = _glfwLibrary.windowListHead; window; window = window->next) for (window = _glfwLibrary.windowListHead; window; )
{ {
if (window->closed && window->windowCloseCallback) if (window->closed && window->windowCloseCallback)
window->closed = window->windowCloseCallback(window); window->closed = window->windowCloseCallback(window);
@ -1811,6 +1811,8 @@ void _glfwPlatformPollEvents(void)
glfwCloseWindow(window); glfwCloseWindow(window);
window = next; window = next;
} }
else
window = window->next;
} }
} }