Changeset 55723 in vbox for trunk/src/VBox/Additions

Timestamp:

May 7, 2015 1:28:10 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: pass on virtual size to input devices when we resize the screen.

Location:

trunk/src/VBox/Additions/x11

Files:

• undefined_xorg (modified) (1 diff)
• vboxvideo/vboxvideo.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/undefined_xorg

@@ -108 +108 @@
 RRCrtcNotify
 RRGetInfo
-RRScreenSizeNotify
+RRScreenSizeSet
 RRTellChanged
 setenv

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

@@ -1071 +1071 @@
             xf86ScrnToScreen(pScrn)->width = cx;
             xf86ScrnToScreen(pScrn)->height = cy;
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 14
-            xf86UpdateDesktopDimensions();
-#elif GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-            screenInfo.width = cx;
-            screenInfo.height = cy;
-#endif
             adjustScreenPixmap(pScrn, cx, cy);
             vbvxSetSolarisMouseRange(cx, cy);
@@ -1124 +1118 @@
     if (!fLimitedContext)
     {
-        RRScreenSizeNotify(xf86ScrnToScreen(pScrn));
+        /* We use RRScreenSizeSet() here and not RRScreenSizeNotify() because
+         * the first also pushes the virtual screen size to the input driver.
+         * We were doing this manually by setting screenInfo.width and height
+         * and calling xf86UpdateDesktopDimensions() where appropriate, but this
+         * failed on Ubuntu 12.04.0 due to a problematic X server back-port. */
+        RRScreenSizeSet(xf86ScrnToScreen(pScrn), xf86ScrnToScreen(pScrn)->width, xf86ScrnToScreen(pScrn)->height,
+                        xf86ScrnToScreen(pScrn)->mmWidth, xf86ScrnToScreen(pScrn)->mmHeight);
         RRTellChanged(xf86ScrnToScreen(pScrn));
     }