Changeset 522 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2007 9:30:27 PM (18 years ago)

Author:

vboxsync

Message:

timer-based SDL window resize like FE/Qt (more reliable, also works when window is maximized)

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• VBoxSDL.cpp (modified) (6 diffs)
• VBoxSDL.h (modified) (1 diff)

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

@@ -140 +140 @@
 static int     HandleHostKey(const SDL_KeyboardEvent *pEv);
 static Uint32  StartupTimer(Uint32 interval, void *param);
+static Uint32  ResizeTimer(Uint32 interval, void *param);
 
 
@@ -188 +189 @@
 static WMcursor   *gpCustomOrigWMcursor = NULL;
 static SDL_Cursor *gpOffCursor = NULL;
+static SDL_TimerID gSdlResizeTimer = NULL;
 
 #ifdef __LINUX__
@@ -2244 +2246 @@
             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
@@ -2287 +2275 @@
                     uResizeHeight = event.resize.h;
 #endif
+                    if (gSdlResizeTimer)
+                        SDL_RemoveTimer(gSdlResizeTimer);
+                    gSdlResizeTimer = SDL_AddTimer(300, ResizeTimer, NULL);
                 }
                 break;
@@ -2321 +2312 @@
                 #undef DECODEH
                 break;
+            }
+
+            /*
+             * User event: Window resize done
+             */
+            case SDL_USER_EVENT_WINDOW_RESIZE_DONE:
+            {
+                /**
+                 * @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.
+                 */
+                /* communicate the resize event to the guest */
+                gDisplay->SetVideoModeHint(uResizeWidth, uResizeHeight, 0);
+                break;
+
             }
 
@@ -3817 +3826 @@
     return interval;
 }
+
+/**
+ * Timer callback function to check if resizing is finished
+ */
+static Uint32 ResizeTimer(Uint32 interval, void *param)
+{
+    /* post message so the window is actually resized */
+    SDL_Event event = {0};
+    event.type      = SDL_USEREVENT;
+    event.user.type = SDL_USER_EVENT_WINDOW_RESIZE_DONE;
+    SDL_PushEvent(&event);
+    /* one-shot */
+    return 0;
+}

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

@@ -47 +47 @@
 /** custom SDL user event for resetting mouse cursor */
 #define SDL_USER_EVENT_GUEST_CAP_CHANGED  (SDL_USEREVENT + 12)
+/** custom SDL user event for window resize down */
+#define SDL_USER_EVENT_WINDOW_RESIZE_DONE (SDL_USEREVENT + 13)