aboutsummaryrefslogtreecommitdiff
path: root/src/emuWheel.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-21 09:51:57 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-21 15:51:08 +1000
commitaa117d49a5139bcc453e6ab022b67347464a8acd (patch)
treebaa8c11d7d46198540556767ead39c612d00110c /src/emuWheel.c
parentEnsure enough buttons are advertised to pass the button mapping. (diff)
downloadxf86-input-evdev-aa117d49a5139bcc453e6ab022b67347464a8acd.tar.gz
xf86-input-evdev-aa117d49a5139bcc453e6ab022b67347464a8acd.tar.bz2
xf86-input-evdev-aa117d49a5139bcc453e6ab022b67347464a8acd.zip
Rename pEvdev->buttons to pEvdev->num_buttons for clarity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/emuWheel.c')
-rw-r--r--src/emuWheel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emuWheel.c b/src/emuWheel.c
index 7d3eb24..bb3a980 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -201,8 +201,8 @@ EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char* axis_
pAxis->down_button = down_button;
/* Update the number of buttons if needed */
- if (up_button > pEvdev->buttons) pEvdev->buttons = up_button;
- if (down_button > pEvdev->buttons) pEvdev->buttons = down_button;
+ if (up_button > pEvdev->num_buttons) pEvdev->num_buttons = up_button;
+ if (down_button > pEvdev->num_buttons) pEvdev->num_buttons = down_button;
} else {
xf86Msg(X_WARNING, "%s: Invalid %s value:\"%s\"\n",
@@ -285,8 +285,8 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo)
/* Simpler to check just the largest value in this case */
/* XXX: we should post this to the server */
- if (5 > pEvdev->buttons)
- pEvdev->buttons = 5;
+ if (5 > pEvdev->num_buttons)
+ pEvdev->num_buttons = 5;
/* Display default Configuration */
xf86Msg(X_CONFIG, "%s: YAxisMapping: buttons %d and %d\n",