Changeset 35750 in vbox for trunk

Timestamp:

Jan 28, 2011 10:14:33 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: cleanup of r69690

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (3 diffs)
• platform/darwin/VBoxUtils-darwin.cpp (modified) (2 diffs)
• platform/darwin/VBoxUtils-darwin.h (modified) (2 diffs)
• runtime/UIMouseHandler.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -334 +334 @@
 }
 
-bool darwinMouseMoveEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser)
+bool darwinMouseGrabEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser)
 {
     NSEvent *pEvent = (NSEvent*)pvCocoaEvent;
@@ -352 +352 @@
             || EvtType == NSScrollWheel))
     {
+        /* When the mouse position is not associated to the mouse cursor, the x
+           and y values are reported as delta values. */
         float x = [pEvent deltaX];
         float y = [pEvent deltaY];
-        /* Get the buttons which where pressed when this event occurs. We have
-           to use Carbon here, cause the Cocoa method [NSEvent pressedMouseButtons]
-           is >= 10.6. */
         if (EvtType == NSScrollWheel)
         {
@@ -372 +371 @@
                 y = qBound(-120, (int)(y * 10000), 120);
         }
+        /* Get the buttons which where pressed when this event occurs. We have
+           to use Carbon here, cause the Cocoa method [NSEvent pressedMouseButtons]
+           is >= 10.6. */
         uint32 buttonMask = 0;
         GetEventParameter((EventRef)pvCarbonEvent, kEventParamMouseChord, typeUInt32, 0,
                           sizeof(buttonMask), 0, &buttonMask);
         /* Produce a Qt event out of our info. */
-        ::darwinSendDeltaEvents((QWidget*)pvUser, EvtType, [pEvent buttonNumber], buttonMask, x, y);
+        ::darwinSendMouseGrabEvents((QWidget*)pvUser, EvtType, [pEvent buttonNumber], buttonMask, x, y);
         return true;
     }

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -356 +356 @@
                                                             RT_BIT_32(27) | /* NSOtherMouseDragged */
                                                             RT_BIT_32(22),  /* NSScrollWheel */
-                                                            ::darwinMouseMoveEvents, pWidget);
+                                                            ::darwinMouseGrabEvents, pWidget);
 }
 
@@ -372 +372 @@
                                                               RT_BIT_32(27) | /* NSOtherMouseDragged */
                                                               RT_BIT_32(22),  /* NSScrollWheel */
-                                                              ::darwinMouseMoveEvents, pWidget);
+                                                              ::darwinMouseGrabEvents, pWidget);
     CGAssociateMouseAndMouseCursorPosition(true);
 }
 
-void darwinSendDeltaEvents(QWidget *pWidget, int type, int button, int buttons, int x, int y)
+void darwinSendMouseGrabEvents(QWidget *pWidget, int type, int button, int buttons, int x, int y)
 {
     QEvent::Type qtType = QEvent::None;

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h

@@ -86 +86 @@
 
 bool darwinUnifiedToolbarEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
-bool darwinMouseMoveEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
+bool darwinMouseGrabEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
 void darwinCreateContextMenuEvent(void *pvWin, int x, int y);
 
@@ -93 +93 @@
 void darwinRetranslateAppMenu();
 
-void darwinSendDeltaEvents(QWidget *pWidget, int type, int button, int buttons, int x, int y);
+void darwinSendMouseGrabEvents(QWidget *pWidget, int type, int button, int buttons, int x, int y);
 
 QString darwinResolveAlias(const QString &strFile);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -506 +506 @@
                 {
                     UIGrabMouseEvent *pDeltaEvent = static_cast<UIGrabMouseEvent*>(pEvent);
-                    QPoint gl = m_lastMousePos;
-                    QPoint p = QPoint(pDeltaEvent->xDelta() + gl.x(),
-                                      pDeltaEvent->yDelta() + gl.y());
+                    QPoint p = QPoint(pDeltaEvent->xDelta() + m_lastMousePos.x(),
+                                      pDeltaEvent->yDelta() + m_lastMousePos.y());
                     if (mouseEvent(pDeltaEvent->mouseEventType(), uScreenId,
                                    m_viewports[uScreenId]->mapFromGlobal(p), p,
@@ -514 +513 @@
                                    pDeltaEvent->wheelDelta(), pDeltaEvent->orientation()))
                         return true;
-//
-//                    QMouseEvent *pNewMouseEvent = new QMouseEvent(QEvent::MouseMove,
-//                                                                  m_viewports[uScreenId]->mapFromGlobal(p), p,
-//                                                                  Qt::NoButton,
-//                                                                  Qt::NoButton,
-//                                                                  Qt::NoModifier);
-//
-//
-//                    /* Send that event to real destination: */
-//                    QApplication::postEvent(m_viewports[uScreenId], pNewMouseEvent);
-                    return false;
                     break;
                 }