diff --git a/src/internal.h b/src/internal.h index 91d507c1..84c2485e 100644 --- a/src/internal.h +++ b/src/internal.h @@ -387,5 +387,10 @@ const _GLFWfbconfig* _glfwChooseFBConfig(const _GLFWfbconfig* desired, GLboolean _glfwIsValidContextConfig(_GLFWwndconfig* wndconfig); GLboolean _glfwIsValidContext(_GLFWwindow* window, _GLFWwndconfig* wndconfig); +// Monitor management (monitor.c) +void _glfwTerminateMonitors(void); + +// platform specific (*_monitor.c) +_GLFWmonitor* _glfwDestroyMonitor(_GLFWmonitor* monitor); #endif // _internal_h_ diff --git a/src/monitor.c b/src/monitor.c index 3263eb9f..c219abb6 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -145,3 +145,13 @@ GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun) _glfwLibrary.monitorCallback= cbfun; } +//======================================================================== +// Delete the monitor list. +//======================================================================== + +void _glfwTerminateMonitors(void) +{ + while (_glfwLibrary.monitorListHead) + _glfwLibrary.monitorListHead = _glfwDestroyMonitor(_glfwLibrary.monitorListHead); +} + diff --git a/src/win32_monitor.c b/src/win32_monitor.c index 7b03b9fb..367aec18 100644 --- a/src/win32_monitor.c +++ b/src/win32_monitor.c @@ -223,9 +223,3 @@ void _glfwRefreshMonitors(void) _glfwLibrary.monitorListHead = newMonitorList; } -void _glfwTerminateMonitors(void) -{ - while (_glfwLibrary.monitorListHead) - _glfwLibrary.monitorListHead = _glfwDestroyMonitor(_glfwLibrary.monitorListHead); -} - diff --git a/src/win32_platform.h b/src/win32_platform.h index 3c2892c7..aa8352af 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -339,7 +339,6 @@ void _glfwInitTimer(void); // Monitor support void _glfwInitMonitors(void); void _glfwRefreshMonitors(void); -void _glfwTerminateMonitors(void); // Fullscreen support void _glfwSetVideoMode(int* width, int* height, diff --git a/src/x11_monitor.c b/src/x11_monitor.c index e827fb35..05625933 100644 --- a/src/x11_monitor.c +++ b/src/x11_monitor.c @@ -128,9 +128,3 @@ void _glfwInitMonitors(void) } } -void _glfwTerminateMonitors(void) -{ - while (_glfwLibrary.monitorListHead) - _glfwLibrary.monitorListHead = _glfwDestroyMonitor(_glfwLibrary.monitorListHead); -} - diff --git a/src/x11_platform.h b/src/x11_platform.h index 41e8167e..a9be40ae 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -281,7 +281,6 @@ void _glfwTerminateJoysticks(void); // Monitors void _glfwInitMonitors(void); -void _glfwTerminateMonitors(void); // Unicode support long _glfwKeySym2Unicode(KeySym keysym);