changed VID_InitMode to take a viddef_mode_t structure which contains

[xonotic/darkplaces.git] / vid_agl.c

diff --git a/vid_agl.c b/vid_agl.c
index 0c0fd7a7ede27754f5a3588f7d3a022518dd5764..af5c8b7f9d005c333d00dbce3abde1b37d414690 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -68,8 +68,6 @@ 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,13 +97,6 @@ io_connect_t IN_GetIOHandle()
        return iohandle;
 }
 
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
-{
-       *x = *y = 0;
-       *width = scr_width;
-       *height = scr_height;
-}
-
 void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
        if (!mouse_avail || !window)
@@ -219,7 +210,7 @@ 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 == 2 || gl_finish.integer)
@@ -473,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;
+               }
        }
 }
 
@@ -531,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 },
@@ -583,8 +582,8 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
        // 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)
        {
@@ -602,9 +601,9 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
                                                           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);
@@ -629,7 +628,7 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
 
                // TOCHECK: not sure whether or not it's necessary to change the resolution
                // "by hand", or if aglSetFullscreen does the job anyway
-               refDisplayMode = CGDisplayBestModeForParametersAndRefreshRateWithProperty(mainDisplay, bpp, *width, *height, refreshrate, kCGDisplayModeIsSafeForHardware, NULL);
+               refDisplayMode = CGDisplayBestModeForParametersAndRefreshRateWithProperty(mainDisplay, mode->bitsperpixel, mode->width, mode->height, mode->refreshrate, kCGDisplayModeIsSafeForHardware, NULL);
                CGDisplaySwitchToMode(mainDisplay, refDisplayMode);
                DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false);
 
@@ -670,9 +669,9 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
        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)
                {
@@ -695,8 +694,7 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
                }
        }
 
-       scr_width = *width;
-       scr_height = *height;
+       memset(&vid.support, 0, sizeof(vid.support));
 
        if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
                Sys_Error("glGetString not found in %s", gl_driver);
@@ -706,7 +704,7 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
        gl_videosyncavailable = true;
 
        multithreadedgl = false;
-       vid_isfullscreen = fullscreen;
+       vid_isfullscreen = mode->fullscreen;
        vid_usingmouse = false;
        vid_usinghidecursor = false;
        vid_hidden = false;