xserver: Branch 'master'

[Peter Hutterer]

 include/X11/extensions/XI2proto.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit af9b5f43439378efd1e12d11d487a71f42790fec
Author: Roman Kapl <code at rkapl.cz>
Date:   Thu Jun 7 03:32:08 2018 +0200

    Improve the ButtonInfo description.
    
    It failed to mention it is followed by a bit-mask and then the atoms.
    
    Signed-off-by: Roman Kapl <code at rkapl.cz>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/include/X11/extensions/XI2proto.h b/include/X11/extensions/XI2proto.h
index 4cdaa0d..28a9062 100644
--- a/include/X11/extensions/XI2proto.h
+++ b/include/X11/extensions/XI2proto.h
@@ -149,8 +149,9 @@ typedef struct {
 
 /**
  * Denotes button capability on a device.
- * Struct is followed by num_buttons * Atom that names the buttons in the
- * device-native setup (i.e. ignoring button mappings).
+ * Struct is followed by a button bit-mask (padded to four byte chunks) and
+ * then num_buttons * Atom that names the buttons in the device-native setup
+ * (i.e.  ignoring button mappings).
  */
 typedef struct {
     uint16_t    type;           /**< Always ButtonClass */