mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-08 23:12:27 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
This commit is contained in:
commit
05541259bd
25 changed files with 946 additions and 213 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue