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

Timestamp:

Apr 20, 2023 7:52:23 PM (22 months ago)

Author:

vboxsync

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

156989

Message:

FE/VBoxSDL: Make it work with macOS, bugref:9449

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer-darwin.m (deleted)
• Framebuffer.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (3 diffs)
• VBoxSDL.cpp (modified) (1 diff)
• VBoxSDL.h (modified) (1 diff)
• VBoxSDLMain-darwin.h (deleted)
• VBoxSDLMain-darwin.m (deleted)

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

@@ -335 +335 @@
     if (!winId)
         return E_POINTER;
-#ifdef RT_OS_DARWIN
-    if (mWinId == 0) /* (In case it failed the first time.) */
-        mWinId = (intptr_t)VBoxSDLGetDarwinWindowId();
-#endif
+
     *winId = mWinId;
     return S_OK;
@@ -389 +386 @@
              x, y, w, h));
 
-#ifdef VBOXSDL_WITH_X11
+#if defined(VBOXSDL_WITH_X11) || defined(RT_OS_DARWIN)
     /*
      * SDL does not allow us to make this call from any other thread than
@@ -846 +843 @@
 void VBoxSDLFB::update(int x, int y, int w, int h, bool fGuestRelative)
 {
-#ifdef VBOXSDL_WITH_X11
+#if defined(VBOXSDL_WITH_X11) || defined(RT_OS_DARWIN)
     AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
 #endif

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

@@ -58 +58 @@
         Helper.cpp \
         ../Common/PasswordInput.cpp
- VBoxSDL_SOURCES.darwin = \
-        VBoxSDLMain-darwin.m \
-        Framebuffer-darwin.m
 
  VBoxSDL_DEFS      =
@@ -96 +93 @@
  endif
 
- VBoxSDL_LDFLAGS.darwin = \
-        -framework Foundation -framework AppKit
  VBoxSDL_LDFLAGS.win = -SubSystem:Windows
 
@@ -126 +121 @@
   tstSDL_SOURCES = \
         VBoxSDLTest.cpp
-  tstSDL_SOURCES.darwin = \
-        VBoxSDLMain-darwin.m
   tstSDL_DEFS = IN_RING3 IN_RT_R3 _GNU_SOURCE
   tstSDL_DEFS.win.x86 = _WIN32_WINNT=0x0500

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

@@ -4090 +4090 @@
 }
 
-#ifdef VBOXSDL_WITH_X11
+#if defined(VBOXSDL_WITH_X11) || defined(RT_OS_DARWIN)
 /**
  * Special SDL_PushEvent function for NotifyUpdate events. These events may occur in bursts

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

@@ -90 +90 @@
 #endif /* VBOX_WIN32_UI */
 
-#ifdef VBOXSDL_WITH_X11
+#if defined(VBOXSDL_WITH_X11) || defined(RT_OS_DARWIN)
 void PushNotifyUpdateEvent(SDL_Event *event);
 #endif