Give CSQC entity scopes names.

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index ab754107396f5b8852713f0dec0d53d5de6f7610..324800d5368f0dc0eefd7105f66af4f1b30fa2d1 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -91,6 +91,7 @@ static SDL_Window *window;
 static int window_flags;
 #endif
 static SDL_Surface *vid_softsurface;
+static vid_mode_t desktop_mode;
 
 /////////////////////////
 // Input handling
@@ -769,7 +770,7 @@ void VID_BuildJoyState(vid_joystate_t *joystate)
        if (skip != 11) \
                VID_TouchscreenArea( 0,   0,   0,   0,   0, NULL                         , 0.0f, NULL, NULL, &buttons[11], (keynum_t)'b', NULL, 0, 0, 0, false); \
        if (skip != 12) \
-               VID_TouchscreenArea( 0,   0,   0,   0,   0, NULL                         , 0.0f, NULL, NULL, &buttons[12], 'q', NULL, 0, 0, 0, false); \
+               VID_TouchscreenArea( 0,   0,   0,   0,   0, NULL                         , 0.0f, NULL, NULL, &buttons[12], (keynum_t)'q', NULL, 0, 0, 0, false); \
        if (skip != 13) \
                VID_TouchscreenArea( 0,   0,   0,   0,   0, NULL                         , 0.0f, NULL, NULL, &buttons[13], (keynum_t)'`', NULL, 0, 0, 0, false); \
        if (skip != 14) \
