Changeset 11417 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Aug 14, 2008 9:51:45 AM (17 years ago)

Author:

vboxsync

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

34736

Message:

FE/Qt: don't disable the screen saver on X11 hosts (see #3085)

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBoxFrameBuffer.cpp (modified) (5 diffs)

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

@@ -579 +579 @@
  endif
  VirtualBox4_SOURCES += \
-        src/linux/XKeyboard-new.cpp
+        src/linux/XKeyboard-new.cpp \
+        src/VBoxX11Helper.cpp
 endif
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxFrameBuffer.cpp

@@ -459 +459 @@
 #if defined (VBOX_GUI_USE_SDL)
 
+#include "VBoxX11Helper.h"
+
 /** @class VBoxSDLFrameBuffer
  *
@@ -472 +474 @@
     mSurfVRAM = NULL;
 
+    X11ScreenSaverSettingsInit();
     resizeEvent (new VBoxResizeEvent (FramebufferPixelFormat_Opaque,
                                       NULL, 0, 0, 640, 480));
@@ -483 +486 @@
         mSurfVRAM = NULL;
     }
+    X11ScreenSaverSettingsSave();
     SDL_QuitSubSystem (SDL_INIT_VIDEO);
+    X11ScreenSaverSettingsRestore();
 }
 
@@ -549 +554 @@
     if (mScreen)
     {
+        X11ScreenSaverSettingsSave();
         SDL_QuitSubSystem (SDL_INIT_VIDEO);
+        X11ScreenSaverSettingsRestore();
         mScreen = NULL;
     }
@@ -563 +570 @@
     sprintf (sdlHack, "SDL_WINDOWID=%lu", mView->viewport()->winId());
     putenv (sdlHack);
+    X11ScreenSaverSettingsSave();
     int rc = SDL_InitSubSystem (SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
     AssertMsg (rc == 0, ("SDL initialization failed: %s\n", SDL_GetError()));
     NOREF(rc);
+    X11ScreenSaverSettingsRestore();
 
 #ifdef Q_WS_X11