more fullscreen cleanup

[xonotic/darkplaces.git] / vid_agl.c

diff --git a/vid_agl.c b/vid_agl.c
index 5de1a3ea0e8cf5b01bcf7da7826e8afbe5e6a5d8..775e01751584118265cfe1b7b0898f523cda572e 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -60,8 +60,8 @@ CGLContextObj (*qCGLGetCurrentContext) (void);
 static qboolean multithreadedgl;
 static qboolean mouse_avail = true;
 static qboolean vid_usingmouse = false;
+static qboolean vid_usinghidecursor = false;
 static qboolean vid_usingnoaccel = false;
-static float mouse_x, mouse_y;
 
 static qboolean vid_isfullscreen = false;
 static qboolean vid_usingvsync = false;
@@ -106,19 +106,21 @@ void VID_GetWindowSize (int *x, int *y, int *width, int *height)
        *height = scr_height;
 }
 
-static void IN_Activate( qboolean grab )
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
-       if (grab)
+       if (!mouse_avail || !window)
+               relative = hidecursor = false;
+
+       if (relative)
        {
                if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer))
-                       IN_Activate(false); // ungrab first!
-               if (!vid_usingmouse && mouse_avail && window)
+                       VID_SetMouse(false, false, false); // ungrab first!
+               if (!vid_usingmouse)
                {
                        Rect winBounds;
                        CGPoint winCenter;
 
                        SelectWindow(window);
-                       CGDisplayHideCursor(CGMainDisplayID());
 
                        // Put the mouse cursor at the center of the window
                        GetWindowBounds (window, kWindowContentRgn, &winBounds);
@@ -159,7 +161,6 @@ static void IN_Activate( qboolean grab )
                                }
                        }
 
-                       mouse_x = mouse_y = 0;
                        vid_usingmouse = true;
                        vid_usingnoaccel = !!apple_mouse_noaccel.integer;
                }
@@ -183,29 +184,26 @@ static void IN_Activate( qboolean grab )
                        }
 
                        CGAssociateMouseAndMouseCursorPosition(true);
-                       CGDisplayShowCursor(CGMainDisplayID());
 
                        vid_usingmouse = false;
                }
        }
+
+       if (vid_usinghidecursor != hidecursor)
+       {
+               vid_usinghidecursor = hidecursor;
+               if (hidecursor)
+                       CGDisplayHideCursor(CGMainDisplayID());
+               else
+                       CGDisplayShowCursor(CGMainDisplayID());
+       }
 }
 
 #define GAMMA_TABLE_SIZE 256
-void VID_Finish (qboolean allowmousegrab)
+void VID_Finish (void)
 {
-       qboolean vid_usemouse;
        qboolean vid_usevsync;
 
-       // handle the mouse state when windowed if that's changed
-       vid_usemouse = false;
-       if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback))
-               vid_usemouse = true;
-       if (!vid_activewindow)
-               vid_usemouse = false;
-       if (vid_isfullscreen)
-               vid_usemouse = true;
-       IN_Activate(vid_usemouse);
-
        // handle changes of the vsync option
        vid_usevsync = (vid_vsync.integer && !cls.timedemo);
        if (vid_usingvsync != vid_usevsync)
@@ -410,7 +408,7 @@ void VID_Shutdown(void)
        if (context == NULL && window == NULL)
                return;
 
-       IN_Activate(false);
+       VID_SetMouse(false, false, false);
        VID_RestoreSystemGamma();
 
        if (context != NULL)
@@ -533,7 +531,7 @@ static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscr
        *attrib++ = AGL_NONE;
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
+int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
 {
     const EventTypeSpec winEvents[] =
        {
@@ -585,8 +583,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        // Create the window, a bit towards the center of the screen
        windowBounds.left = 100;
        windowBounds.top = 100;
-       windowBounds.right = width + 100;
-       windowBounds.bottom = height + 100;
+       windowBounds.right = *width + 100;
+       windowBounds.bottom = *height + 100;
        carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window);
        if (carbonError != noErr || window == NULL)
        {
@@ -631,7 +629,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
                // TOCHECK: not sure whether or not it's necessary to change the resolution
                // "by hand", or if aglSetFullscreen does the job anyway
-               refDisplayMode = CGDisplayBestModeForParametersAndRefreshRate(mainDisplay, bpp, width, height, refreshrate, NULL);
+               refDisplayMode = CGDisplayBestModeForParametersAndRefreshRate(mainDisplay, bpp, *width, *height, refreshrate, NULL);
                CGDisplaySwitchToMode(mainDisplay, refDisplayMode);
                DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false);
 
@@ -674,7 +672,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        // Attempt fullscreen if requested
        if (fullscreen)
        {
-               qaglSetFullScreen (context, width, height, refreshrate, 0);
+               qaglSetFullScreen (context, *width, *height, refreshrate, 0);
                error = qaglGetError();
                if (error != AGL_NO_ERROR)
                {
@@ -697,8 +695,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                }
        }
 
-       scr_width = width;
-       scr_height = height;
+       scr_width = *width;
+       scr_height = *height;
 
        if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
                Sys_Error("glGetString not found in %s", gl_driver);
@@ -710,6 +708,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        multithreadedgl = false;
        vid_isfullscreen = fullscreen;
        vid_usingmouse = false;
+       vid_usinghidecursor = false;
        vid_hidden = false;
        vid_activewindow = true;
        sound_active = true;
@@ -976,11 +975,19 @@ void Sys_SendKeyEvents(void)
                                        case kEventMouseDragged:
                                        {
                                                HIPoint deltaPos;
+                                               HIPoint windowPos;
 
                                                GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos);
+                                               GetEventParameter(theEvent, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(windowPos), NULL, &windowPos);
+
+                                               if (vid_usingmouse)
+                                               {
+                                                       in_mouse_x += deltaPos.x;
+                                                       in_mouse_y += deltaPos.y;
+                                               }
 
-                                               mouse_x += deltaPos.x;
-                                               mouse_y += deltaPos.y;
+                                               in_windowmouse_x = windowPos.x;
+                                               in_windowmouse_y = windowPos.y;
                                                break;
                                        }
 
@@ -1113,11 +1120,4 @@ void Sys_SendKeyEvents(void)
 
 void IN_Move (void)
 {
-       if (mouse_avail)
-       {
-               in_mouse_x = mouse_x;
-               in_mouse_y = mouse_y;
-       }
-       mouse_x = 0;
-       mouse_y = 0;
 }