From 0118743333a7c7a64bb1fc473697f5a2721edee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Mon, 25 Feb 2019 14:01:08 +0100 Subject: [PATCH] Formatting Related to #1322. --- include/GLFW/glfw3.h | 15 ++++++++------- src/cocoa_monitor.m | 4 +++- src/monitor.c | 4 +++- src/null_monitor.c | 4 +++- src/win32_monitor.c | 14 ++++++++------ src/wl_monitor.c | 4 +++- src/x11_monitor.c | 6 ++++-- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 01109a99..3fc3db62 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -1934,13 +1934,14 @@ GLFWAPI void glfwGetMonitorPos(GLFWmonitor* monitor, int* xpos, int* ypos); /*! @brief Returns the work area of the monitor. * * This function returns the position, in screen coordinates, of the upper-left - * corner of the work area of the specified monitor along with the - * work area size in screen coordinates. The work area is defined as the area of the - * monitor not occluded by the operating system task bar where present. If no task - * bar exists then the work area is the monitor resolution in screen coordinates. + * corner of the work area of the specified monitor along with the work area + * size in screen coordinates. The work area is defined as the area of the + * monitor not occluded by the operating system task bar where present. If no + * task bar exists then the work area is the monitor resolution in screen + * coordinates. * - * Any or all of the position and size arguments may be `NULL`. If an error occurs, all - * non-`NULL` position and size arguments will be set to zero. + * Any or all of the position and size arguments may be `NULL`. If an error + * occurs, all non-`NULL` position and size arguments will be set to zero. * * @param[in] monitor The monitor to query. * @param[out] xpos Where to store the monitor x-coordinate, or `NULL`. @@ -1959,7 +1960,7 @@ GLFWAPI void glfwGetMonitorPos(GLFWmonitor* monitor, int* xpos, int* ypos); * * @ingroup monitor */ -GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height); +GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height); /*! @brief Returns the physical size of the monitor. * diff --git a/src/cocoa_monitor.m b/src/cocoa_monitor.m index 97181e7e..804e8e3c 100644 --- a/src/cocoa_monitor.m +++ b/src/cocoa_monitor.m @@ -410,7 +410,9 @@ void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor, *yscale = (float) (pixels.size.height / points.size.height); } -void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height) +void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, + int* xpos, int* ypos, + int* width, int* height) { if (!refreshMonitorScreen(monitor)) return; diff --git a/src/monitor.c b/src/monitor.c index e8d6bcbe..ad12e56f 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -330,7 +330,9 @@ GLFWAPI void glfwGetMonitorPos(GLFWmonitor* handle, int* xpos, int* ypos) _glfwPlatformGetMonitorPos(monitor, xpos, ypos); } -GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* handle, int* xpos, int* ypos, int* width, int* height) +GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* handle, + int* xpos, int* ypos, + int* width, int* height) { _GLFWmonitor* monitor = (_GLFWmonitor*) handle; assert(monitor != NULL); diff --git a/src/null_monitor.c b/src/null_monitor.c index 99797375..807f6a1a 100644 --- a/src/null_monitor.c +++ b/src/null_monitor.c @@ -49,7 +49,9 @@ void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor, *yscale = 1.f; } -void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height) +void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, + int* xpos, int* ypos, + int* width, int* height) { } diff --git a/src/win32_monitor.c b/src/win32_monitor.c index 13ceadf8..6fc48c99 100644 --- a/src/win32_monitor.c +++ b/src/win32_monitor.c @@ -361,28 +361,30 @@ void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor, _glfwGetMonitorContentScaleWin32(monitor->win32.handle, xscale, yscale); } -void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height) +void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, + int* xpos, int* ypos, + int* width, int* height) { MONITORINFO monitorInfo; int x, y; POINT pointInMonitor; HMONITOR hMonitor; - _glfwPlatformGetMonitorPos( monitor, &x, &y ); + _glfwPlatformGetMonitorPos(monitor, &x, &y); monitorInfo.cbSize = sizeof(MONITORINFO); pointInMonitor.x = x + 1; pointInMonitor.y = y + 1; - hMonitor = MonitorFromPoint( pointInMonitor, 0 ); + hMonitor = MonitorFromPoint(pointInMonitor, 0); GetMonitorInfo(hMonitor, &monitorInfo); if (xpos) - *xpos = monitorInfo.rcWork.left; + *xpos = monitorInfo.rcWork.left; if (ypos) - *ypos = monitorInfo.rcWork.top; + *ypos = monitorInfo.rcWork.top; if (width) - *width = monitorInfo.rcWork.right - monitorInfo.rcWork.left; + *width = monitorInfo.rcWork.right - monitorInfo.rcWork.left; if (height) *height = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top; } diff --git a/src/wl_monitor.c b/src/wl_monitor.c index fb6b13d0..223c3b8d 100644 --- a/src/wl_monitor.c +++ b/src/wl_monitor.c @@ -170,7 +170,9 @@ void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor, *yscale = (float) monitor->wl.scale; } -void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height) +void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, + int* xpos, int* ypos, + int* width, int* height) { if (xpos) *xpos = monitor->wl.x; diff --git a/src/x11_monitor.c b/src/x11_monitor.c index e924d366..62d5df64 100644 --- a/src/x11_monitor.c +++ b/src/x11_monitor.c @@ -342,13 +342,15 @@ void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor, *yscale = _glfw.x11.contentScaleY; } -void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int *width, int *height) +void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height) { if (_glfw.x11.randr.available && !_glfw.x11.randr.monitorBroken) { Atom* extents = NULL; - _glfwGetWindowPropertyX11(_glfw.x11.root, _glfw.x11.NET_WORKAREA, XA_CARDINAL, (unsigned char**) &extents); + _glfwGetWindowPropertyX11(_glfw.x11.root, + _glfw.x11.NET_WORKAREA, XA_CARDINAL, + (unsigned char**) &extents); if (xpos) *xpos = extents[0];