Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular

This commit is contained in:
Alan Coopersmith 2006-08-21 13:07:41 -07:00
commit 05541259bd
25 changed files with 946 additions and 213 deletions

View file

@ -667,13 +667,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
if (!feedc)
return FALSE;
feedc->CtrlProc = controlProc;
#ifdef sgi
feedc->ctrl.num = 1;
feedc->ctrl.den = 1;
feedc->ctrl.threshold = 1;
#else
feedc->ctrl = defaultPointerControl;
#endif
feedc->ctrl.id = 0;
if ( (feedc->next = dev->ptrfeed) )
feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1;