Changeset 81537 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Oct 25, 2019 11:46:30 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134270

Message:

FE/VBoxSDL: Added first support for SDL2 (by setting VBOX_WITH_SDL2). Very rough / hacky by now and needs more testing first before enabling by default. Also fixed non-starting with SDL 1.2.x on Windows hosts.

Known limitations / todos when running with SDL 2 for now:

• No alpha channel support for cursors.
• No mouse wheel support.
• Desktop geometry handling needs a revamp for multi monitor setups.
• Check / revamp dirty rectangle blitting.
• OpenGL renderer needs testing wrt texture blitting.

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (28 diffs)
• Framebuffer.h (modified) (3 diffs)
• Makefile.kmk (modified) (2 diffs)
• VBoxSDL.cpp (modified) (40 diffs)
• VBoxSDL.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -113 +113 @@
                      bool fUpdateImage)
 {
-    int rc;
     LogFlow(("VBoxSDLFB::VBoxSDLFB\n"));
 
@@ -119 +118 @@
     mfUpdateImage   = fUpdateImage;
     mScreen         = NULL;
-#ifdef VBOX_WITH_SDL13
-    mWindow         = 0;
-    mTexture        = 0;
+#ifdef VBOX_WITH_SDL2
+    mpWindow        = NULL;
+    mpTexture       = NULL;
+    mpRenderer      = NULL;
 #endif
     mSurfVRAM       = NULL;
@@ -150 +150 @@
     mfUpdates = false;
 
-    rc = RTCritSectInit(&mUpdateLock);
+    int rc = RTCritSectInit(&mUpdateLock);
     AssertMsg(rc == VINF_SUCCESS, ("Error from RTCritSectInit!\n"));
 
@@ -161 +161 @@
 #endif
 
-    return 0;
+#ifdef VBOX_WITH_SDL2
+    rc = SDL_GetRendererInfo(mpRenderer, &mRenderInfo);
+    if (RT_SUCCESS(rc))
+    {
+        if (fShowSDLConfig)
+            RTPrintf("Render info:\n"
+                     "  Name:                    %s\n"
+                     "  Render flags:            0x%x\n"
+                     "  SDL video driver:        %s\n",
+                     mRenderInfo.name,
+                     mRenderInfo.flags,
+                     RTEnvGet("SDL_VIDEODRIVER"));
+    }
+#endif
+
+    return rc;
 }
 
@@ -184 +199 @@
 }
 
+/* static */
 bool VBoxSDLFB::init(bool fShowSDLConfig)
 {
@@ -195 +211 @@
     if (!RTEnvExist("SDL_VIDEODRIVER"))
     {
-        _putenv("SDL_VIDEODRIVER=directx");
-//        _putenv("SDL_VIDEODRIVER=windib");
+# ifndef VBOX_WITH_SDL2
+        /* Always select the windib driver by default, as the directx one is known to be broken on newer Windows OSes. */
+        RTEnvSet("SDL_VIDEODRIVER", "windib");
+# else
+        RTEnvSet("SDL_VIDEODRIVER", "directx");
+# endif
     }
 #endif
@@ -204 +224 @@
     RTEnvSet("SDL_VIDEO_X11_DGAMOUSE", "0");
 #endif
+
     int rc = SDL_InitSubSystem(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE);
     if (rc != 0)
@@ -212 +233 @@
     gfSdlInitialized = true;
 
+#ifdef VBOX_WITH_SDL2
+    RT_NOREF(fShowSDLConfig);
+#else
     const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
-    Assert(videoInfo);
+    AssertPtr(videoInfo);
     if (videoInfo)
     {
@@ -244 +268 @@
                          RTEnvGet("SDL_VIDEODRIVER"));
     }
-
-    if (12320 == g_cbIco64x01)
-    {
-        gWMIcon = SDL_AllocSurface(SDL_SWSURFACE, 64, 64, 24, 0xff, 0xff00, 0xff0000, 0);
-        /** @todo make it as simple as possible. No PNM interpreter here... */
-        if (gWMIcon)
-        {
-            memcpy(gWMIcon->pixels, g_abIco64x01+32, g_cbIco64x01-32);
-            SDL_WM_SetIcon(gWMIcon, NULL);
-        }
-    }
+#endif /* !VBOX_WITH_SDL2 */
+
+#ifndef VBOX_WITH_SDL2
+    gWMIcon = SDL_AllocSurface(SDL_SWSURFACE, 64, 64, 24, 0xff, 0xff00, 0xff0000, 0);
+    /** @todo make it as simple as possible. No PNM interpreter here... */
+    if (gWMIcon)
+    {
+        memcpy(gWMIcon->pixels, g_abIco64x01+32, g_cbIco64x01-32);
+        SDL_WM_SetIcon(gWMIcon, NULL);
+    }
+#endif
 
     return true;
