Changeset 55202 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

Timestamp:

Apr 13, 2015 9:09:37 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: watch for and remember display change events even when we cannot immediately handle them.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -86 +86 @@
 /** Tell the VBoxGuest driver we no longer want any events and tell the host
  * we no longer support any capabilities. */
-static int disableEventsAndCaps()
+static int disableEventsAndCaps(bool fDisableEvents)
 {
     int rc = VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
@@ -94 +94 @@
     if (RT_FAILURE(rc))
         VBClFatalError(("Failed to unset mouse status, rc=%Rrc.\n", rc));
-    rc = VbglR3CtlFilterMask(0,  VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED
-                                | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
+    if (fDisableEvents)
+        rc = VbglR3CtlFilterMask(0, VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
     if (RT_FAILURE(rc))
         VBClFatalError(("Failed to unset filter mask, rc=%Rrc.\n", rc));
@@ -385 +385 @@
     if (!pSelf->mfInit)
         return VERR_WRONG_ORDER;
-    return disableEventsAndCaps();
+    return disableEventsAndCaps(false);
 }
 
@@ -400 +400 @@
 {
     NOREF(ppInterface);
-    disableEventsAndCaps();
+    disableEventsAndCaps(true);
     VbglR3Term();
 }