Changeset 4637 in vbox

Timestamp:

Sep 9, 2007 8:42:06 AM (17 years ago)

Author:

vboxsync

Message:

most RT_OS_LINUX -> VBOXSDL_WITH_X11. On e OS/2 workaround.

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (7 diffs)
• Makefile.kmk (modified) (1 diff)
• VBoxSDL.cpp (modified) (17 diffs)
• VBoxSDL.h (modified) (1 diff)

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

@@ -128 +128 @@
     }
 #endif
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     /* On some X servers the mouse is stuck inside the bottom right corner.
      * See http://wiki.clug.org.za/wiki/QEMU_mouse_not_working */
@@ -140 +140 @@
     }
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     /* NOTE: we still want Ctrl-C to work, so we undo the SDL redirections */
     signal(SIGINT, SIG_DFL);
@@ -398 +398 @@
              x, y, w, h));
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     /*
      * SDL does not allow us to make this call from any other thread than
@@ -412 +412 @@
     event.user.data2 = (void*)(w << 16 | h);
     PushNotifyUpdateEvent(&event);
-#else /* !RT_OS_LINUX */
+#else /* !VBOXSDL_WITH_X11 */
     update(x, y, w, h, true /* fGuestRelative */);
-#endif /* !RT_OS_LINUX */
+#endif /* !VBOXSDL_WITH_X11 */
 
     /*
@@ -712 +712 @@
      */
     int sdlFlags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
+#ifndef RT_OS_OS2 /* doesn't seem to work for some reason... */
     if (mfResizable)
         sdlFlags |= SDL_RESIZABLE;
+#endif
     if (mfFullscreen)
         sdlFlags |= SDL_FULLSCREEN;
@@ -832 +834 @@
 void VBoxSDLFB::update(int x, int y, int w, int h, bool fGuestRelative)
 {
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     AssertMsg(mSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
 #endif
@@ -1031 +1033 @@
 void VBoxSDLFB::paintSecureLabel(int x, int y, int w, int h, bool fForce)
 {
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     AssertMsg(mSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
 #endif

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

@@ -44 +44 @@
  VBoxSDL_DEFS     += VBOX_VRDP
 endif
-VBoxSDL_DEFS.linux = _GNU_SOURCE
+VBoxSDL_DEFS.freebsd = VBOXSDL_WITH_X11
+VBoxSDL_DEFS.linux = _GNU_SOURCE VBOXSDL_WITH_X11
+VBoxSDL_DEFS.solaris = VBOXSDL_WITH_X11
 ifdef VBOX_OPENGL
  #VBoxSDL_DEFS.linux += VBOX_OPENGL

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

@@ -30 +30 @@
 using namespace com;
 
-#if defined (RT_OS_LINUX)
+#if defined (VBOXSDL_WITH_X11)
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>      /* for XC_left_ptr */
@@ -181 +181 @@
 static VBoxSDLFB  *gpFrameBuffer = NULL;
 static SDL_Cursor *gpDefaultCursor = NULL;
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
 static Cursor      gpDefaultOrigX11Cursor;
 #endif
@@ -189 +189 @@
 static SDL_TimerID gSdlResizeTimer = NULL;
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
 static SDL_SysWMinfo gSdlInfo;
 #endif
@@ -569 +569 @@
         if (SDL_GetWMInfo(&info))
         {
-#if defined (RT_OS_LINUX)
+#if defined (VBOXSDL_WITH_X11)
             *winId = (ULONG64) info.info.x11.wmwindow;
 #elif defined (RT_OS_WIN)
@@ -688 +688 @@
 }
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
 /**
  * Custom signal handler. Currently it is only used to release modifier
@@ -705 +705 @@
     }
 }
-#endif /* RT_OS_LINUX */
+#endif /* VBOXSDL_WITH_X11 */
 
 /** entry point */
@@ -720 +720 @@
     }
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     /*
      * Lock keys on SDL behave different from normal keys: A KeyPress event is generated
@@ -1822 +1822 @@
     gpDefaultCursor = SDL_GetCursor();
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     /* Get Window Manager info. We only need the X11 display. */
     SDL_VERSION(&gSdlInfo.version);
@@ -1836 +1836 @@
     *(Cursor*)gpDefaultCursor->wm_cursor = XCreateFontCursor(gSdlInfo.info.x11.display, XC_left_ptr);
     SDL_SetCursor(gpDefaultCursor);
-#endif /* RT_OS_LINUX */
+#endif /* VBOXSDL_WITH_X11 */
 
     /* create a fake empty cursor */
@@ -1849 +1849 @@
      * Register our user signal handler.
      */
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     struct sigaction sa;
     sa.sa_sigaction = signal_handler;
@@ -1855 +1855 @@
     sa.sa_flags = SA_RESTART | SA_SIGINFO;
     sigaction (SIGUSR1, &sa, NULL);
-#endif /* RT_OS_LINUX */
+#endif /* VBOXSDL_WITH_X11 */
 
     /*
@@ -2495 +2495 @@
     if (gpDefaultCursor)
     {
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
         Cursor pDefaultTempX11Cursor = *(Cursor*)gpDefaultCursor->wm_cursor;
         *(Cursor*)gpDefaultCursor->wm_cursor = gpDefaultOrigX11Cursor;
-#endif /* RT_OS_LINUX */
+#endif /* VBOXSDL_WITH_X11 */
         SDL_SetCursor(gpDefaultCursor);
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
         XFreeCursor(gSdlInfo.info.x11.display, pDefaultTempX11Cursor);
-#endif /* RT_OS_LINUX */
+#endif /* VBOXSDL_WITH_X11 */
     }
 
@@ -2514 +2514 @@
 #if defined (RT_OS_WINDOWS)
             ::DestroyCursor(*(HCURSOR *) pCustomTempWMCursor);
-#elif defined (RT_OS_LINUX)
+#elif defined (VBOXSDL_WITH_X11)
             XFreeCursor(gSdlInfo.info.x11.display, *(Cursor *) pCustomTempWMCursor);
 #endif
@@ -2752 +2752 @@
     int keycode = ev->keysym.scancode;
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
     // workaround for SDL keyboard translation issues on Linux
     // keycodes > 0x100 are sent as 0xe0 keycode
@@ -4003 +4003 @@
             ::DeleteObject (hBitmap);
 
-#elif defined (RT_OS_LINUX)
+#elif defined (VBOXSDL_WITH_X11)
 
         XcursorImage *img = XcursorImageCreate (data->width, data->height);
@@ -4381 +4381 @@
 }
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
 /**
  * Special SDL_PushEvent function for NotifyUpdate events. These events may occur in bursts
@@ -4406 +4406 @@
         RTThreadYield();
 }
-#endif /* RT_OS_LINUX */
+#endif /* VBOXSDL_WITH_X11 */

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

@@ -68 +68 @@
 #endif /* VBOX_WIN32_UI */
 
-#ifdef RT_OS_LINUX
+#ifdef VBOXSDL_WITH_X11
 void PushNotifyUpdateEvent(SDL_Event *event);
 #endif