diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-06-05 23:12:58 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-06-05 23:12:58 -0400 |
| commit | 294355842ba9fb3cb3bbd7bfd60c9ca3ce704475 (patch) | |
| tree | 243c982bb7f88578246e8c50715220a30199ab8b /src/evdev_btn.c | |
| parent | Disable and remove the device when a read error occurs. (diff) | |
| download | xf86-input-evdev-294355842ba9fb3cb3bbd7bfd60c9ca3ce704475.tar.gz xf86-input-evdev-294355842ba9fb3cb3bbd7bfd60c9ca3ce704475.tar.bz2 xf86-input-evdev-294355842ba9fb3cb3bbd7bfd60c9ca3ce704475.zip | |
Alright, this is a really big commit that breaks stuff.
evdev.h:
Switch to flags in the abs and rel structs.
Add the axes struct, and defines.
Rework the abs and rel structs, moving stuff to the axes struct and moving
everything to the new mapping handling.
Add the structs and function declarations for the new tokenization stuff,
parsing stuff, and mapping stuff.
evdev.c: Add EvdevTokenize, and the evdev_map_parsers list.
evdev_axes.c:
Basicly a full rewrite, big, messy.
We now use a completely different mapping setup for axes, and mapping to
buttons is currently missing.
However we now handle ABS_CALIB and ABS_AREA, including rotation in both
rel and abs modes.
evdev_btn.c:
Disable lots of code and break things horribly, we compile but we don't
work very well.
Fixing this is next on my todo list.
Diffstat (limited to 'src/evdev_btn.c')
| -rw-r--r-- | src/evdev_btn.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/evdev_btn.c b/src/evdev_btn.c index b9bfe07..3914bad 100644 --- a/src/evdev_btn.c +++ b/src/evdev_btn.c @@ -214,6 +214,7 @@ EvdevBtnOff (DeviceIntPtr device) return Success; } +#if 0 /* * Warning, evil lives here. */ @@ -286,6 +287,7 @@ EvdevBtnCalcRemap (InputInfoPtr pInfo) } } } +#endif int @@ -350,7 +352,11 @@ EvdevBtnNew1(InputInfoPtr pInfo) if (!state->btn) return !Success; +#if 0 EvdevBtnCalcRemap (pInfo); +#else + state->btn->buttons = state->btn->real_buttons; +#endif if (state->btn->buttons) xf86Msg(X_INFO, "%s: Configured %d mouse buttons\n", pInfo->name, state->btn->buttons); @@ -399,7 +405,9 @@ EvdevBtnProcess (InputInfoPtr pInfo, struct input_event *ev) if (state->btn->ignore[button] & EV_BTN_IGNORE_X) return; +#if 0 button = state->btn->map[button]; +#endif xf86PostButtonEvent (pInfo->dev, 0, button, ev->value, 0, 0); } |