Changeset 55204 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2015 10:50:07 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: separate Solaris absolute mouse calibration when setting the frame-buffer dimensions into a separate function.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• setmode.c (modified) (1 diff)
• vboxvideo.h (modified) (1 diff)

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

@@ -201 +201 @@
         FatalError("Failed to update the input mapping.\n");
 #endif
+    vbvxSetSolarisMouseRange(width, height);
+    return TRUE;
+}
+
+/** Tell the virtual mouse device about the new virtual desktop size. */
+void vbvxSetSolarisMouseRange(int width, int height)
+{
 #ifdef RT_OS_SOLARIS
-    /* Tell the virtual mouse device about the new virtual desktop size. */
-    {
-        int rc;
-        int hMouse = open("/dev/mouse", O_RDWR);
-        if (hMouse >= 0)
-        {
-            do {
-                Ms_screen_resolution Res = { height, width };
-                rc = ioctl(hMouse, MSIOSRESOLUTION, &Res);
-            } while ((rc != 0) && (errno == EINTR));
-            close(hMouse);
-        }
-    }
-#endif
-    return TRUE;
-}
+    int rc;
+    int hMouse = open("/dev/mouse", O_RDWR);
+
+    if (hMouse >= 0)
+    {
+        do {
+            Ms_screen_resolution Res = { height, width };
+            rc = ioctl(hMouse, MSIOSRESOLUTION, &Res);
+        } while ((rc != 0) && (errno == EINTR));
+        close(hMouse);
+    }
+#else
+    (void)width; (void)height;
+#endif
+}

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

@@ -247 +247 @@
 
 /* setmode.c */
+extern void vbvxSetSolarisMouseRange(int width, int height);
+
 extern Bool vbox_cursor_init (ScreenPtr pScreen);
 extern void vbox_open (ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBox);