Changeset 3483 in vbox

Timestamp:

Jul 5, 2007 3:54:09 PM (18 years ago)

Author:

vboxsync

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

22695

Message:

FE/Qt: Enabled QIMAGE and SDL remdering modes on OS/2.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)

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

@@ -51 +51 @@
 VirtualBox_SDKS.win = WINPSDK DXSDK
 VirtualBox_SDKS.linux = LIBSDL
+VirtualBox_SDKS.os2 = LIBSDL
 
 ifeq ($(BUILD_TARGET),darwin)
@@ -168 +169 @@
 VirtualBox_DEFS.linux     = VBOX_GUI_USE_SDL
 VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
+VirtualBox_DEFS.os2       = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL QT_DLL
 #ifndef VBOX_OSE
  VirtualBox_DEFS.darwin  += VBOX_WITH_HACKED_QT

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -118 +118 @@
     /** VM display rendering mode. */
     enum RenderMode {
-        TimerMode, QImageMode, SDLMode, DDRAWMode
+        InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode
     };
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -606 +606 @@
         default:
             AssertReleaseMsgFailed (("Render mode must be valid: %d\n", mode));
+            LogRel (("Invalid render mode: %d\n", mode));
             qApp->exit (1);
             break;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -516 +516 @@
  *  default rendering mode if the argumen is NULL.
  */
-static VBoxDefs::RenderMode vboxGetRenderMode( const char *display )
-{
-    VBoxDefs::RenderMode mode;
-#if   defined (Q_WS_WIN32)
+static VBoxDefs::RenderMode vboxGetRenderMode (const char *aModeStr)
+{
+    VBoxDefs::RenderMode mode = VBoxDefs::InvalidRenderMode;
+
+#if (defined (Q_WS_WIN32) || defined (Q_WS_PM)) && defined (VBOX_GUI_USE_QIMAGE)
     mode = VBoxDefs::QImageMode;
-#elif defined (Q_WS_X11)
+#elif defined (Q_WS_X11) && defined (VBOX_GUI_USE_SDL)
     mode = VBoxDefs::SDLMode;
+#elif defined (VBOX_GUI_USE_QIMAGE)
+    mode = VBoxDefs::QImageMode;
 #else
-    mode = VBoxDefs::QImageMode;
+# error "Cannot determine the default render mode!"
 #endif
 
-    if ( display ) {
-        if (        !::strcmp( display, "timer" ) ){
+    if (aModeStr)
+    {
+        if (0) ;
+#if defined (VBOX_GUI_USE_REFRESH_TIMER)
+        else if (::strcmp (aModeStr, "timer") == 0)
             mode = VBoxDefs::TimerMode;
-        } else if ( !::strcmp( display, "image" ) ) {
+#endif
+#if defined (VBOX_GUI_USE_QIMAGE)
+        else if (::strcmp (aModeStr, "image") == 0)
             mode = VBoxDefs::QImageMode;
-        } else if ( !::strcmp( display, "sdl" ) ) {
+#endif
+#if defined (VBOX_GUI_USE_SDL)
+        else if (::strcmp (aModeStr, "sdl") == 0)
             mode = VBoxDefs::SDLMode;
-        } else if ( !::strcmp( display, "ddraw" ) ) {
+#endif
+#if defined (VBOX_GUI_USE_DDRAW)
+        else if (::strcmp (aModeStr, "ddraw") == 0)
             mode = VBoxDefs::DDRAWMode;
-        }
+#endif
     }