@@ -270 +294 @@
         AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+#ifndef VBOX_WITH_SDL2
         if (gWMIcon)
         {
@@ -275 +301 @@
             gWMIcon = NULL;
         }
+#endif
     }
 }
@@ -581 +608 @@
         /* nope, we don't want that (but still don't freak out if it is set) */
 #ifdef DEBUG
-        printf("VBoxSDL::VideoModeSupported: we refused mode %dx%dx%d\n", width, height, bpp);
+        RTPrintf("VBoxSDL::VideoModeSupported: we refused mode %dx%dx%d\n", width, height, bpp);
 #endif
         *supported = false;
@@ -770 +797 @@
 {
     LogFlow(("VBoxSDL:resizeSDL\n"));
+
+#ifdef VBOX_WITH_SDL2
+    const int cDisplays = SDL_GetNumVideoDisplays();
+    if (cDisplays > 0)
+    {
+        for (int d = 0; d < cDisplays; d++)
+        {
+            const int cDisplayModes = SDL_GetNumDisplayModes(d);
+            for (int m = 0; m < cDisplayModes; m++)
+            {
+                SDL_DisplayMode mode = { SDL_PIXELFORMAT_UNKNOWN, 0, 0, 0, 0 };
+                if (SDL_GetDisplayMode(d, m, &mode) != 0)
+                {
+                    RTPrintf("Display #%d, mode %d:\t\t%i bpp\t%i x %i",
+                             SDL_BITSPERPIXEL(mode.format), mode.w, mode.h);
+                }
+
+                if (m == 0)
+                {
+                    /*
+                     * according to the SDL documentation, the API guarantees that
+                     * the modes are sorted from larger to smaller, so we just
+                     * take the first entry as the maximum.
+                     */
+                    mMaxScreenWidth  = mode.w;
+                    mMaxScreenHeight = mode.h;
+                }
+
+                /* Keep going. */
+            }
+        }
+    }
+    else
+        AssertFailed(); /** @todo */
+#else
 
     /*
@@ -814 +876 @@
         mMaxScreenHeight = ~(uint32_t)0;
     }
+#endif /* VBOX_WITH_SDL2 */
 
     uint32_t newWidth;
@@ -841 +904 @@
     mTopOffset = 0;
 
-#if defined(VBOX_WITH_SDL13)
+#ifdef VBOX_WITH_SDL2
     int sdlWindowFlags = SDL_WINDOW_SHOWN;
     if (mfResizable)
         sdlWindowFlags |= SDL_WINDOW_RESIZABLE;
-    if (!mWindow)
+    if (!mpWindow)
     {
         SDL_DisplayMode desktop_mode;
@@ -851 +914 @@
         int y = 40 + mScreenId * 15;
 
-        SDL_GetDesktopDisplayMode(&desktop_mode);
+        SDL_GetDesktopDisplayMode(mScreenId, &desktop_mode);
         /* create new window */
 
         char szTitle[64];
         RTStrPrintf(szTitle, sizeof(szTitle), "SDL window %d", mScreenId);
-        mWindow = SDL_CreateWindow(szTitle, x, y,
+        mpWindow = SDL_CreateWindow(szTitle, x, y,
                                    newWidth, newHeight, sdlWindowFlags);
-        if (SDL_CreateRenderer(mWindow, -1,
-                               SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD) < 0)
+        mpRenderer = SDL_CreateRenderer(mpWindow, -1, 0 /* SDL_RendererFlags */);
+        if (mpRenderer)
+        {
+            SDL_GetRendererInfo(mpRenderer, &mRenderInfo);
+
+            mpTexture = SDL_CreateTexture(mpRenderer, desktop_mode.format,
+                                          SDL_TEXTUREACCESS_STREAMING, newWidth, newHeight);
+            if (!mpTexture)
+                AssertReleaseFailed();
+        }
+        else
             AssertReleaseFailed();
 
-        SDL_GetRendererInfo(&mRenderInfo);
-
-        mTexture = SDL_CreateTexture(desktop_mode.format,
-                                     SDL_TEXTUREACCESS_STREAMING, newWidth, newHeight);
-        if (!mTexture)
-            AssertReleaseFailed();
+        if (12320 == g_cbIco64x01)
+        {
+            gWMIcon = SDL_CreateRGBSurface(0 /* Flags, must be 0 */, 64, 64, 24, 0xff, 0xff00, 0xff0000, 0);
+            /** @todo make it as simple as possible. No PNM interpreter here... */
+            if (gWMIcon)
+            {
+                memcpy(gWMIcon->pixels, g_abIco64x01+32, g_cbIco64x01-32);
+                SDL_SetWindowIcon(mpWindow, gWMIcon);
+            }
+        }
     }
     else
@@ -876 +952 @@
 
         /* resize current window */
-        SDL_GetWindowSize(mWindow, &w, &h);
+        SDL_GetWindowSize(mpWindow, &w, &h);
 
         if (w != (int)newWidth || h != (int)newHeight)
-            SDL_SetWindowSize(mWindow, newWidth, newHeight);
-
-        SDL_QueryTexture(mTexture, &format, &access, &w, &h);
-        SDL_SelectRenderer(mWindow);
-        SDL_DestroyTexture(mTexture);
-        mTexture = SDL_CreateTexture(format, access, newWidth, newHeight);
-        if (!mTexture)
+            SDL_SetWindowSize(mpWindow, newWidth, newHeight);
+
+        SDL_QueryTexture(mpTexture, &format, &access, &w, &h);
+        SDL_DestroyTexture(mpTexture);
+        mpTexture = SDL_CreateTexture(mpRenderer, format, access, newWidth, newHeight);
+        if (!mpTexture)
             AssertReleaseFailed();
     }
@@ -895 +970 @@
     uint32_t format;
 
-    if (SDL_QueryTexture(mTexture, &format, NULL, &w, &h) < 0)
+    if (SDL_QueryTexture(mpTexture, &format, NULL, &w, &h) < 0)
         AssertReleaseFailed();
 
@@ -901 +976 @@
         AssertReleaseFailed();
 
-    if (SDL_QueryTexturePixels(mTexture, &pixels, &pitch) == 0)
+    if (SDL_LockTexture(mpTexture, NULL /* SDL_Rect */, &pixels, &pitch) == 0)
     {
         mScreen = SDL_CreateRGBSurfaceFrom(pixels, w, h, bpp, pitch,
                                            Rmask, Gmask, Bmask, Amask);
+        SDL_UnlockTexture(mpTexture); /** @BUGBUG See: https://bugzilla.libsdl.org/show_bug.cgi?id=1586 */
     }
     else
@@ -933 +1009 @@
     SDL_VERSION(&info.version);
     if (SDL_GetWMInfo(&info))
-        mWinId = (LONG64) info.info.x11.wmwindow;
+        mWinId = (LONG64) info.info.x11.wmpWindow;
 # elif defined(RT_OS_DARWIN)
     mWinId = (intptr_t)VBoxSDLGetDarwinWindowId();
@@ -939 +1015 @@
     /* XXX ignore this for other architectures */
 # endif
-#endif
+#endif /* VBOX_WITH_SDL2 */
 #ifdef VBOX_SECURELABEL
     /*
@@ -971 +1047 @@
             mCenterYOffset = (mFixedSDLHeight - (mGuestYRes + mLabelHeight)) / 2;
     }
-#endif
+#endif /* VBOX_SECURELABEL */
+
     AssertMsg(mScreen, ("Error: SDL_SetVideoMode failed!\n"));
     if (mScreen)
@@ -980 +1057 @@
 #endif
         if (mfShowSDLConfig)
-            RTPrintf("Resized to %dx%d, screen surface type: %s\n", mScreen->w, mScreen->h,
-                     ((mScreen->flags & SDL_HWSURFACE) == 0) ? "software" : "hardware");
+            RTPrintf("Resized to %dx%d\n", mScreen->w, mScreen->h);
     }
 }
