diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 4b48d85b..62697333 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -147,7 +147,7 @@ static GLFWbool acquireMonitor(_GLFWwindow* window) [window->ns.object setFrame:frame display:YES]; - _glfwInputMonitorWindowChange(window->monitor, window); + _glfwInputMonitorWindow(window->monitor, window); return status; } @@ -158,7 +158,7 @@ static void releaseMonitor(_GLFWwindow* window) if (window->monitor->window != window) return; - _glfwInputMonitorWindowChange(window->monitor, NULL); + _glfwInputMonitorWindow(window->monitor, NULL); _glfwRestoreVideoModeNS(window->monitor); } diff --git a/src/internal.h b/src/internal.h index fb5d6966..cf14b7df 100644 --- a/src/internal.h +++ b/src/internal.h @@ -949,11 +949,11 @@ void _glfwInputCursorEnter(_GLFWwindow* window, GLFWbool entered); /*! @ingroup event */ -void _glfwInputMonitor(_GLFWmonitor* monitor, int action, int type); +void _glfwInputMonitor(_GLFWmonitor* monitor, int action, int placement); /*! @ingroup event */ -void _glfwInputMonitorWindowChange(_GLFWmonitor* monitor, _GLFWwindow* window); +void _glfwInputMonitorWindow(_GLFWmonitor* monitor, _GLFWwindow* window); /*! @brief Notifies shared code of an error. * @param[in] error The error code most suitable for the error. diff --git a/src/monitor.c b/src/monitor.c index 4c747710..65971bf0 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -86,7 +86,7 @@ static GLFWbool refreshVideoModes(_GLFWmonitor* monitor) ////// GLFW event API ////// ////////////////////////////////////////////////////////////////////////// -void _glfwInputMonitor(_GLFWmonitor* monitor, int action, int type) +void _glfwInputMonitor(_GLFWmonitor* monitor, int action, int placement) { if (action == GLFW_CONNECTED) { @@ -94,7 +94,7 @@ void _glfwInputMonitor(_GLFWmonitor* monitor, int action, int type) _glfw.monitors = realloc(_glfw.monitors, sizeof(_GLFWmonitor*) * _glfw.monitorCount); - if (type == _GLFW_INSERT_FIRST) + if (placement == _GLFW_INSERT_FIRST) { memmove(_glfw.monitors + 1, _glfw.monitors, @@ -128,7 +128,7 @@ void _glfwInputMonitor(_GLFWmonitor* monitor, int action, int type) _glfwFreeMonitor(monitor); } -void _glfwInputMonitorWindowChange(_GLFWmonitor* monitor, _GLFWwindow* window) +void _glfwInputMonitorWindow(_GLFWmonitor* monitor, _GLFWwindow* window) { monitor->window = window; } diff --git a/src/win32_window.c b/src/win32_window.c index 04b8fae3..0bc64fde 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -427,7 +427,7 @@ static GLFWbool acquireMonitor(_GLFWwindow* window) xpos, ypos, mode.width, mode.height, SWP_NOACTIVATE | SWP_NOCOPYBITS); - _glfwInputMonitorWindowChange(window->monitor, window); + _glfwInputMonitorWindow(window->monitor, window); return status; } @@ -438,7 +438,7 @@ static void releaseMonitor(_GLFWwindow* window) if (window->monitor->window != window) return; - _glfwInputMonitorWindowChange(window->monitor, NULL); + _glfwInputMonitorWindow(window->monitor, NULL); _glfwRestoreVideoModeWin32(window->monitor); } diff --git a/src/x11_window.c b/src/x11_window.c index 5f22e7c1..35064cc0 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -838,7 +838,7 @@ static GLFWbool acquireMonitor(_GLFWwindow* window) xpos, ypos, mode.width, mode.height); } - _glfwInputMonitorWindowChange(window->monitor, window); + _glfwInputMonitorWindow(window->monitor, window); return status; } @@ -849,7 +849,7 @@ static void releaseMonitor(_GLFWwindow* window) if (window->monitor->window != window) return; - _glfwInputMonitorWindowChange(window->monitor, NULL); + _glfwInputMonitorWindow(window->monitor, NULL); _glfwRestoreVideoModeX11(window->monitor); _glfw.x11.saver.count--;