Changeset 97867 in vbox for trunk

Timestamp:

Dec 26, 2022 12:49:40 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: X11: A bit of cleanup for bugref:3355 defect.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11

Files:

• VBoxUtils-x11.cpp (modified) (2 diffs)
• VBoxUtils-x11.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp

@@ -51 +51 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/dpms.h>
-
-/// @todo is it required still?
-// WORKAROUND:
-// rhel3 build hack
-//RT_C_DECLS_BEGIN
-//#include <X11/Xlib.h>
-//#undef BOOL /* VBox/com/defs.h conflict */
-//RT_C_DECLS_END
 
 
@@ -126 +118 @@
 }
 
-#if 0 // unused for now?
-static int  gX11ScreenSaverTimeout;
-static BOOL gX11ScreenSaverDpmsAvailable;
-static BOOL gX11DpmsState;
-
-void NativeWindowSubsystem::X11ScreenSaverSettingsInit()
-{
-    /* Init screen-save availability: */
-    Display *pDisplay = NativeWindowSubsystem::X11GetDisplay();
-    int dummy;
-    gX11ScreenSaverDpmsAvailable = DPMSQueryExtension(pDisplay, &dummy, &dummy);
-}
-
-void NativeWindowSubsystem::X11ScreenSaverSettingsSave()
-{
-    /* Actually this is a big mess. By default the libSDL disables the screen saver
-     * during the SDL_InitSubSystem() call and restores the saved settings during
-     * the SDL_QuitSubSystem() call. This mechanism can be disabled by setting the
-     * environment variable SDL_VIDEO_ALLOW_SCREENSAVER to 1. However, there is a
-     * known bug in the Debian libSDL: If this environment variable is set, the
-     * screen saver is still disabled but the old state is not restored during
-     * SDL_QuitSubSystem()! So the only solution to overcome this problem is to
-     * save and restore the state prior and after each of these function calls. */
-
-    Display *pDisplay = NativeWindowSubsystem::X11GetDisplay();
-    int dummy;
-    CARD16 dummy2;
-    XGetScreenSaver(pDisplay, &gX11ScreenSaverTimeout, &dummy, &dummy, &dummy);
-    if (gX11ScreenSaverDpmsAvailable)
-        DPMSInfo(pDisplay, &dummy2, &gX11DpmsState);
-}
-
-void NativeWindowSubsystem::X11ScreenSaverSettingsRestore()
-{
-    /* Restore screen-saver settings: */
-    Display *pDisplay = NativeWindowSubsystem::X11GetDisplay();
-    int iTimeout, iInterval, iPreferBlank, iAllowExp;
-    XGetScreenSaver(pDisplay, &iTimeout, &iInterval, &iPreferBlank, &iAllowExp);
-    iTimeout = gX11ScreenSaverTimeout;
-    XSetScreenSaver(pDisplay, iTimeout, iInterval, iPreferBlank, iAllowExp);
-    if (gX11DpmsState && gX11ScreenSaverDpmsAvailable)
-        DPMSEnable(pDisplay);
-}
-#endif // unused for now?
-
 bool NativeWindowSubsystem::X11CheckExtension(const char *pExtensionName)
 {

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h

@@ -98 +98 @@
     X11WMType X11WindowManagerType();
 
-#if 0 // unused for now?
-    /** X11: Inits the screen saver save/restore mechanism. */
-    SHARED_LIBRARY_STUFF void X11ScreenSaverSettingsInit();
-    /** X11: Saves screen saver settings. */
-    SHARED_LIBRARY_STUFF void X11ScreenSaverSettingsSave();
-    /** X11: Restores previously saved screen saver settings. */
-    SHARED_LIBRARY_STUFF void X11ScreenSaverSettingsRestore();
-#endif // unused for now?
-
     /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
     bool X11CheckExtension(const char *extensionName);