Changeset 3300 in vbox for trunk

Timestamp:

Jun 26, 2007 3:30:12 PM (18 years ago)

Author:

vboxsync

Message:

FE/SDL: fixed dropping of XPCOM events; make ShowConsoleWindow work

File:

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

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

@@ -513 +513 @@
         if (!canShow)
             return E_POINTER;
-#if defined (__LINUX__)
-        /// @todo see the big comment in Frontends/VirtualBox/src/VBoxVMListBoxItem::switchTo()
-        *canShow = FALSE;
-#else
         SDL_SysWMinfo info;
         SDL_VERSION(&info.version);
         *canShow = !!SDL_GetWMInfo(&info);
-#endif
         return S_OK;
     }
@@ -531 +526 @@
         {
 #if defined (__LINUX__)
-            *winId = (ULONG64) info.info.x11.window;
+            *winId = (ULONG64) info.info.x11.wmwindow;
 #elif defined (__WIN__)
             *winId = (ULONG64) info.window;
@@ -1916 +1911 @@
                     {
                         LogFlow(("SDL_USER_EVENT_XPCOM_EVENTQUEUE: processing XPCOM event queue...\n"));
-                        consumedXPCOMUserEvent();
                         eventQ->ProcessPendingEvents();
                         signalXPCOMEventQueueThread();
@@ -4303 +4297 @@
         int rc = SDL_PollEvent (event);
         if (rc == 1)
+        {
+#ifdef USE_XPCOM_QUEUE_THREAD
+            if (event->type == SDL_USER_EVENT_XPCOM_EVENTQUEUE)
+                consumedXPCOMUserEvent();
+#endif
             return 1;
+        }
         /* Immediately wake up if new SDL events are available. This does not
          * work for internal SDL events. Don't wait more than 10ms. */