gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2025-01-31 03:18:50 -05:00
Code Issues Projects Releases Wiki Activity

Made glfwGetMonitors work from monitor callback.

Browse Source
This commit is contained in:
Camilla Berglund 2013-05-24 15:05:01 +02:00
parent 98cbf6fda1
commit b4e0ee418e
1 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/monitor.c
View File

@ -94,62 +94,72 @@ static int refreshVideoModes(_GLFWmonitor* monitor)
void _glfwInputMonitorChange(void) void _glfwInputMonitorChange(void)
{ {
int i, j, monitorCount; int i, j, monitorCount = _glfw.monitorCount;
_GLFWmonitor** monitors; _GLFWmonitor** monitors = _glfw.monitors;
monitors = _glfwPlatformGetMonitors(&monitorCount); _glfw.monitors = _glfwPlatformGetMonitors(&_glfw.monitorCount);
// Re-use unchanged monitors and report new ones // Re-use still connected monitor objects
for (i = 0; i < _glfw.monitorCount; i++)
{
for (j = 0; j < monitorCount; j++)
{
if (_glfwPlatformIsSameMonitor(_glfw.monitors[i], monitors[j]))
{
_glfwDestroyMonitor(_glfw.monitors[i]);
_glfw.monitors[i] = monitors[j];
break;
}
}
}
// Find and report disconnected monitors (not in the new list)
for (i = 0; i < monitorCount; i++) for (i = 0; i < monitorCount; i++)
{ {
_GLFWwindow* window;
for (j = 0; j < _glfw.monitorCount; j++) for (j = 0; j < _glfw.monitorCount; j++)
{ {
if (_glfw.monitors[j] == NULL) if (monitors[i] == _glfw.monitors[j])
break;
}
if (j < _glfw.monitorCount)
continue; continue;
if (_glfwPlatformIsSameMonitor(monitors[i], _glfw.monitors[j])) for (window = _glfw.windowListHead; window; window = window->next)
{ {
// This monitor was connected before, so re-use the existing if (window->monitor == monitors[i])
// monitor object to preserve its address and user pointer window->monitor = NULL;
}
_glfwDestroyMonitor(monitors[i]); _glfw.monitorCallback((GLFWmonitor*) monitors[i], GLFW_DISCONNECTED);
monitors[i] = _glfw.monitors[j]; }
_glfw.monitors[j] = NULL;
// Find and report newly connected monitors (not in the old list)
// Re-used monitor objects are then removed from the old list to avoid
// having them destroyed at the end of this function
for (i = 0; i < _glfw.monitorCount; i++)
{
for (j = 0; j < monitorCount; j++)
{
if (_glfw.monitors[i] == monitors[j])
{
monitors[j] = NULL;
break; break;
} }
} }
if (j == _glfw.monitorCount) if (j < monitorCount)
{
// This monitor was not connected before
_glfw.monitorCallback((GLFWmonitor*) monitors[i], GLFW_CONNECTED);
}
}
// The only monitors remaining in the global list are the disconnected ones
// Report them as disconnected
for (i = 0; i < _glfw.monitorCount; i++)
{
_GLFWwindow* window;
if (_glfw.monitors[i] == NULL)
continue; continue;
_glfw.monitorCallback((GLFWmonitor*) _glfw.monitors[i], GLFW_DISCONNECTED); _glfw.monitorCallback((GLFWmonitor*) _glfw.monitors[i], GLFW_CONNECTED);
for (window = _glfw.windowListHead; window; window = window->next)
{
if (window->monitor == _glfw.monitors[i])
window->monitor = NULL;
}
} }
_glfwDestroyMonitors(_glfw.monitors, _glfw.monitorCount); _glfwDestroyMonitors(monitors, monitorCount);
_glfw.monitors = monitors;
_glfw.monitorCount = monitorCount;
} }