Attempt to stabilize ODE. Now using constant step (sys_ticrate set steptime) - on...
[divverent/darkplaces.git] / vid_agl.c
index 6717388..d0e7c45 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -60,16 +60,14 @@ 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;
 
 static qboolean sound_active = true;
 
-static int scr_width, scr_height;
-
 static cvar_t apple_multithreadedgl = {CVAR_SAVE, "apple_multithreadedgl", "1", "makes use of a second thread for the OpenGL driver (if possible) rather than using the engine thread (note: this is done automatically on most other operating systems)"};
 static cvar_t apple_mouse_noaccel = {CVAR_SAVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"};
 
@@ -78,7 +76,7 @@ static WindowRef window;
 
 static double originalMouseSpeed = -1.0;
 
-io_connect_t IN_GetIOHandle()
+io_connect_t IN_GetIOHandle(void)
 {
        io_connect_t iohandle = MACH_PORT_NULL;
        kern_return_t status;
@@ -99,26 +97,21 @@ io_connect_t IN_GetIOHandle()
        return iohandle;
 }
 
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
-       *x = *y = 0;
-       *width = scr_width;
-       *height = scr_height;
-}
+       if (!mouse_avail || !window)
+               relative = hidecursor = false;
 
-void VID_GrabMouse(qboolean grab)
-{
-       if (grab)
+       if (relative)
        {
                if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer))
-                       VID_GrabMouse(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 +152,6 @@ void VID_GrabMouse(qboolean grab)
                                }
                        }
 
-                       mouse_x = mouse_y = 0;
                        vid_usingmouse = true;
                        vid_usingnoaccel = !!apple_mouse_noaccel.integer;
                }
@@ -183,11 +175,19 @@ void VID_GrabMouse(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
@@ -210,10 +210,10 @@ void VID_Finish (void)
                        Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate");
        }
 
-       if (r_render.integer)
+       if (!vid_hidden)
        {
                CHECKGLERROR
-               if (r_speeds.integer || gl_finish.integer)
+               if (r_speeds.integer == 2 || gl_finish.integer)
                {
                        qglFinish();CHECKGLERROR
                }
@@ -399,7 +399,7 @@ void VID_Shutdown(void)
        if (context == NULL && window == NULL)
                return;
 
-       VID_GrabMouse(false);
+       VID_SetMouse(false, false, false);
        VID_RestoreSystemGamma();
 
        if (context != NULL)
@@ -464,13 +464,21 @@ static void VID_AppFocusChanged(qboolean windowIsActive)
                        VID_RestoreSystemGamma();
        }
 
-       if (sound_active != windowIsActive)
+       if (windowIsActive || !snd_mutewhenidle.integer)
        {
-               sound_active = windowIsActive;
-               if (sound_active)
+               if (!sound_active)
+               {
                        S_UnblockSound ();
-               else
+                       sound_active = true;
+               }
+       }
+       else
+       {
+               if (sound_active)
+               {
                        S_BlockSound ();
+                       sound_active = false;
+               }
        }
 }
 
@@ -522,9 +530,9 @@ 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)
+qboolean VID_InitMode(viddef_mode_t *mode)
 {
-    const EventTypeSpec winEvents[] =
+       const EventTypeSpec winEvents[] =
        {
                { kEventClassWindow, kEventWindowClosed },
                { kEventClassWindow, kEventWindowCollapsing },
@@ -574,8 +582,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 = mode->width + 100;
+       windowBounds.bottom = mode->height + 100;
        carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window);
        if (carbonError != noErr || window == NULL)
        {
@@ -593,9 +601,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                                                           GetEventTypeCount(winEvents), winEvents, window, NULL);
 
        // Create the desired attribute list
-       VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer, samples);
+       VID_BuildAGLAttrib(attributes, mode->bitsperpixel == 32, mode->fullscreen, mode->stereobuffer, mode->samples);
 
-       if (!fullscreen)
+       if (!mode->fullscreen)
        {
                // Output to Window
                pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes);
@@ -620,7 +628,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 = CGDisplayBestModeForParametersAndRefreshRateWithProperty(mainDisplay, mode->bitsperpixel, mode->width, mode->height, mode->refreshrate, kCGDisplayModeIsSafeForHardware, NULL);
                CGDisplaySwitchToMode(mainDisplay, refDisplayMode);
                DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false);
 
@@ -661,9 +669,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        qaglDestroyPixelFormat(pixelFormat);
 
        // Attempt fullscreen if requested
-       if (fullscreen)
+       if (mode->fullscreen)
        {
-               qaglSetFullScreen (context, width, height, refreshrate, 0);
+               qaglSetFullScreen (context, mode->width, mode->height, mode->refreshrate, 0);
                error = qaglGetError();
                if (error != AGL_NO_ERROR)
                {
@@ -686,19 +694,16 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                }
        }
 
-       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);
 
        gl_platformextensions = "";
        gl_platform = "AGL";
-       gl_videosyncavailable = true;
 
        multithreadedgl = false;
-       vid_isfullscreen = fullscreen;
+       vid_isfullscreen = mode->fullscreen;
        vid_usingmouse = false;
+       vid_usinghidecursor = false;
        vid_hidden = false;
        vid_activewindow = true;
        sound_active = true;
@@ -965,11 +970,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;
                                        }
 
@@ -1102,11 +1115,50 @@ void Sys_SendKeyEvents(void)
 
 void IN_Move (void)
 {
-       if (mouse_avail)
+}
+
+static bool GetDictionaryBoolean(CFDictionaryRef d, const void *key)
+{
+    CFBooleanRef ref = (CFBooleanRef) CFDictionaryGetValue(d, key);
+    if(ref)
+        return CFBooleanGetValue(ref);
+    return false;
+}
+
+long GetDictionaryLong(CFDictionaryRef d, const void *key)
+{
+       long value = 0;
+    CFNumberRef ref = (CFNumberRef) CFDictionaryGetValue(d, key);
+    if(ref)
+        CFNumberGetValue(ref, kCFNumberLongType, &value);
+    return value;
+}
+
+size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
+{
+       CGDirectDisplayID mainDisplay = CGMainDisplayID();
+       CFArrayRef vidmodes = CGDisplayAvailableModes(mainDisplay);
+       CFDictionaryRef thismode;
+       unsigned int n = CFArrayGetCount(vidmodes);
+       unsigned int i;
+       size_t k;
+
+       k = 0;
+       for(i = 0; i < n; ++i)
        {
-               in_mouse_x = mouse_x;
-               in_mouse_y = mouse_y;
+               thismode = (CFDictionaryRef) CFArrayGetValueAtIndex(vidmodes, i);
+               if(!GetDictionaryBoolean(thismode, kCGDisplayModeIsSafeForHardware))
+                       continue;
+
+               if(k >= maxcount)
+                       break;
+               modes[k].width = GetDictionaryLong(thismode, kCGDisplayWidth);
+               modes[k].height = GetDictionaryLong(thismode, kCGDisplayHeight);
+               modes[k].bpp = GetDictionaryLong(thismode, kCGDisplayBitsPerPixel);
+               modes[k].refreshrate = GetDictionaryLong(thismode, kCGDisplayRefreshRate);
+               modes[k].pixelheight_num = 1;
+               modes[k].pixelheight_denom = 1; // OS X doesn't expose this either
+               ++k;
        }
-       mouse_x = 0;
-       mouse_y = 0;
+       return k;
 }