From 255b9f6bbf374a315750019c6fadc5f82fb7d41d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 May 2009 10:23:37 +1000 Subject: Only initialize the number of buttons we actually have. This takes into account driver-configured button mappings, i.e. if device with one button has this button mapped to 25 through the ButtonMapping option, the X server will think the device has result 25 buttons. Signed-off-by: Peter Hutterer --- src/evdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 9d3409f..6b22a8f 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1115,9 +1115,7 @@ EvdevAddButtonClass(DeviceIntPtr device) pInfo = device->public.devicePrivate; pEvdev = pInfo->private; - /* FIXME: count number of actual buttons */ - if (!InitButtonClassDeviceStruct(device, ArrayLength(pEvdev->btnmap), - pEvdev->btnmap)) + if (!InitButtonClassDeviceStruct(device, pEvdev->num_buttons, pEvdev->btnmap)) return !Success; return Success; -- cgit v1.2.3