@@ -852,10 +853,10 @@ static void IN_Move_TouchScreen_SteelStorm(void)
                {
                        VID_TouchscreenCursor(0, 0, 0, 0, &buttons[0], K_MOUSE1);
 
-                       VID_TouchscreenArea( 2,16*xscale,-240*yscale, 224*xscale, 224*yscale, "gfx/gui/touch_l_thumb_dpad.tga", 0.0f, NULL, move, &buttons[1], 0, NULL, 0.15, 112*xscale, 112*yscale, false);
+                       VID_TouchscreenArea( 2,16*xscale,-240*yscale, 224*xscale, 224*yscale, "gfx/gui/touch_l_thumb_dpad.tga", 0.0f, NULL, move, &buttons[1], (keynum_t)0, NULL, 0.15, 112*xscale, 112*yscale, false);
 
-                       VID_TouchscreenArea( 3,-240*xscale,-160*yscale, 224*xscale, 128*yscale, "gfx/gui/touch_r_thumb_turn_n_shoot.tga"    , 0.0f, NULL, NULL,  0, 0, NULL, 0, 56*xscale, 0, false);
-                       VID_TouchscreenArea( 3,-240*xscale,-256*yscale, 224*xscale, 224*yscale, NULL    , 0.0f, NULL, aim,  &buttons[2], 0, NULL, 0.2, 56*xscale, 0, false);
+                       VID_TouchscreenArea( 3,-240*xscale,-160*yscale, 224*xscale, 128*yscale, "gfx/gui/touch_r_thumb_turn_n_shoot.tga"    , 0.0f, NULL, NULL,  0, (keynum_t)0, NULL, 0, 56*xscale, 0, false);
+                       VID_TouchscreenArea( 3,-240*xscale,-256*yscale, 224*xscale, 224*yscale, NULL    , 0.0f, NULL, aim,  &buttons[2], (keynum_t)0, NULL, 0.2, 56*xscale, 0, false);
 
                        VID_TouchscreenArea( 2, (vid_conwidth.value / 2) - 128,-80,  256,  80, NULL, 0.0f, NULL, NULL, &buttons[3], K_SHIFT, NULL, 0, 0, 0, true);
 
@@ -864,7 +865,7 @@ static void IN_Move_TouchScreen_SteelStorm(void)
 
                        VID_TouchscreenArea( 1,-100,   0, 100, 100, NULL                         , 0.0f, NULL, NULL, &buttons[10], (keynum_t)'m', NULL, 0, 0, 0, true);
                        VID_TouchscreenArea( 1,-100, 120, 100, 100, NULL                         , 0.0f, NULL, NULL, &buttons[11], (keynum_t)'b', NULL, 0, 0, 0, true);
-                       VID_TouchscreenArea( 0,   0,   0,  64,  64, NULL                         , 0.0f, NULL, NULL, &buttons[12], 'q', NULL, 0, 0, 0, true);
+                       VID_TouchscreenArea( 0,   0,   0,  64,  64, NULL                         , 0.0f, NULL, NULL, &buttons[12], (keynum_t)'q', NULL, 0, 0, 0, true);
                        if (developer.integer)
                                VID_TouchscreenArea( 0,   0,  96,  64,  64, NULL                         , 0.0f, NULL, NULL, &buttons[13], (keynum_t)'`', NULL, 0, 0, 0, true);
                        else
@@ -1132,11 +1133,12 @@ void Sys_SendKeyEvents( void )
                        case SDL_VIDEOEXPOSE:
                                break;
                        case SDL_VIDEORESIZE:
-                               if(vid_resizable.integer < 2)
+                               if(vid_resizable.integer < 2 || vid_isfullscreen)
                                {
                                        vid.width = event.resize.w;
                                        vid.height = event.resize.h;
-                                       screen = SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags);
+                                       if (!vid_isfullscreen)
+                                               screen = SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags);
                                        if (vid_softsurface)
                                        {
                                                SDL_FreeSurface(vid_softsurface);
@@ -2473,14 +2475,36 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        // Knghtbrd: should do platform-specific extension string function here
 
        vid_isfullscreen = false;
-       if (mode->fullscreen) {
 #if SDL_MAJOR_VERSION == 1
-               flags |= SDL_FULLSCREEN;
+       {
+               const SDL_VideoInfo *vi = SDL_GetVideoInfo();
+               desktop_mode.width = vi->current_w;
+               desktop_mode.height = vi->current_h;
+               desktop_mode.bpp = vi->vfmt->BitsPerPixel;
+               desktop_mode.pixelheight_num = 1;
+               desktop_mode.pixelheight_denom = 1; // SDL does not provide this
+               if (mode->fullscreen) {
+                       if (vid_desktopfullscreen.integer)
+                       {
+                               mode->width = vi->current_w;
+                               mode->height = vi->current_h;
+                               mode->bitsperpixel = vi->vfmt->BitsPerPixel;
+                       }
+                       flags |= SDL_FULLSCREEN;
+                       vid_isfullscreen = true;
+               }
+       }
 #else
-               windowflags |= SDL_WINDOW_FULLSCREEN;
-#endif
-               vid_isfullscreen = true;
+       {
+               if (mode->fullscreen) {
+                       if (vid_desktopfullscreen.integer)
+                               windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+                       else
+                               windowflags |= SDL_WINDOW_FULLSCREEN;
+                       vid_isfullscreen = true;
+               }
        }
+#endif
        //flags |= SDL_HWSURFACE;
 
        SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
@@ -2619,9 +2643,16 @@ static qboolean VID_InitModeSoft(viddef_mode_t *mode)
        vid_isfullscreen = false;
        if (mode->fullscreen) {
 #if SDL_MAJOR_VERSION == 1
+               const SDL_VideoInfo *vi = SDL_GetVideoInfo();
+               mode->width = vi->current_w;
+               mode->height = vi->current_h;
+               mode->bitsperpixel = vi->vfmt->BitsPerPixel;
                flags |= SDL_FULLSCREEN;
 #else
-               windowflags |= SDL_WINDOW_FULLSCREEN;
+               if (vid_desktopfullscreen.integer)
+                       windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+               else
+                       windowflags |= SDL_WINDOW_FULLSCREEN;
 #endif
                vid_isfullscreen = true;
        }
@@ -2840,6 +2871,27 @@ void VID_Finish (void)
        }
 }
 
+vid_mode_t *VID_GetDesktopMode(void)
+{
+#if SDL_MAJOR_VERSION != 1
+       SDL_DisplayMode mode;
+       int bpp;
+       Uint32 rmask, gmask, bmask, amask;
+       SDL_GetDesktopDisplayMode(0, &mode);
+       SDL_PixelFormatEnumToMasks(mode.format, &bpp, &rmask, &gmask, &bmask, &amask);
+       modes[k].width = mode.w;
+       modes[k].height = mode.h;
+       modes[k].bpp = bpp;
+       modes[k].refreshrate = mode.refreshrate;
+       modes[k].pixelheight_num = 1;
+       modes[k].pixelheight_denom = 1; // SDL does not provide this
+       // TODO check whether this actually works, or whether we do still need
+       // a read-window-size-after-entering-desktop-fullscreen hack for
+       // multiscreen setups.
+#endif
+       return &desktop_mode;
+}
+
 size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
 {
        size_t k = 0;
@@ -2871,9 +2923,9 @@ size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
                        continue;
                modes[k].width = mode.w;
                modes[k].height = mode.h;
+               // FIXME bpp?
                modes[k].refreshrate = mode.refresh_rate;
                modes[k].pixelheight_num = 1;
-               modes[k].pixelheight_num = 1;
                modes[k].pixelheight_denom = 1; // SDL does not provide this
                k++;
        }