diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-07-19 23:06:23 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-07-19 23:06:23 -0400 |
| commit | fa03de438ea0ae0f07424235f4972e73ff88ef17 (patch) | |
| tree | f4400054caa58d89884546da2e824f809ed077cc /src/evdev_btn.c | |
| parent | Split the New functions so that structs can be allocated and buttons (diff) | |
| download | xf86-input-evdev-fa03de438ea0ae0f07424235f4972e73ff88ef17.tar.gz xf86-input-evdev-fa03de438ea0ae0f07424235f4972e73ff88ef17.tar.bz2 xf86-input-evdev-fa03de438ea0ae0f07424235f4972e73ff88ef17.zip | |
Move the axis to button map code back into the rel code.
This might solve some problems, but should at least prevent some odd behavior.
Diffstat (limited to 'src/evdev_btn.c')
| -rw-r--r-- | src/evdev_btn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/evdev_btn.c b/src/evdev_btn.c index 9a9b65e..dc9ed67 100644 --- a/src/evdev_btn.c +++ b/src/evdev_btn.c @@ -215,12 +215,12 @@ EvdevBtnCalcRemap (InputInfoPtr pInfo) do { clear = 1; for (j = 0; j < REL_MAX; j++) { - if (state->axes->btnMap[j][0] == (i + base)) { + if (state->rel->btnMap[j][0] == (i + base)) { base++; clear = 0; break; } - if (state->axes->btnMap[j][1] == (i + base)) { + if (state->rel->btnMap[j][1] == (i + base)) { base++; clear = 0; break; @@ -243,10 +243,10 @@ EvdevBtnCalcRemap (InputInfoPtr pInfo) if (state->rel) { for (i = 0; i < REL_MAX; i++) { - if (state->axes->btnMap[i][0] > state->btn->buttons) - state->btn->buttons = state->axes->btnMap[i][0]; - if (state->axes->btnMap[i][1] > state->btn->buttons) - state->btn->buttons = state->axes->btnMap[i][1]; + if (state->rel->btnMap[i][0] > state->btn->buttons) + state->btn->buttons = state->rel->btnMap[i][0]; + if (state->rel->btnMap[i][1] > state->btn->buttons) + state->btn->buttons = state->rel->btnMap[i][1]; } } } |