Changeset 98304 in vbox for trunk/src

Timestamp:

Jan 25, 2023 4:18:56 PM (2 years ago)

Author:

vboxsync

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

155514

Message:

FE/SDL. bugref:9449. Removing more SDL 1.2 bits.

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (1 diff)
• VBoxSDL.cpp (modified) (9 diffs)

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

@@ -191 +191 @@
     if (!RTEnvExist("SDL_VIDEODRIVER"))
     {
-# 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

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

@@ -230 +230 @@
 #endif
 static SDL_Cursor *gpCustomCursor = 0;
-#ifndef VBOX_WITH_SDL2
-static WMcursor   *gpCustomOrigWMcursor = NULL;
-#endif
 static SDL_Cursor *gpOffCursor = NULL;
 static SDL_TimerID gSdlResizeTimer = 0;
@@ -759 +756 @@
      */
     {
-#ifndef VBOX_WITH_SDL2
+#if 0
         const SDL_version *pVersion = SDL_Linked_Version();
         if (  SDL_VERSIONNUM(pVersion->major, pVersion->minor, pVersion->patch)
@@ -776 +773 @@
     {
         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)
@@ -785 +779 @@
             return 1;
         }
-        /* 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))
-        {
-            RTPrintf("Error: could not set SDL video mode\n");
-            return 1;
-        }
-#endif
         RTPrintf("Please hit one or two function key(s) to get the --hostkey value...\n");
-
         SDL_Event event1;
         while (SDL_WaitEvent(&event1))
@@ -2569 +2554 @@
             }
 
-#ifndef VBOX_WITH_SDL2
+#ifndef 0
             /*
              * The window has gained or lost focus.
@@ -2613 +2598 @@
             }
 #endif
-
             /*
              * User specific update event.
@@ -2827 +2811 @@
         AssertComRC(hrc);
     }
-
-#ifndef VBOX_WITH_SDL2
-    /* restore the default cursor and free the custom one if any */
-    if (gpDefaultCursor)
-    {
-# ifdef VBOXSDL_WITH_X11
-        Cursor pDefaultTempX11Cursor = 0;
-        if (gfXCursorEnabled)
-        {
-            pDefaultTempX11Cursor = *(Cursor*)gpDefaultCursor->wm_cursor;
-            *(Cursor*)gpDefaultCursor->wm_cursor = gpDefaultOrigX11Cursor;
-        }
-# endif /* VBOXSDL_WITH_X11 */
-        SDL_SetCursor(gpDefaultCursor);
-# if defined(VBOXSDL_WITH_X11) && !defined(VBOX_WITHOUT_XCURSOR)
-        if (gfXCursorEnabled)
-            XFreeCursor(gSdlInfo.info.x11.display, pDefaultTempX11Cursor);
-# endif /* VBOXSDL_WITH_X11 && !VBOX_WITHOUT_XCURSOR */
-    }
-
-    if (gpCustomCursor)
-    {
-        WMcursor *pCustomTempWMCursor = gpCustomCursor->wm_cursor;
-        gpCustomCursor->wm_cursor = gpCustomOrigWMcursor;
-        SDL_FreeCursor(gpCustomCursor);
-        if (pCustomTempWMCursor)
-        {
-# if defined(RT_OS_WINDOWS)
-            ::DestroyCursor(*(HCURSOR *)pCustomTempWMCursor);
-# elif defined(VBOXSDL_WITH_X11) && !defined(VBOX_WITHOUT_XCURSOR)
-            if (gfXCursorEnabled)
-                XFreeCursor(gSdlInfo.info.x11.display, *(Cursor *)pCustomTempWMCursor);
-# endif /* VBOXSDL_WITH_X11 && !VBOX_WITHOUT_XCURSOR */
-            free(pCustomTempWMCursor);
-        }
-    }
-#endif
 
     LogFlow(("Releasing mouse, keyboard, remote desktop server, display, console...\n"));
@@ -4382 +4329 @@
                 dstShapePtr += data->width;
             }
-
-#ifndef VBOX_WITH_SDL2 /** @BUGBUG Implement alpha cursor support handling. */
-            ICONINFO ii;
-            ii.fIcon = FALSE;
-            ii.xHotspot = data->xHot;
-            ii.yHotspot = data->yHot;
-            ii.hbmMask = hMonoBitmap;
-            ii.hbmColor = hBitmap;
-
-            HCURSOR hAlphaCursor = ::CreateIconIndirect(&ii);
-            Assert(hAlphaCursor);
-            if (hAlphaCursor)
-            {
-                // here we do a dirty trick by substituting a Window Manager's
-                // cursor handle with the handle we created
-
-                WMcursor *pCustomTempWMCursor = gpCustomCursor->wm_cursor;
-                // see SDL12/src/video/wincommon/SDL_sysmouse.c
-                void *wm_cursor = malloc(sizeof(HCURSOR) + sizeof(uint8_t *) * 2);
-                *(HCURSOR *)wm_cursor = hAlphaCursor;
-
-                gpCustomCursor->wm_cursor = (WMcursor *)wm_cursor;
-                SDL_SetCursor(gpCustomCursor);
-                SDL_ShowCursor(SDL_ENABLE);
-
-                if (pCustomTempWMCursor)
-                {
-                    ::DestroyCursor(*(HCURSOR *)pCustomTempWMCursor);
-                    free(pCustomTempWMCursor);
-                }
-
-                ok = true;
-            }
-#endif
         }
 
@@ -4470 +4383 @@
                     dstShapePtr += data->width;
                 }
-
-#ifndef VBOX_WITH_SDL2
-                Cursor cur = XcursorImageLoadCursor(gSdlInfo.info.x11.display, img);
-                Assert(cur);
-                if (cur)
-                {
-                    // here we do a dirty trick by substituting a Window Manager's
-                    // cursor handle with the handle we created
-
-                    WMcursor *pCustomTempWMCursor = gpCustomCursor->wm_cursor;
-
-                    // see SDL12/src/video/x11/SDL_x11mouse.c
-                    void *wm_cursor = malloc(sizeof(Cursor));
-                    *(Cursor *)wm_cursor = cur;
-
-                    gpCustomCursor->wm_cursor = (WMcursor *)wm_cursor;
-                    SDL_SetCursor(gpCustomCursor);
-                    SDL_ShowCursor(SDL_ENABLE);
-
-                    if (pCustomTempWMCursor)
-                    {
-                        XFreeCursor(gSdlInfo.info.x11.display, *(Cursor *)pCustomTempWMCursor);
-                        free(pCustomTempWMCursor);
-                    }
-
-                    ok = true;
-                }
-#endif
             }
             XcursorImageDestroy(img);