Changeset 70075 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2017 9:54:21 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119623

Message:

Devices/Graphics, Main, FE/Qt: add plumbing for sending cursor position events.
bugref:9038: FE/Qt: better handle mouse cursor when toggling integration
The Linux and X11 graphics driver sends notification when the guest cursor
position changes. This could be used by the front-end to switch back to
pointer capturing without requiring that the guest draw the cursor, which
often results in artifacts. This change adds the necessary plumbing between
the graphics device and the user interface.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/globals/UIMainEventListener.h (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/DisplayImpl.h (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (2 diffs)
• Runtime/VBox/log-vbox.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2737 +2737 @@
                             RT_BOOL(pReport->fReportPosition), pReport->x, pReport->y));
 
+            pVGAState->pDrv->pfnVBVAReportCursorPosition(pVGAState->pDrv, pReport->fReportPosition,
+                                                         pReport->x, pReport->y);
             pReport->x = pCtx->xCursor;
             pReport->y = pCtx->yCursor;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

@@ -60 +60 @@
 # include "CProgressPercentageChangedEvent.h"
 # include "CProgressTaskCompletedEvent.h"
+# include "CCursorPositionChangedEvent.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -418 +419 @@
             break;
         }
+        case KVBoxEventType_OnCursorPositionChanged:
+        {
+            CCursorPositionChangedEvent es(pEvent);
+            emit sigCursorPositionChange(es.GetHasData(), (unsigned long)es.GetX(), (unsigned long)es.GetY());
+            break;
+        }
 
         default: break;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

@@ -127 +127 @@
     void sigProgressTaskComplete(QString strProgressId);
 
+    /** Notifies about guest requests to change the cursor position. If @a fData is not set this merely notifies that the guest supports this.  This notification must be sent after every screen configuration change. */
+    void sigCursorPositionChange(bool fData, unsigned long X, unsigned long Y);
+
 public:
 

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

@@ -197 +197 @@
         << KVBoxEventType_OnCanShowWindow
         << KVBoxEventType_OnShowWindow
-        << KVBoxEventType_OnAudioAdapterChanged;
+        << KVBoxEventType_OnAudioAdapterChanged
+        << KVBoxEventType_OnCursorPositionChanged;
 
     /* Register event listener for console event source: */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -22268 +22268 @@
       </desc>
     </const>
+    <const name="OnCursorPositionChanged" value="100">
+      <desc>
+        See <link to="ICursorPositionChangedEvent">ICursorPositionChangedEvent</link>.
+      </desc>
+    </const>
     <!-- Last event marker -->
-    <const name="Last" value="100">
+    <const name="Last" value="101">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -24342 +24347 @@
   </interface>
 
+  <interface
+    name="ICursorPositionChangedEvent" extends="IEvent"
+    uuid="6f302674-c927-11e7-b788-33c248e71fc7"
+    wsmap="managed" autogen="VBoxEvent" id="OnCursorPositionChanged">
+    <desc>The guest reports cursor position data.</desc>
+
+    <attribute name="hasData" readonly="yes" type="boolean">
+      <desc>Event contains valid data (alternative: notification of support)</desc>
+    </attribute>
+    <attribute name="x" readonly="yes" type="unsigned long">
+      <desc>Reported X position</desc>
+    </attribute>
+    <attribute name="y" readonly="yes" type="unsigned long">
+      <desc>Reported Y position</desc>
+    </attribute>
+  </interface>
+
   <module name="VBoxSVC" context="LocalServer">
     <class name="VirtualBox" uuid="B1A7A4F2-47B9-4A1E-82B2-07CCD5323C3F"

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -383 +383 @@
     static DECLCALLBACK(void)  i_displayVBVAInputMappingUpdate(PPDMIDISPLAYCONNECTOR pInterface, int32_t xOrigin, int32_t yOrigin,
                                                                uint32_t cx, uint32_t cy);
+    static DECLCALLBACK(void)  i_displayVBVAReportCursorPosition(PPDMIDISPLAYCONNECTOR pInterface, bool fData, uint32_t x, uint32_t y);
 #endif
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -4561 +4561 @@
 }
 
+DECLCALLBACK(void) Display::i_displayVBVAReportCursorPosition(PPDMIDISPLAYCONNECTOR pInterface, bool fData, uint32_t x, uint32_t y)
+{
+    LogFlowFunc(("\n"));
+
+    PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
+    Display *pThis = pDrv->pDisplay;
+
+    fireCursorPositionChangedEvent(pThis->mParent->i_getEventSource(), fData, x, y);
+}
+
 #endif /* VBOX_WITH_HGSMI */
 
@@ -4663 +4673 @@
     pThis->IConnector.pfnVBVAGuestCapabilityUpdate = Display::i_displayVBVAGuestCapabilityUpdate;
     pThis->IConnector.pfnVBVAInputMappingUpdate = Display::i_displayVBVAInputMappingUpdate;
+    pThis->IConnector.pfnVBVAReportCursorPosition = Display::i_displayVBVAReportCursorPosition;
 #endif
 

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -353 +353 @@
     ASSERT_LOG_GROUP(MAIN_CPUCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_CPUEXECUTIONCAPCHANGEDEVENT);
+    ASSERT_LOG_GROUP(MAIN_CURSORPOSITIONCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_DHCPSERVER);
     ASSERT_LOG_GROUP(MAIN_DIRECTORY);