Changeset 516 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2007 5:41:09 PM (18 years ago)

Author:

vboxsync

Message:

perform guest resize operations only once when the mouse button was released

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)

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

@@ -722 +722 @@
     bool fWin32UI = false;
 #endif
-    bool fShowSDLConfig = false;
-    uint32_t fixedWidth = ~(uint32_t)0;
-    uint32_t fixedHeight = ~(uint32_t)0;
-    uint32_t fixedBPP = ~(uint32_t)0;
+    bool fShowSDLConfig    = false;
+    uint32_t fixedWidth    = ~(uint32_t)0;
+    uint32_t fixedHeight   = ~(uint32_t)0;
+    uint32_t fixedBPP      = ~(uint32_t)0;
+    uint32_t uResizeWidth  = ~(uint32_t)0;
+    uint32_t uResizeHeight = ~(uint32_t)0;
 
     /* The damned GOTOs forces this to be up here - totally out of place. */
@@ -2242 +2244 @@
             case SDL_ACTIVEEVENT:
             {
+                /**
+                 * @todo This is a workaround for synchronization problems between EMT and the
+                 *       SDL main thread. It can happen that the SDL thread already starts a
+                 *       new resize operation while the EMT is still busy with the old one
+                 *       leading to a deadlock. Therefore we call SetVideoModeHint only once
+                 *       when the mouse button was released.
+                 */
+                if (uResizeWidth != ~(uint32_t)0)
+                {
+                    /* communicate the resize event to the guest */
+                    gDisplay->SetVideoModeHint(uResizeWidth, uResizeHeight, 0);
+                    uResizeWidth = ~(uint32_t)0;
+                }
+
                 /*
                  * There is a strange behaviour in SDL when running without a window
@@ -2266 +2282 @@
                 {
 #ifdef VBOX_SECURELABEL
-                    /* communicate the resize event to the guest */
-                    gDisplay->SetVideoModeHint(event.resize.w, RT_MAX(0, event.resize.h - SECURE_LABEL_HEIGHT), 0);
+                    uResizeWidth  = event.resize.w;
+                    uResizeHeight = RT_MAX(0, event.resize.h - SECURE_LABEL_HEIGHT);
 #else
-                    /* communicate the resize event to the guest */
-                    gDisplay->SetVideoModeHint(event.resize.w, event.resize.h, 0);
+                    uResizeHeight = event.resize.h;
 #endif
                 }