From 6f2a5b8cdf7b1e913a1e0581e65195dd10f04ca3 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Fri, 17 Jun 2016 08:44:41 -0700 Subject: [PATCH] xwayland: Expose all NBUTTONS buttons on the pointer The call to 'InitButtonClassDeviceStruct' which initializes the pointer buttons only results in the first three buttons being created due to a hardcoded '3'. In order to expose all the buttons defined in the btn_labels array, we subtitute 'NBUTTONS' in its place. Signed-off-by: Jason Gerecke Reviewed-by: Olivier Fourdan Signed-off-by: Peter Hutterer --- hw/xwayland/xwayland-input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index fbb6b6b2c..45acf0c97 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -103,7 +103,7 @@ xwl_pointer_proc(DeviceIntPtr device, int what) if (!InitPtrFeedbackClassDeviceStruct(device, xwl_pointer_control)) return BadValue; - if (!InitButtonClassDeviceStruct(device, 3, btn_labels, map)) + if (!InitButtonClassDeviceStruct(device, NBUTTONS, btn_labels, map)) return BadValue; return Success;