xserver: Branch 'master'

[Peter Hutterer]

 hw/xwayland/xwayland-input.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 29a5423abd4bc6cb7bb800924a27b5d90951e408
Author: Jason Gerecke <killertofu at gmail.com>
Date:   Tue Nov 7 11:09:44 2017 -0800

    xwayland: Support for BTN_STYLUS3 kernel events
    
    BTN_STYLUS3 has been introduced by the Linux 4.15 kernel to report the
    status of the third button present on Wacom's new "Pro Pen 3D" stylus.
    Treat this button like xf86-input-wacom and send a button 8 event
    ("navigate back") when received from Wayland.
    
    Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index c613690cd..74a2579f7 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -1698,6 +1698,7 @@ tablet_tool_button_state(void *data, struct zwp_tablet_tool_v2 *tool,
 
         case 0x113: /* BTN_SIDE    */
         case 0x116: /* BTN_BACK    */
+        case 0x149: /* BTN_STYLUS3 */
             xbtn = 8;
             break;