@@ -1079 +1155 @@
     SDL_BlitSurface(mSurfVRAM, &srcRect, mScreen, &dstRect);
     /* hardware surfaces don't need update notifications */
-#if defined(VBOX_WITH_SDL13)
+#if defined(VBOX_WITH_SDL2)
     AssertRelease(mScreen->flags & SDL_PREALLOC);
-    SDL_SelectRenderer(mWindow);
-    SDL_DirtyTexture(mTexture, 1, &dstRect);
-    AssertRelease(mRenderInfo.flags & SDL_RENDERER_PRESENTCOPY);
-    SDL_RenderCopy(mTexture, &dstRect, &dstRect);
-    SDL_RenderPresent();
+    /** @todo Do we need to update the dirty rect for the texture for SDL2 here as well? */
+    SDL_RenderClear(mpRenderer);
+    SDL_RenderCopy(mpRenderer, mpTexture, &dstRect, &dstRect);
+    SDL_RenderPresent(mpRenderer);
 #else
     if ((mScreen->flags & SDL_HWSURFACE) == 0)
@@ -1131 +1206 @@
 void VBoxSDLFB::getFullscreenGeometry(uint32_t *width, uint32_t *height)
 {
+#ifndef VBOX_WITH_SDL2
     SDL_Rect **modes;
 
@@ -1159 +1235 @@
         }
     }
