diff options
| author | Simon Thum <simon.thum@gmx.de> | 2010-03-16 16:00:21 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-03-24 07:50:55 +1000 |
| commit | 0dc931e1acee6ea3afd032be887f85ce1121f325 (patch) | |
| tree | 7313f58ed19d5e9ab1ad321de37fa2df191e3fa7 | |
| parent | When labeling a device as touchpad, only check for LMR buttons. (diff) | |
| download | xf86-input-evdev-0dc931e1acee6ea3afd032be887f85ce1121f325.tar.gz xf86-input-evdev-0dc931e1acee6ea3afd032be887f85ce1121f325.tar.bz2 xf86-input-evdev-0dc931e1acee6ea3afd032be887f85ce1121f325.zip | |
move feedback initialization up
This allows the backend to propery initialize the feedback from options,
as it works with most other drivers. This is the hacky equivalent of
fixing the initialization of pointer acceleration, which would require
changes to most drivers however.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evdev.c b/src/evdev.c index b532639..66b746a 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1299,6 +1299,9 @@ EvdevAddRelClass(DeviceIntPtr device) GetMotionHistorySize(), Relative)) return !Success; + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) + return !Success; + for (axis = REL_X; axis <= REL_MAX; axis++) { int axnum = pEvdev->axis_map[axis]; @@ -1315,9 +1318,6 @@ EvdevAddRelClass(DeviceIntPtr device) xfree(atoms); - if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) - return !Success; - pInfo->flags |= XI86_POINTER_CAPABLE; return Success; |