[PATCH xserver] xwayland: Support for BTN_STYLUS3 kernel events

[Jason Gerecke]

On Thu, Nov 9, 2017 at 2:19 PM, Jason Gerecke <killertofu at gmail.com> wrote:
> On Tue, Nov 7, 2017 at 2:37 PM, Peter Hutterer <peter.hutterer at who-t.net> wrote:
>> On Tue, Nov 07, 2017 at 11:09:44AM -0800, Jason Gerecke wrote:
>>> 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>
>>> ---
>>> Note: this patch is pending the formal acceptance of BTN_STYLU3 into
>>> Linux 4.15. I'll post an update once Jiri merges the patch.
>>
>> Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>, I'll merge this
>> after your reminder ;)
>>
>> Cheers,
>>    Peter
>>
>>
>
> Jiri's accepted the patch into his 'for-4.15/wacom' branch :)
>
> Jason
> ---
> Now instead of four in the eights place /
> you’ve got three, ‘Cause you added one  /
> (That is to say, eight) to the two,     /
> But you can’t take seven from three,    /
> So you look at the sixty-fours....
>

Just noticed that this doesn't appear to have been merged, so sending
another poke :)

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one  /
(That is to say, eight) to the two,     /
But you can’t take seven from three,    /
So you look at the sixty-fours....

>>>  hw/xwayland/xwayland-input.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
>>> index 68e365051..4325b4c6e 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;
>>>
>>> --
>>> 2.15.0
>>>