File virtualbox-ose-abi_xinput_version.diff of Package virtualbox-ose

Overview Repositories Revisions Requests Users Attributes Meta

File virtualbox-ose-abi_xinput_version.diff of Package virtualbox-ose (Revision 0fed9fe359b53f33eef85f6a59d7bffa)

Currently displaying revision 0fed9fe359b53f33eef85f6a59d7bffa , Show latest

diff -u -r -p src/VBox/Additions/x11/xmouse.orig//mouse.c src/VBox/Additions/x11/xmouse/mouse.c
--- src/VBox/Additions/x11/xmouse.orig//mouse.c	2008-12-27 23:21:49.000000000 +0100
+++ src/VBox/Additions/x11/xmouse/mouse.c	2008-12-27 23:22:25.000000000 +0100
@@ -1618,8 +1618,18 @@ MouseProc(DeviceIntPtr device, int what)
 
 	InitPointerDeviceStruct((DevicePtr)device, map,
 				min(pMse->buttons, MSE_MAXBUTTONS),
-				miPointerGetMotionEvents, pMse->Ctrl,
-				miPointerGetMotionBufferSize());
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+				miPointerGetMotionEvents, 
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+				GetMotionHistory,
+#endif
+				pMse->Ctrl,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+				miPointerGetMotionBufferSize()
+#else
+				GetMotionHistorySize(), 2
+#endif
+				);
 
 	/* X valuator */
 	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
diff -u -r -p src/VBox/Additions/x11/xmouse.orig//xorg70/mouse.c src/VBox/Additions/x11/xmouse/xorg70/mouse.c
--- src/VBox/Additions/x11/xmouse.orig//xorg70/mouse.c	2008-12-27 23:21:49.000000000 +0100
+++ src/VBox/Additions/x11/xmouse/xorg70/mouse.c	2008-12-27 23:22:50.000000000 +0100
@@ -1749,8 +1749,18 @@ MouseProc(DeviceIntPtr device, int what)
 
 	InitPointerDeviceStruct((DevicePtr)device, map,
 				min(pMse->buttons, MSE_MAXBUTTONS),
-				miPointerGetMotionEvents, pMse->Ctrl,
-				miPointerGetMotionBufferSize());
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+				miPointerGetMotionEvents, 
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+				GetMotionHistory,
+#endif
+				pMse->Ctrl,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+				miPointerGetMotionBufferSize()
+#else
+				GetMotionHistorySize(), 2
+#endif
+				);
 
 	/* X valuator */
 	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
diff -u -r -p src/VBox/Additions/x11/xmouse.orig//xorg71/mouse.c src/VBox/Additions/x11/xmouse/xorg71/mouse.c
--- src/VBox/Additions/x11/xmouse.orig//xorg71/mouse.c	2008-12-27 23:21:49.000000000 +0100
+++ src/VBox/Additions/x11/xmouse/xorg71/mouse.c	2008-12-27 23:22:55.000000000 +0100
@@ -1761,8 +1761,18 @@ MouseProc(DeviceIntPtr device, int what)
 
 	InitPointerDeviceStruct((DevicePtr)device, map,
 				min(pMse->buttons, MSE_MAXBUTTONS),
-				miPointerGetMotionEvents, pMse->Ctrl,
-				miPointerGetMotionBufferSize());
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+				miPointerGetMotionEvents, 
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+				GetMotionHistory,
+#endif
+				pMse->Ctrl,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+				miPointerGetMotionBufferSize()
+#else
+				GetMotionHistorySize(), 2
+#endif
+				);
 
 	/* X valuator */
 	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);

Places

File virtualbox-ose-abi_xinput_version.diff of Package virtualbox-ose (Revision 0fed9fe359b53f33eef85f6a59d7bffa)

Places