Changeset 6970 in vbox

Timestamp:

Feb 15, 2008 1:04:24 PM (17 years ago)

Author:

vboxsync

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

28149

Message:

Additions/X11: first attempt at dynamic guest resizing

Location:

trunk/src/VBox/Additions/x11/xclient

Files:

• Makefile.kmk (modified) (2 diffs)
• displaychange-x11.cpp (added)
• displaychange.h (added)
• main.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -29 +29 @@
 VBoxClient_SOURCES = \
         main.cpp
-if1of ($(BUILD_TARGET),linux l4) ## @todo use clipboard-new.cpp everywhere.
- VBoxClient_SOURCES += \
-        clipboard.cpp
-else
- VBoxClient_SOURCES += \
+VBoxClient_SOURCES += \
         clipboard-new.cpp
-endif
 VBoxClient_LIBPATH = \
         $(VBOX_LIBPATH32_X11)
@@ -45 +40 @@
         Xt
 ifdef VBOX_X11_SEAMLESS_GUEST
- VBoxClient_DEFS += SEAMLESS_X11
+ VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
  VBoxClient_SOURCES += \
         seamless-host.cpp \
         seamless-x11.cpp \
-        thread.cpp
+        thread.cpp \
+        displaychange-x11.cpp
  VBoxClient_LIBS += \
         Xext

trunk/src/VBox/Additions/x11/xclient/main.cpp

@@ -36 +36 @@
 #include "clipboard.h"
 
-#ifdef SEAMLESS_X11
-# include "seamless.h"
+#ifdef DYNAMIC_RESIZE
+# include "displaychange.h"
+# ifdef SEAMLESS_GUEST
+#  include "seamless.h"
+# endif
 #endif
 
@@ -110 +113 @@
 {
     int rcClipboard, rc;
-#ifdef SEAMLESS_X11
-    /** Our instance of the seamless class. */
+#ifdef DYNAMIC_RESIZE
+    VBoxGuestDisplayChangeMonitor displayChange;
+# ifdef SEAMLESS_GUEST
+    /** Our instance of the seamless class.  This only makes sense if dynamic resizing
+        is enabled. */
     VBoxGuestSeamless seamless;
-#endif
+# endif /* SEAMLESS_GUEST defined */
+#endif /* DYNAMIC_RESIZE */
 
     /* Parse our option(s) */
@@ -184 +191 @@
     }
 #endif  /* VBOX_X11_CLIPBOARD defined */
-#ifdef SEAMLESS_X11
     try
     {
-        LogRel(("VBoxClient: starting seamless Guest Additions...\n"));
-        rc = seamless.init();
+#ifdef DYNAMIC_RESIZE
+        LogRel(("VBoxClient: starting dynamic guest resizing...\n"));
+        rc = displayChange.init();
         if (RT_FAILURE(rc))
         {
-            LogRel(("VBoxClient: failed to initialise seamless Additions, rc = %Rrc\n", rc));
-        }
+            LogRel(("VBoxClient: failed to start dynamic guest resizing, rc = %Rrc\n", rc));
+        }
+# ifdef SEAMLESS_GUEST
+        if (RT_SUCCESS(rc))
+        {
+            LogRel(("VBoxClient: starting seamless Guest Additions...\n"));
+            rc = seamless.init();
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("VBoxClient: failed to start seamless Additions, rc = %Rrc\n", rc));
+            }
+        }
+# endif /* SEAMLESS_GUEST defined */
+#endif /* DYNAMIC_RESIZE defined */
     }
     catch (std::exception e)
@@ -204 +223 @@
         rc = VERR_UNRESOLVED_ERROR;
     }
-#endif /* SEAMLESS_X11 defined */
 #ifdef VBOX_X11_CLIPBOARD
     if (RT_SUCCESS(rcClipboard))
@@ -217 +235 @@
     LogRel(("VBoxClient: exiting...\n"));
 #endif  /* VBOX_X11_CLIPBOARD not defined */
-#ifdef SEAMLESS_X11
     try
     {
+#ifdef DYNAMIC_RESIZE
+        displayChange.uninit();
+# ifdef SEAMLESS_GUEST
         seamless.uninit();
+# endif /* SEAMLESS_GUEST defined */
+#endif /* DYNAMIC_RESIZE defined */
     }
     catch (std::exception e)
@@ -232 +254 @@
         rc = VERR_UNRESOLVED_ERROR;
     }
-#endif /* SEAMLESS_X11 defined */
     VbglR3Term();
     return RT_SUCCESS(rc) ? 0 : 1;