devel/xorg-x11-drv-vmmouse vmmouse-coord-hack.patch, NONE, 1.1 xorg-x11-drv-vmmouse.spec, 1.14, 1.15

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/xorg-x11-drv-vmmouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Added Files:
	vmmouse-coord-hack.patch 
Log Message:
* Wed Jan  2 2008 Jeremy Katz <katzj at redhat.com> - 12.4.3-3
- Add workaround for xserver not calling convert_proc in input drivers 
  anymore (patch from Joerg Platte on debian xmaint list)


vmmouse-coord-hack.patch:

--- NEW FILE vmmouse-coord-hack.patch ---
--- src/vmmouse.c	2007-09-26 01:11:47.000000000 +0200
+++ src/vmmouse-new.c	2007-12-04 22:44:21.000000000 +0100
@@ -960,12 +960,15 @@
 static void
 GetVMMouseMotionEvent(InputInfoPtr pInfo){
    MouseDevPtr pMse;
+   VMMousePrivPtr mPriv;
    int buttons, dx, dy, dz, dw;
+   double factorX, factorY;
    VMMOUSE_INPUT_DATA  vmmouseInput;
    int ps2Buttons = 0;
    int numPackets;
 
    pMse = pInfo->private;  
+   mPriv = pMse->mousePriv;
    while((numPackets = VMMouseClient_GetInput(&vmmouseInput))){
       if (numPackets == VMMOUSE_ERROR) {
          VMMouseClient_Disable();
@@ -990,6 +993,13 @@
       dy = vmmouseInput.Y; 
       dz = (char)vmmouseInput.Z;
       dw = 0;
+      /* scale the input data based on the screen dimensions */
+      factorX = ((double) screenInfo.screens[mPriv->screenNum]->width) / (double) 65535;
+      factorY = ((double) screenInfo.screens[mPriv->screenNum]->height) / (double) 65535;
+
+      dx = dx * factorX + 0.5;
+      dy = dy * factorY + 0.5;
+
       /* post an event */
       pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw);
    }


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/devel/xorg-x11-drv-vmmouse/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-vmmouse.spec	18 Dec 2007 16:58:12 -0000	1.14
+++ xorg-x11-drv-vmmouse.spec	2 Jan 2008 20:49:18 -0000	1.15
@@ -5,13 +5,15 @@
 Summary:   Xorg X11 vmmouse input driver
 Name:      xorg-x11-drv-vmmouse
 Version:   12.4.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+# http://groups.google.com/group/linux.debian.maint.x/browse_thread/thread/9c2ecc22fba0f03a
+Patch0: vmmouse-coord-hack.patch
 
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
@@ -25,6 +27,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p0
 
 %build
 %configure --disable-static
@@ -47,6 +50,10 @@
 %{_mandir}/man4/vmmouse.4*
 
 %changelog
+* Wed Jan  2 2008 Jeremy Katz <katzj at redhat.com> - 12.4.3-3
+- Add workaround for xserver not calling convert_proc in input drivers 
+  anymore (patch from Joerg Platte on debian xmaint list)
+
 * Tue Dec 18 2007 Jeremy Katz <katzj at redhat.com> - 12.4.3-2
 - Rebuild for new xserver