Changeset 18307 in vbox for trunk/src/VBox

Timestamp:

Mar 26, 2009 12:18:35 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: add a few fallback cases to the driver

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -465 +465 @@
     rc = VbglR3SetPointerShapeReq(pVBox->reqp);
     if (RT_FAILURE(rc))
+    {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not hide the virtual mouse pointer.\n");
+        /* Play safe, and disable the hardware cursor until the next mode
+         * switch, since obviously something happened that we didn't
+         * anticipate. */
+        pVBox->forceSWCursor = TRUE;
+    }
 }
 
@@ -477 +483 @@
         pVBox->reqp->fFlags = VBOX_MOUSE_POINTER_VISIBLE;
         rc = VbglR3SetPointerShapeReq(pVBox->reqp);
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(rc)) {
             xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not unhide the virtual mouse pointer.\n");
+            /* Play safe, and disable the hardware cursor until the next mode
+             * switch, since obviously something happened that we didn't
+             * anticipate. */
+            pVBox->forceSWCursor = TRUE;
+        }
     }
 }
@@ -496 +507 @@
 
     rc = VbglR3SetPointerShapeReq(reqp);
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(rc)) {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,  "Unable to set the virtual mouse pointer image.\n");
+        /* Play safe, and disable the hardware cursor until the next mode
+         * switch, since obviously something happened that we didn't
+         * anticipate. */
+        pVBox->forceSWCursor = TRUE;
+    }
 }