Changeset 5329 in vbox for trunk/src

Timestamp:

Oct 16, 2007 2:16:43 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed: Don't call QWidgtet::update() from a non-GUI thread on non-DOS platforms since it seems that this method isn't thread safe on X11 in addition to Mac. Also fixed display output inrmode image| on a scrolled virtual display in a smaller comsole window on those platforms.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• VBoxFrameBuffer.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -1051 +1051 @@
             }
 
-#ifdef Q_WS_MAC /* see VBoxQImageFrameBuffer::NotifyUpdate. */
+#if !defined (Q_WS_WIN) && !defined (Q_WS_PM)
+            /* see VBox[QImage|SDL]FrameBuffer::NotifyUpdate(). */
             case VBoxDefs::RepaintEventType:
             {
                 VBoxRepaintEvent *re = (VBoxRepaintEvent *) e;
-                viewport()->repaint (re->x(), re->y(), re->width(), re->height(), false);
+                viewport()->repaint (re->x() - contentsX(),
+                                     re->y() - contentsY(),
+                                     re->width(), re->height(), false);
                 /*cconsole.GetDisplay().UpdateCompleted(); - the event was acked already */
                 return true;
             }
-#endif /* Q_WS_MAC */
+#endif
 
             case VBoxDefs::SetRegionEventType:

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp

@@ -301 +301 @@
                                                   BOOL *aFinished)
 {
-#ifdef Q_WS_MAC
-    /* we're not on the GUI thread and update() isn't thread safe on Qt 3.3.x
-       on the Mac (4.2.x is), so post the event instead.  */
+#if !defined (Q_WS_WIN) && !defined (Q_WS_PM)
+    /* we're not on the GUI thread and update() isn't thread safe in Qt 3.3.x
+       on the Mac (4.2.x is), on Linux (didn't check Qt 4.x there) and
+       probably on other non-DOS platforms, so post the event instead. */
     QApplication::postEvent (mView,
                              new VBoxRepaintEvent (aX, aY, aW, aH));
-
-#else /* !Q_WS_MAC */
+#else
     /* we're not on the GUI thread, so update() instead of repaint()! */
     mView->viewport()->update (aX - mView->contentsX(),
                                aY - mView->contentsY(),
                                aW, aH);
-#endif /* !Q_WS_MAC */
+#endif
     /* the update has been finished, return TRUE */
     *aFinished = TRUE;
@@ -481 +481 @@
                                                BOOL *aFinished)
 {
+#if !defined (Q_WS_WIN) && !defined (Q_WS_PM)
+    /* we're not on the GUI thread and update() isn't thread safe in Qt 3.3.x
+       on the Mac (4.2.x is), on Linux (didn't check Qt 4.x there) and
+       probably on other non-DOS platforms, so post the event instead. */
+    QApplication::postEvent (mView,
+                             new VBoxRepaintEvent (aX, aY, aW, aH));
+#else
     /* we're not on the GUI thread, so update() instead of repaint()! */
     mView->viewport()->update (aX - mView->contentsX(),
                                aY - mView->contentsY(),
                                aW, aH);
+#endif
     /* the update has been finished, return TRUE */
     *aFinished = TRUE;