-}
+#else
+    SDL_DisplayMode dm;
+    int rc = SDL_GetDesktopDisplayMode(0, &dm); /** @BUGBUG Handle multi monitor setups! */
+    if (rc == 0)
+    {
+        *width  = dm.w;
+        *height = dm.w;
+    }
+#endif
+}
+
+#ifdef VBOX_WITH_SDL2
+int VBoxSDLFB::setWindowTitle(const char *pcszTitle)
+{
+    SDL_SetWindowTitle(mpWindow, pcszTitle);
+
+    return VINF_SUCCESS;
+}
+#endif
 
 #ifdef VBOX_SECURELABEL
@@ -1302 +1396 @@
 HRESULT VBoxSDLFBOverlay::init()
 {
-    mBlendedBits = SDL_CreateRGBSurface(SDL_ANYFORMAT, mOverlayWidth, mOverlayHeight, 32,
+#ifndef VBOX_WITH_SDL2
+    Uint32 fFlags = SDL_ANYFORMAT;
+#else
+    Uint32 fFlags = 0;
+#endif
+
+    mBlendedBits = SDL_CreateRGBSurface(fFlags, mOverlayWidth, mOverlayHeight, 32,
                                         0x00ff0000, 0x0000ff00, 0x000000ff, 0);
     AssertMsgReturn(mBlendedBits != NULL, ("Failed to create an SDL surface\n"),
                     E_OUTOFMEMORY);
-    mOverlayBits = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_SRCALPHA, mOverlayWidth,
+
+#ifndef VBOX_WITH_SDL2
+    fFlags = SDL_SWSURFACE | SDL_SRCALPHA, mOverlayWidth;
+#else
+    fFlags = 0;
+#endif
+
+    mOverlayBits = SDL_CreateRGBSurface(fFlags,
                                         mOverlayHeight, 32, 0x00ff0000, 0x0000ff00,
-                                        0x000000ff, 0xff000000);
+                                        0x000000ff, 0xff000000, 0);
     AssertMsgReturn(mOverlayBits != NULL, ("Failed to create an SDL surface\n"),
                     E_OUTOFMEMORY);
@@ -1617 +1724 @@
     mOverlayHeight = h;
     SDL_FreeSurface(mOverlayBits);
-    mBlendedBits = SDL_CreateRGBSurface(SDL_ANYFORMAT, mOverlayWidth, mOverlayHeight, 32,
+
+#ifndef VBOX_WITH_SDL2
+    Uint32 fFlags = SDL_ANYFORMAT;
+#else
+    Uint32 fFlags = 0;
+#endif
+
+    mBlendedBits = SDL_CreateRGBSurface(fFlags, mOverlayWidth, mOverlayHeight, 32,
                                         0x00ff0000, 0x0000ff00, 0x000000ff, 0);
     AssertMsgReturn(mBlendedBits != NULL, ("Failed to create an SDL surface\n"),
                     E_OUTOFMEMORY);
-    mOverlayBits = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_SRCALPHA, mOverlayWidth,
+
+#ifndef VBOX_WITH_SDL2
+    fFlags = SDL_SWSURFACE | SDL_SRCALPHA;
+#else
+    fFlags = 0;
+#endif
+
+    mOverlayBits = SDL_CreateRGBSurface(fFlags, mOverlayWidth,
                                         mOverlayHeight, 32, 0x00ff0000, 0x0000ff00,
                                         0x000000ff, 0xff000000);

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -42 +42 @@
 extern DECLSPEC void (SDLCALL *pTTF_Quit)(void);
 }
-#endif /* VBOX_SECURELABEL && !VBOX_WITH_SDL13 */
+#endif /* VBOX_SECURELABEL && !VBOX_WITH_SDL2 */
 
 class VBoxSDLFBOverlay;
@@ -118 +118 @@
     int32_t getXOffset() { return mCenterXOffset; }
     int32_t getYOffset() { return mCenterYOffset; }
-#ifdef VBOX_WITH_SDL13
-    bool hasWindow(SDL_WindowID id) { return mScreen && mWindow == id; }
+#ifdef VBOX_WITH_SDL2
+    SDL_Window *getWindow() { return mpWindow; }
+    bool hasWindow(uint32_t id) { return mScreen && SDL_GetWindowID(mpWindow) == id; }
+    int setWindowTitle(const char *pcszTitle);
 #endif
 #ifdef VBOX_SECURELABEL
@@ -134 +136 @@
     /** current SDL framebuffer pointer (also includes screen width/height) */
     SDL_Surface *mScreen;
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
     /** the SDL window */
-    SDL_WindowID mWindow;
+    SDL_Window *mpWindow;
     /** the texture */
-    SDL_TextureID mTexture;
+    SDL_Texture *mpTexture;
+    /** renderer */
+    SDL_Renderer *mpRenderer;
     /** render info */
     SDL_RendererInfo mRenderInfo;

trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

@@ -50 +50 @@
 VBoxSDL_SOURCES.darwin = \
         VBoxSDLMain-darwin.m \
-       Framebuffer-darwin.m
+        Framebuffer-darwin.m
 
 VBoxSDL_DEFS       =
-ifdef VBOX_WITH_SDL13
- VBoxSDL_DEFS     += VBOX_WITH_SDL13
-else
+ifdef VBOX_WITH_SDL2
+ VBoxSDL_DEFS     += VBOX_WITH_SDL2
+endif
+if !defined(VBOX_WITH_SDL2)
  ifdef VBOX_WITH_SECURELABEL
   VBoxSDL_DEFS    += VBOX_SECURELABEL
@@ -161 +162 @@
 endif # !VBOX_WITH_HARDENING || "$(KBUILD_TARGET)" != "darwin"
 include $(FILE_KBUILD_SUB_FOOTER)
-

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -46 +46 @@
 #endif
 
+#include "VBoxSDL.h"
+
 #ifdef _MSC_VER
 # pragma warning(push)
@@ -57 +59 @@
 #endif
 
-#include "VBoxSDL.h"
 #include "Framebuffer.h"
 #include "Helper.h"
@@ -173 +174 @@
 static void    SetFullscreen(bool enable);
 
-#ifdef VBOX_WITH_SDL13
-static VBoxSDLFB * getFbFromWinId(SDL_WindowID id);
+#ifdef VBOX_WITH_SDL2
+static VBoxSDLFB *getFbFromWinId(Uint32 id);
 #endif
 
@@ -226 +227 @@
 #endif
 static SDL_Cursor *gpCustomCursor = NULL;
-#ifndef VBOX_WITH_SDL13
+#ifndef VBOX_WITH_SDL2
 static WMcursor   *gpCustomOrigWMcursor = NULL;
 #endif
@@ -233 +234 @@
 static SDL_TimerID gSdlQuitTimer = NULL;
 
-#if defined(VBOXSDL_WITH_X11) && !defined(VBOX_WITH_SDL13)
+#if defined(VBOXSDL_WITH_X11) && !defined(VBOX_WITH_SDL2)
 static SDL_SysWMinfo gSdlInfo;
 #endif
@@ -537 +538 @@
                 /* SDL feature not available on Quartz */
 #else
+                bool fCanShow = false;
+
+# ifdef VBOX_WITH_SDL2
+                Uint32 winId = 0;
+
+                VBoxSDLFB *fb = getFbFromWinId(winId);
+
+                SDL_SysWMinfo info;
+                SDL_VERSION(&info.version);
+                if (SDL_GetWindowWMInfo(fb->getWindow(), &info))
+                    fCanShow = true;
+# else
                 SDL_SysWMinfo info;
                 SDL_VERSION(&info.version);
                 if (!SDL_GetWMInfo(&info))
+                    fCanShow = false;
+                else
+                    fCanShow = true;
+# endif /* VBOX_WITH_SDL2 */
+
+                if (fCanShow)
+                    pCSWEv->AddApproval(NULL);
+                else
                     pCSWEv->AddVeto(NULL);
-                else
-                    pCSWEv->AddApproval(NULL);
 #endif
                 break;
@@ -558 +577 @@
                 SDL_SysWMinfo info;
                 SDL_VERSION(&info.version);
+# ifdef VBOX_WITH_SDL2
+                VBoxSDLFB *fb = getFbFromWinId(winId);
+                if (SDL_GetWindowWMInfo(fb->getWindow(), &info))
+# else
                 if (SDL_GetWMInfo(&info))
+# endif /* VBOX_WITH_SDL2 */
                 {
 # if defined(VBOXSDL_WITH_X11)
                     pSWEv->COMSETTER(WinId)((LONG64)info.info.x11.wmwindow);
 # elif defined(RT_OS_WINDOWS)
+#  ifdef VBOX_WITH_SDL2
+                    pSWEv->COMSETTER(WinId)((intptr_t)info.info.win.window);
+#  else
                     pSWEv->COMSETTER(WinId)((intptr_t)info.window);
-# else
+#  endif /* VBOX_WITH_SDL2 */
+# else /* !RT_OS_WINDOWS */
                     AssertFailed();
 # endif
@@ -793 +821 @@
                       || !strcmp(argv[1], "--detecthostkey")))
     {
-        int rc = SDL_InitSubSystem(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE);
+        Uint32 fInitSubSystem = SDL_INIT_VIDEO | SDL_INIT_TIMER;
+#ifndef VBOX_WITH_SDL2
+        fInitSubSystem |= SDL_INIT_NOPARACHUTE;
+#endif
+        int rc = SDL_InitSubSystem(fInitSubSystem);
         if (rc != 0)
         {
@@ -800 +832 @@
         }
         /* we need a video window for the keyboard stuff to work */
+#ifndef VBOX_WITH_SDL2 /** @todo Is this correct? */
         if (!SDL_SetVideoMode(640, 480, 16, SDL_SWSURFACE))
         {
@@ -805 +838 @@
             return 1;
         }
-
+#endif
         RTPrintf("Please hit one or two function key(s) to get the --hostkey value...\n");
 
@@ -2174 +2207 @@
     gpDefaultCursor = SDL_GetCursor();
 
-#if !defined(VBOX_WITH_SDL13)
+#if !defined(VBOX_WITH_SDL2)
 # if defined(VBOXSDL_WITH_X11)
     /* Get Window Manager info. We only need the X11 display. */
@@ -2204 +2237 @@
         gpCustomCursor->wm_cursor = NULL;
     }
