[haiku-commits] Change in haiku[master]: Enable digitizers to produce button events from tip and barrel switched

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 11 May 2020 22:05:01 +0000

From Enrique M.G. <quiqueiii@xxxxxxxxx>:

Enrique M.G. has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2685 ;)


Change subject: Enable digitizers to produce button events from tip and barrel 
switched
......................................................................

Enable digitizers to produce button events from tip and barrel switched

Change-Id: Ifcf542e6b04f2f210c80528279e70e0fdd1bb4e3
---
M src/add-ons/kernel/drivers/input/usb_hid/TabletProtocolHandler.cpp
1 file changed, 14 insertions(+), 0 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/85/2685/1

diff --git a/src/add-ons/kernel/drivers/input/usb_hid/TabletProtocolHandler.cpp 
b/src/add-ons/kernel/drivers/input/usb_hid/TabletProtocolHandler.cpp
index ff17a51..d46ee6a 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/TabletProtocolHandler.cpp
+++ b/src/add-ons/kernel/drivers/input/usb_hid/TabletProtocolHandler.cpp
@@ -275,6 +275,20 @@
                        buttons |= (button->Data() & 1) << (button->UsageID() - 
1);
        }

+       uint32 tip = 0;
+       if (fTip != NULL && fTip->Extract() == B_OK
+               && fTip->Valid()) {
+               tip = ((fTip->Data() & 1) !=0);
+       }
+
+       uint32 barrel = 0;
+       if (fBarrelSwitch != NULL && fBarrelSwitch->Extract() == B_OK
+               && fBarrelSwitch->Valid()) {
+               barrel = ((fBarrelSwitch->Data() & 1) !=0);
+       }
+
+       buttons = buttons | tip | (barrel<<1);
+
        float pressure = 1.0f;
        if (fPressure != NULL && fPressure->Extract() == B_OK
                && fPressure->Valid()) {

--
To view, visit https://review.haiku-os.org/c/haiku/+/2685
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ifcf542e6b04f2f210c80528279e70e0fdd1bb4e3
Gerrit-Change-Number: 2685
Gerrit-PatchSet: 1
Gerrit-Owner: Enrique M.G. <quiqueiii@xxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: Enable digitizers to produce button events from tip and barrel switched - Gerrit