Changeset 60919 in vbox for trunk

Timestamp:

May 10, 2016 10:33:28 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: work around a problem with wrong cursor hot-spot positions in the kernel video driver after a host save and restore.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -689 +689 @@
     bool src_isiomem;
 
+    /* Re-set this regularly as in 5.0.20 and earlier the information was lost
+     * on save and restore. */
+    VBoxHGSMIUpdateInputMapping(&vbox->submit_info, 0, 0,
+                                vbox->input_mapping_width,
+                                vbox->input_mapping_height);
     if (!handle) {
         bool cursor_enabled = false;
@@ -784 +789 @@
     rc = VBoxHGSMICursorPosition(&vbox->submit_info, true, x + crtc->x,
                                  y + crtc->y, &host_x, &host_y);
-    if (RT_FAILURE(rc))
+    /* Work around a bug after save and restore in 5.0.20 and earlier. */
+    if (RT_FAILURE(rc) || (host_x == 0 && host_y == 0))
         return -RTErrConvertToErrno(rc);
     if (x + crtc->x < host_x)