Changeset 60141 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Mar 22, 2016 7:23:35 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: the Linux kernel sends cursor events to each screen, but we handle them globally. Keep track of whether the cursor is enabled for each screen, and only disable it globally if it is disabled everywhere. Also take screen offset into account when reporting cursor position to the host.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_mode.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -153 +153 @@
     unsigned crtc_id;
     uint32_t fb_offset;
-    struct drm_gem_object *cursor_bo;
-    uint64_t cursor_addr;
-    int cursor_width, cursor_height;
-    u8 offset_x, offset_y;
+    bool cursor_enabled;
 };
 

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

@@ -634 +634 @@
 
     if (!handle) {
+        bool cursor_enabled = false;
+        struct drm_crtc *crtci;
+
         /* Hide cursor. */
-        VBoxHGSMIUpdatePointerShape(&vbox->submit_info, 0, 0, 0, 0, 0, NULL, 0);
+        vbox_crtc->cursor_enabled = false;
+        list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list, head)
+            if (to_vbox_crtc(crtci)->cursor_enabled)
+                cursor_enabled = true;
+        if (!cursor_enabled)
+            VBoxHGSMIUpdatePointerShape(&vbox->submit_info, 0, 0, 0, 0, 0, NULL, 0);
         return 0;
     }
+    vbox_crtc->cursor_enabled = true;
     if (   width > VBOX_MAX_CURSOR_WIDTH || height > VBOX_MAX_CURSOR_HEIGHT
         || width == 0 || hot_x > width || height == 0 || hot_y > height)
@@ -702 +711 @@
     struct vbox_private *vbox = crtc->dev->dev_private;
 
-    VBoxHGSMICursorPosition(&vbox->submit_info, true, x, y, NULL, NULL);
+    VBoxHGSMICursorPosition(&vbox->submit_info, true, x + crtc->x,
+                            y + crtc->y, NULL, NULL);
     return 0;
 }