On Fri, Jun 17, 2016 at 08:44:41AM -0700, Jason Gerecke wrote: > 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 <[email protected]> > Reviewed-by: Olivier Fourdan <[email protected]> > --- > Changes from v1: > * None
remote: Updating patchwork state for https://patchwork.freedesktop.org/project/Xorg/list/ remote: I: patch #93975 updated using rev dab5b3922c50f73712a8ea0cb9742c4bc7d7ab1d. remote: I: patch #93612 updated using rev 72df6e2a3a5020696902b70fe940934ef0a681c4. remote: I: patch #93610 updated using rev 6f2a5b8cdf7b1e913a1e0581e65195dd10f04ca3. remote: I: 3 patch(es) updated to state Accepted. To git+ssh://[email protected]/git/xorg/xserver 2d6230e..6f2a5b8 master -> master thanks Cheers, Peter > 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 fbb6b6b..45acf0c 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; > -- > 2.8.3 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: https://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
