From 8dde39b3e01dedf9566261db052da0bb7a1f3465 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 24 Feb 2013 21:14:44 +0100 Subject: [PATCH] Formatting. --- src/cocoa_monitor.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cocoa_monitor.m b/src/cocoa_monitor.m index 2ad9f169..129e46b7 100644 --- a/src/cocoa_monitor.m +++ b/src/cocoa_monitor.m @@ -122,14 +122,9 @@ static GLFWvidmode vidmodeFromCGDisplayMode(CGDisplayModeRef mode) return result; } - -////////////////////////////////////////////////////////////////////////// -////// GLFW internal API ////// -////////////////////////////////////////////////////////////////////////// - // Starts reservation for display fading // -CGDisplayFadeReservationToken _glfwBeginFadeReservation(void) +static CGDisplayFadeReservationToken beginFadeReservation(void) { CGDisplayFadeReservationToken token = kCGDisplayFadeReservationInvalidToken; @@ -141,7 +136,7 @@ CGDisplayFadeReservationToken _glfwBeginFadeReservation(void) // Ends reservation for display fading // -void _glfwEndFadeReservation(CGDisplayFadeReservationToken token) +static void endFadeReservation(CGDisplayFadeReservationToken token) { if (token != kCGDisplayFadeReservationInvalidToken) { @@ -150,6 +145,11 @@ void _glfwEndFadeReservation(CGDisplayFadeReservationToken token) } } + +////////////////////////////////////////////////////////////////////////// +////// GLFW internal API ////// +////////////////////////////////////////////////////////////////////////// + // Change the current video mode // GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int* bpp) @@ -205,12 +205,12 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int* monitor->ns.previousMode = CGDisplayCopyDisplayMode(monitor->ns.displayID); - CGDisplayFadeReservationToken token = _glfwBeginFadeReservation(); + CGDisplayFadeReservationToken token = beginFadeReservation(); CGDisplayCapture(monitor->ns.displayID); CGDisplaySetDisplayMode(monitor->ns.displayID, bestMode, NULL); - _glfwEndFadeReservation(token); + endFadeReservation(token); CFRelease(modes); return GL_TRUE; @@ -220,12 +220,12 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int* // void _glfwRestoreVideoMode(_GLFWmonitor* monitor) { - CGDisplayFadeReservationToken token = _glfwBeginFadeReservation(); + CGDisplayFadeReservationToken token = beginFadeReservation(); CGDisplaySetDisplayMode(monitor->ns.displayID, monitor->ns.previousMode, NULL); CGDisplayRelease(monitor->ns.displayID); - _glfwEndFadeReservation(token); + endFadeReservation(token); }