Changeset 55810 in vbox

Timestamp:

May 11, 2015 8:27:08 PM (9 years ago)

Author:

vboxsync

Message:

VBoxSDL: Made it build again on darwin, added hack for playing with OpenGL.

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer-darwin.m (added)
• Framebuffer.cpp (modified) (2 diffs)
• Framebuffer.h (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• VBoxSDL.h (modified) (2 diffs)

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

@@ -387 +387 @@
  * @param   winId Handle of associated window.
  */
-STDMETHODIMP VBoxSDLFB::COMGETTER(WinId)(int64_t *winId)
+STDMETHODIMP VBoxSDLFB::COMGETTER(WinId)(LONG64 *winId)
 {
     if (!winId)
         return E_POINTER;
+#ifdef RT_OS_DARWIN
+    if (mWinId == NULL) /* (In case it failed the first time.) */
+        mWinId = (intptr_t)VBoxSDLGetDarwinWindowId();
+#endif
     *winId = mWinId;
     return S_OK;
@@ -920 +924 @@
     if (SDL_GetWMInfo(&info))
         mWinId = (LONG64) info.info.x11.wmwindow;
+# elif defined(RT_OS_DARWIN)
+    mWinId = (intptr_t)VBoxSDLGetDarwinWindowId();
 # else
     /* XXX ignore this for other architectures */

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

@@ -80 +80 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
-    STDMETHOD(COMGETTER(WinId)) (int64_t *winId);
+    STDMETHOD(COMGETTER(WinId)) (LONG64 *winId);
     STDMETHOD(COMGETTER(Capabilities))(ComSafeArrayOut(FramebufferCapabilities_T, aCapabilities));
 

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

@@ -48 +48 @@
         Helper.cpp
 VBoxSDL_SOURCES.darwin = \
-        VBoxSDLMain-darwin.m
+        VBoxSDLMain-darwin.m \
+       Framebuffer-darwin.m
 
 VBoxSDL_DEFS       =

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

@@ -21 +21 @@
 #define __H_VBOXSDL
 
+#include <iprt/cdefs.h>
 #ifdef RT_OS_WINDOWS /** @todo check why we need to do this on windows. */
 /* convince SDL to not overload main() */
@@ -74 +75 @@
 int  PushSDLEventForSure(SDL_Event *event);
 
-#endif // __H_VBOXSDL
+#ifdef RT_OS_DARWIN
+RT_C_DECLS_BEGIN
+void *VBoxSDLGetDarwinWindowId(void);
+RT_C_DECLS_END
+#endif
+
+#endif