diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-08-07 16:57:06 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-08-08 15:51:09 +0930 |
| commit | 4e121b297ee0a9b179f8188926564fb8b2c3f6c8 (patch) | |
| tree | 0cbe00b75183b0c676f43b79f824ded64d9fb854 | |
| parent | 9793de81373bb78b9ddbb2487e0af5d2ddd0b246 (diff) | |
Add EVDEV_MAXBUTTONS instead of checking against 32.
Numbers are so lame, defines are all the rage now I've heard.
| -rw-r--r-- | src/emuWheel.c | 9 | ||||
| -rw-r--r-- | src/evdev.c | 6 | ||||
| -rw-r--r-- | src/evdev.h | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/emuWheel.c b/src/emuWheel.c index b82ba79..70ef41c 100644 --- a/src/emuWheel.c +++ b/src/emuWheel.c @@ -40,7 +40,6 @@ #include "evdev.h" -#define MSE_MAXBUTTONS 32 #define WHEEL_NOT_CONFIGURED 0 static Atom prop_wheel_emu; @@ -162,8 +161,8 @@ EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char* axis_ char *msg = NULL; if ((sscanf(option_string, "%d %d", &up_button, &down_button) == 2) && - ((up_button > 0) && (up_button <= MSE_MAXBUTTONS)) && - ((down_button > 0) && (down_button <= MSE_MAXBUTTONS))) { + ((up_button > 0) && (up_button <= EVDEV_MAXBUTTONS)) && + ((down_button > 0) && (down_button <= EVDEV_MAXBUTTONS))) { /* Use xstrdup to allocate a string for us */ msg = xstrdup("buttons XX and YY"); @@ -211,7 +210,7 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo) wheelButton = xf86SetIntOption(pInfo->options, "EmulateWheelButton", 4); - if ((wheelButton < 0) || (wheelButton > MSE_MAXBUTTONS)) { + if ((wheelButton < 0) || (wheelButton > EVDEV_MAXBUTTONS)) { xf86Msg(X_WARNING, "%s: Invalid EmulateWheelButton value: %d\n", pInfo->name, wheelButton); xf86Msg(X_WARNING, "%s: Wheel emulation disabled.\n", pInfo->name); @@ -457,7 +456,7 @@ EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val) else if (atom == prop_wheel_button) { int bt = *((CARD8*)val->data); - if (bt < 0 || bt >= MSE_MAXBUTTONS) + if (bt < 0 || bt >= EVDEV_MAXBUTTONS) return FALSE; pEvdev->emulateWheel.button = bt; } else if (atom == prop_wheel_xmap) diff --git a/src/evdev.c b/src/evdev.c index 540738c..a383d7b 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -854,11 +854,11 @@ EvdevInitButtonMapping(InputInfoPtr pInfo) int btn = 0; xf86Msg(X_CONFIG, "%s: ButtonMapping '%s'\n", pInfo->name, mapping); - while (s && *s != '\0' && nbuttons < 32) + while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS) { btn = strtol(mapping, &s, 10); - if (s == mapping || btn < 0 || btn > 32) + if (s == mapping || btn < 0 || btn > EVDEV_MAXBUTTONS) { xf86Msg(X_ERROR, "%s: ... Invalid button mapping. Using defaults\n", @@ -1256,7 +1256,7 @@ EvdevUtilButtonEventToButtonNumber(int code) } } - if (button > 32) + if (button > EVDEV_MAXBUTTONS) return 0; return button; diff --git a/src/evdev.h b/src/evdev.h index 0afa44c..91e382f 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -40,6 +40,8 @@ #include <X11/extensions/XKBstr.h> #endif +#define EVDEV_MAXBUTTONS 32 + /* axis specific data for wheel emulation */ typedef struct { int up_button; |