-#endif /* !VBOX_WITH_SDL13 */
+#endif /* !VBOX_WITH_SDL2 */
 
     /*
@@ -2446 +2479 @@
     UpdateTitlebar(TITLEBAR_NORMAL);
 
+#ifdef VBOX_WITH_SDL2
+    /* Key repeats are enabled by default on SDL2. */
+#else
     /*
      * Enable keyboard repeats
      */
     SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+#endif
 
     /*
@@ -2483 +2520 @@
              * The screen needs to be repainted.
              */
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
             case SDL_WINDOWEVENT:
             {
@@ -2499 +2536 @@
                         break;
                     }
+                    case SDL_WINDOWEVENT_FOCUS_LOST:
+                    {
+                        break;
+                    }
+                    case SDL_WINDOWEVENT_RESIZED:
+                    {
+                        if (gpDisplay)
+                        {
+                            if (gfIgnoreNextResize)
+                            {
+                                gfIgnoreNextResize = FALSE;
+                                break;
+                            }
+                            uResizeWidth  = event.window.data1;
+#ifdef VBOX_SECURELABEL
+                            if (fSecureLabel)
+                                uResizeHeight = RT_MAX(0, event.window.data2 - SECURE_LABEL_HEIGHT);
+                            else
+#endif
+                                uResizeHeight = event.window.data2;
+                            if (gSdlResizeTimer)
+                                SDL_RemoveTimer(gSdlResizeTimer);
+                            gSdlResizeTimer = SDL_AddTimer(300, ResizeTimer, NULL);
+                        }
+                        break;
+                    }
                     default:
                         break;
