Attachment #262531 for bug #444747

View | Details | Raw Unified | Return to bug 444747
Collapse All | Expand All





	InitPointerDeviceStruct((DevicePtr)device, map,
				min(pMse->buttons, MSE_MAXBUTTONS),
#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);





	InitPointerDeviceStruct((DevicePtr)device, map,
				min(pMse->buttons, MSE_MAXBUTTONS),
#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);





	InitPointerDeviceStruct((DevicePtr)device, map,
				min(pMse->buttons, MSE_MAXBUTTONS),
#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);

Return to bug 444747

Lines 1618-1625 MouseProc(DeviceIntPtr device, int what) Link Here

(-)src/VBox/Additions/x11/xmouse.orig//mouse.c (-2 / +12 lines)
1618		1618
1619	InitPointerDeviceStruct((DevicePtr)device, map,	1619	InitPointerDeviceStruct((DevicePtr)device, map,
1620	min(pMse->buttons, MSE_MAXBUTTONS),	1620	min(pMse->buttons, MSE_MAXBUTTONS),
1621	miPointerGetMotionEvents, pMse->Ctrl,	1621	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
1622	miPointerGetMotionBufferSize());	1622	miPointerGetMotionEvents,
		1623	#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
		1624	GetMotionHistory,
		1625	#endif
		1626	pMse->Ctrl,
		1627	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
		1628	miPointerGetMotionBufferSize()
		1629	#else
		1630	GetMotionHistorySize(), 2
		1631	#endif
		1632	);
1623		1633
1624	/* X valuator */	1634	/* X valuator */
1625	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);	1635	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);

Lines 1749-1756 MouseProc(DeviceIntPtr device, int what) Link Here

(-)src/VBox/Additions/x11/xmouse.orig//xorg70/mouse.c (-2 / +12 lines)
1749		1749
1750	InitPointerDeviceStruct((DevicePtr)device, map,	1750	InitPointerDeviceStruct((DevicePtr)device, map,
1751	min(pMse->buttons, MSE_MAXBUTTONS),	1751	min(pMse->buttons, MSE_MAXBUTTONS),
1752	miPointerGetMotionEvents, pMse->Ctrl,	1752	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
1753	miPointerGetMotionBufferSize());	1753	miPointerGetMotionEvents,
		1754	#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
		1755	GetMotionHistory,
		1756	#endif
		1757	pMse->Ctrl,
		1758	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
		1759	miPointerGetMotionBufferSize()
		1760	#else
		1761	GetMotionHistorySize(), 2
		1762	#endif
		1763	);
1754		1764
1755	/* X valuator */	1765	/* X valuator */
1756	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);	1766	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);

Lines 1761-1768 MouseProc(DeviceIntPtr device, int what) Link Here

(-)src/VBox/Additions/x11/xmouse.orig//xorg71/mouse.c (-2 / +12 lines)
1761		1761
1762	InitPointerDeviceStruct((DevicePtr)device, map,	1762	InitPointerDeviceStruct((DevicePtr)device, map,
1763	min(pMse->buttons, MSE_MAXBUTTONS),	1763	min(pMse->buttons, MSE_MAXBUTTONS),
1764	miPointerGetMotionEvents, pMse->Ctrl,	1764	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
1765	miPointerGetMotionBufferSize());	1765	miPointerGetMotionEvents,
		1766	#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
		1767	GetMotionHistory,
		1768	#endif
		1769	pMse->Ctrl,
		1770	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
		1771	miPointerGetMotionBufferSize()
		1772	#else
		1773	GetMotionHistorySize(), 2
		1774	#endif
		1775	);
1766		1776
1767	/* X valuator */	1777	/* X valuator */
1768	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);	1778	xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);