Skip to content

Fix _XkbReadGetDeviceInfoReply for nButtons == dev->buttons

Peter Hutterer requested to merge whot/libx11:wip/fix-xkbreadgetdeviceinfo into master

XkbGetDeviceInfo(dpy, XkbXI_ButtonActionsMask, 2, 0, 0) always returns NULL because the number of buttons on the device equals (unsurpisingly) the number of buttons requested (i.e. first + nBtns == dev->nbuttons).

This currently causes it to bail out and return NULL.

Fixes f293659d

cc @alanc, @mherrb

I've been staring at this for a bit and ... has this really been broken for over 10 years without anyone noticing?

Edited by Peter Hutterer

Merge request reports