@@ -2517 +2580 @@
             case SDL_KEYUP:
             {
+#ifdef VBOX_WITH_SDL2
+                SDL_Keycode ksym = event.key.keysym.sym;
+#else
                 SDLKey ksym = event.key.keysym.sym;
-
+#endif
                 switch (enmHKeyState)
                 {
@@ -2660 +2726 @@
                 {
                     VBoxSDLFB *fb;
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
                     fb = getFbFromWinId(event.motion.windowID);
 #else
                     fb = gpFramebuffer[0];
 #endif
+                    AssertPtrBreak(fb);
                     SendMouseEvent(fb, 0, 0, 0);
                 }
@@ -2688 +2755 @@
                 else if (gfGrabbed || UseAbsoluteMouse())
                 {
+#ifdef VBOX_WITH_SDL2
+                    int dz = 0; /** @todo Implement mouse wheel support with SDL2 (event SDL_MOUSEWHEEL). */
+#else
                     int dz = bev->button == SDL_BUTTON_WHEELUP
                                          ? -1
@@ -2693 +2763 @@
                                                        ? +1
                                                        :  0;
-
+#endif
                     /* end host key combination (CTRL+MouseButton) */
                     switch (enmHKeyState)
@@ -2719 +2789 @@
 
                     VBoxSDLFB *fb;
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
                     fb = getFbFromWinId(event.button.windowID);
 #else
                     fb = gpFramebuffer[0];
 #endif
+                    AssertPtrBreak(fb);
                     SendMouseEvent(fb, dz, event.type == SDL_MOUSEBUTTONDOWN, bev->button);
                 }
@@ -2729 +2800 @@
             }
 
+#ifndef VBOX_WITH_SDL2
             /*
              * The window has gained or lost focus.
              */
-            case SDL_ACTIVEEVENT:
+            case SDL_ACTIVEEVENT: /** @todo Needs to be also fixed with SDL2? Check! */
             {
                 /*
@@ -2751 +2823 @@
 
             /*
-             * The SDL window was resized
+             * The SDL window was resized.
+             * For SDL2 this is done in SDL_WINDOWEVENT.
              */
             case SDL_VIDEORESIZE:
@@ -2775 +2848 @@
                 break;
             }
+#endif
 
             /*
@@ -3010 +3084 @@
     }
 
-#ifndef VBOX_WITH_SDL13
+#ifndef VBOX_WITH_SDL2
     /* restore the default cursor and free the custom one if any */
     if (gpDefaultCursor)
@@ -3328 +3402 @@
 
 #ifdef VBOXSDL_WITH_X11
-# ifdef VBOX_WITH_SDL13
+# ifdef VBOX_WITH_SDL2
 
     switch (ev->keysym.sym)
@@ -3662 +3736 @@
 static void ProcessKey(SDL_KeyboardEvent *ev)
 {
-#if (defined(DEBUG) || defined(VBOX_WITH_STATISTICS)) && !defined(VBOX_WITH_SDL13)
+#if (defined(DEBUG) || defined(VBOX_WITH_STATISTICS)) && !defined(VBOX_WITH_SDL2)
     if (gpMachineDebugger && ev->type == SDL_KEYDOWN)
     {
@@ -3926 +4000 @@
     if (!gfGuestNeedsHostCursor && gfRelativeMouseGuest)
         SDL_ShowCursor(SDL_DISABLE);
+#ifdef VBOX_WITH_SDL2
+    SDL_SetRelativeMouseMode(SDL_TRUE);
+#else
     SDL_WM_GrabInput(SDL_GRAB_ON);
     // dummy read to avoid moving the mouse
-    SDL_GetRelativeMouseState(
-#ifdef VBOX_WITH_SDL13
-                              0,
-#endif
-                              NULL, NULL);
+    SDL_GetRelativeMouseState(NULL, NULL);
+#endif
     gfGrabbed = TRUE;
     UpdateTitlebar(TITLEBAR_NORMAL);
@@ -3942 +4016 @@
 static void InputGrabEnd(void)
 {
+#ifdef VBOX_WITH_SDL2
+    SDL_SetRelativeMouseMode(SDL_FALSE);
+#else
     SDL_WM_GrabInput(SDL_GRAB_OFF);
+#endif
     if (!gfGuestNeedsHostCursor && gfRelativeMouseGuest)
         SDL_ShowCursor(SDL_ENABLE);
@@ -3962 +4040 @@
     bool abs;
 
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
     if (!fb)
     {
-        SDL_GetMouseState(0, &x, &y);
+        SDL_GetMouseState(&x, &y);
         RTPrintf("MouseEvent: Cannot find fb mouse = %d,%d\n", x, y);
         return;
@@ -3997 +4075 @@
     int  yMax = yMin + (int)fb->getGuestYRes();
 
-    state = abs ? SDL_GetMouseState(
-#ifdef VBOX_WITH_SDL13
-                                    0,
-#endif
-                                    &x, &y)
-                : SDL_GetRelativeMouseState(
-#ifdef VBOX_WITH_SDL13
-                                            0,
-#endif
-                                            &x, &y);
+    state = abs ? SDL_GetMouseState(&x, &y)
+                : SDL_GetRelativeMouseState(&x, &y);
 
     /*
@@ -4420 +4490 @@
     setUITitle(szTitle);
 #else
+# ifdef VBOX_WITH_SDL2
+    for (unsigned i = 0; i < gcMonitors; i++)
+        gpFramebuffer[i]->setWindowTitle(szTitle);
+# else
     SDL_WM_SetCaption(szTitle, VBOX_PRODUCT);
+# endif
 #endif
 }
@@ -4509 +4584 @@
         HBITMAP hBitmap;
         void *lpBits;
-        HCURSOR hAlphaCursor = NULL;
 
         ::ZeroMemory(&bi, sizeof(BITMAPV5HEADER));
@@ -4609 +4683 @@
             }
 
+#ifndef VBOX_WITH_SDL2 /** @BUGBUG Implement alpha cursor support handling. */
             ICONINFO ii;
             ii.fIcon = FALSE;
@@ -4616 +4691 @@
             ii.hbmColor = hBitmap;
 
-            hAlphaCursor = ::CreateIconIndirect(&ii);
+            HCURSOR hAlphaCursor = ::CreateIconIndirect(&ii);
             Assert(hAlphaCursor);
             if (hAlphaCursor)
@@ -4624 +4699 @@
 
                 WMcursor *pCustomTempWMCursor = gpCustomCursor->wm_cursor;
-
                 // see SDL12/src/video/wincommon/SDL_sysmouse.c
                 void *wm_cursor = malloc(sizeof(HCURSOR) + sizeof(uint8_t *) * 2);
@@ -4641 +4715 @@
                 ok = true;
             }
+#endif
         }
 
@@ -4696 +4771 @@
                 }
 
-#ifndef VBOX_WITH_SDL13
+#ifndef VBOX_WITH_SDL2
                 Cursor cur = XcursorImageLoadCursor(gSdlInfo.info.x11.display, img);
                 Assert(cur);
@@ -5074 +5149 @@
         int rc = SDL_PushEvent(event);
         RTSemEventSignal(g_EventSemSDLEvents);
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
         if (rc == 1)
 #else
@@ -5096 +5171 @@
 {
     int rc = SDL_PushEvent(event);
-#ifdef VBOX_WITH_SDL13
+#ifdef VBOX_WITH_SDL2
     bool fSuccess = (rc == 1);
 #else
@@ -5167 +5242 @@
 }
 
-#ifdef VBOX_WITH_SDL13
-static VBoxSDLFB * getFbFromWinId(SDL_WindowID id)
+#ifdef VBOX_WITH_SDL2
+static VBoxSDLFB *getFbFromWinId(Uint32 id)
 {
     for (unsigned i = 0; i < gcMonitors; i++)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.h

@@ -34 +34 @@
 # pragma warning(push)
 # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
+# pragma warning(disable: 4668) /* warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
 #endif
 #include <SDL.h>