(Round 3) Break up host_cmd.c

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 0b37e274a28fdfdfd60bfb9cd6c01052f96c1e26..4179d640f606f930a7d3d766fd136802cd4c27c3 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -607,7 +607,7 @@ static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheigh
                }
                if (scr_numtouchscreenareas < 128)
                {
-                       if (clickrealtime + 1 > realtime)
+                       if (clickrealtime + 1 > host.realtime)
                        {
                                scr_touchscreenareas[scr_numtouchscreenareas].pic = "gfx/gui/touch_puck_cur_click.tga";
                        }
@@ -617,7 +617,7 @@ static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheigh
                        }
                        else
                        {
-                               switch ((int)realtime * 10 % 20)
+                               switch ((int)host.realtime * 10 % 20)
                                {
                                case 0:
                                        scr_touchscreenareas[scr_numtouchscreenareas].pic = "gfx/gui/touch_puck_cur_touch.tga";
@@ -671,11 +671,11 @@ static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheigh
                        {
                                Key_Event(key, 0, true);
                                canclick = false;
-                               clickrealtime = realtime;
+                               clickrealtime = host.realtime;
                        }
 
                        // SS:BR can't qc can't cope with presses and releases on the same frame
-                       if (clickrealtime && clickrealtime + 0.1 < realtime)
+                       if (clickrealtime && clickrealtime + 0.1 < host.realtime)
                        {
                                Key_Event(key, 0, false);
                                clickrealtime = 0;
@@ -699,10 +699,10 @@ void VID_BuildJoyState(vid_joystate_t *joystate)
                {
                        for (j = 0; j <= SDL_CONTROLLER_AXIS_MAX; ++j)
                        {
-                               joystate->axis[j] = SDL_GameControllerGetAxis(vid_sdlgamecontroller, j) * (1.0f / 32767.0f);
+                               joystate->axis[j] = SDL_GameControllerGetAxis(vid_sdlgamecontroller, (SDL_GameControllerAxis)j) * (1.0f / 32767.0f);
                        }
                        for (j = 0; j < SDL_CONTROLLER_BUTTON_MAX; ++j)
-                               joystate->button[j] = SDL_GameControllerGetButton(vid_sdlgamecontroller, j);
+                               joystate->button[j] = SDL_GameControllerGetButton(vid_sdlgamecontroller, (SDL_GameControllerButton)j);
                        // emulate joy buttons for trigger "axes"
                        joystate->button[SDL_CONTROLLER_BUTTON_MAX] = VID_JoyState_GetAxis(joystate, SDL_CONTROLLER_AXIS_TRIGGERLEFT, 1, joy_sdl2_trigger_deadzone.value) > 0.0f;
                        joystate->button[SDL_CONTROLLER_BUTTON_MAX+1] = VID_JoyState_GetAxis(joystate, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, 1, joy_sdl2_trigger_deadzone.value) > 0.0f;
@@ -1418,6 +1418,11 @@ static void VID_OutputVersion(void)
 #ifdef WIN32
 static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect)
 {
+       int workWidth;
+       int workHeight;
+       int titleBarPixels = 2;
+       int screenHeight;
+       RECT workArea;
        LONG width = mode->width; // vid_width
        LONG height = mode->height; // vid_height
 
@@ -1428,16 +1433,14 @@ static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect)
        rect->bottom = height;
        AdjustWindowRectEx(rect, WS_CAPTION|WS_THICKFRAME, false, 0);
 
-       RECT workArea;
        SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0);
-       int workWidth = workArea.right - workArea.left;
-       int workHeight = workArea.bottom - workArea.top;
+       workWidth = workArea.right - workArea.left;
+       workHeight = workArea.bottom - workArea.top;
 
        // SDL forces the window height to be <= screen height - 27px (on Win8.1 - probably intended for the title bar) 
        // If the task bar is docked to the the left screen border and we move the window to negative y,
        // there would be some part of the regular desktop visible on the bottom of the screen.
-       int titleBarPixels = 2;
-       int screenHeight = GetSystemMetrics(SM_CYSCREEN);
+       screenHeight = GetSystemMetrics(SM_CYSCREEN);
        if (screenHeight == workHeight)
                titleBarPixels = -rect->top;
 
@@ -1468,6 +1471,8 @@ extern cvar_t gl_info_driver;
 static qboolean VID_InitModeGL(viddef_mode_t *mode)
 {
        int windowflags = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL;
+       // currently SDL_WINDOWPOS_UNDEFINED behaves exactly like SDL_WINDOWPOS_CENTERED, this might change some day
+       // https://trello.com/c/j56vUcwZ/81-centered-vs-undefined-window-position
        int xPos = SDL_WINDOWPOS_UNDEFINED;
        int yPos = SDL_WINDOWPOS_UNDEFINED;
 #ifndef USE_GLES2
@@ -1489,8 +1494,8 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
 
 // COMMANDLINEOPTION: SDL GL: -gl_driver <drivername> selects a GL driver library, default is whatever SDL recommends, useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it
        i = COM_CheckParm("-gl_driver");
-       if (i && i < com_argc - 1)
-               drivername = com_argv[i + 1];
+       if (i && i < sys.argc - 1)
+               drivername = sys.argv[i + 1];
        if (SDL_GL_LoadLibrary(drivername) < 0)
        {
                Con_Errorf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());
@@ -1520,16 +1525,27 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
                        vid_isfullscreen = true;
                }
                else {
+                       if (vid_borderless.integer)
+                               windowflags |= SDL_WINDOW_BORDERLESS;
 #ifdef WIN32
-                       RECT rect;
-                       AdjustWindowBounds(mode, &rect);
-                       xPos = rect.left;
-                       yPos = rect.top;
+                       if (vid_ignore_taskbar.integer) {
+                               xPos = SDL_WINDOWPOS_CENTERED;
+                               yPos = SDL_WINDOWPOS_CENTERED;
+                       }
+                       else {
+                               RECT rect;
+                               AdjustWindowBounds(mode, &rect);
+                               xPos = rect.left;
+                               yPos = rect.top;
+                       }
 #endif
                }
        }
        //flags |= SDL_HWSURFACE;
 
+       if (vid_mouse_clickthrough.integer && !vid_isfullscreen)
+               SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1");
+
        SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
        SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8);
        SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8);