From 9a48d213f3cb663d23efd94714820cdabcd51baa Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Sun, 10 Nov 2024 09:32:04 -0500
Subject: [PATCH] qubes-input-proxy: upgrade to 1.0.39

---
 qubes-input-proxy/APKBUILD                             | 6 +++---
 qubes-input-proxy/qubes-input-trigger_use-openrc.patch | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/qubes-input-proxy/APKBUILD b/qubes-input-proxy/APKBUILD
index 29ca603..1e206d6 100644
--- a/qubes-input-proxy/APKBUILD
+++ b/qubes-input-proxy/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=qubes-input-proxy
-pkgver=1.0.38
+pkgver=1.0.39
 _gittag=v$pkgver
 pkgrel=0
 pkgdesc="The Qubes service for proxying input devices"
@@ -46,8 +46,8 @@ package() {
 	install -Dm755 "$srcdir"/qubes-input-sender.openrc "$pkgdir"/etc/init.d/qubes-input-sender
 }
 sha512sums="
-bf4b44ee58347d78682a9b2c9eac10679a7ff17dfd56019a83b009b1165fd3833bc484df3cf9b13068b6754343c017f38a8d2ac2c06e1a0ee53646066daf658a  qubes-input-proxy-v1.0.38.tar.gz
-53f898f4d611e0a9be18127cff90ebc3946dc7e270548a84407067b02cb918546e8425c1722a60efb73b93af05c79889eaa16a4c7d596c948fdb9291d218c803  qubes-input-trigger_use-openrc.patch
+097056a4700a70b9e1e109f622bbff100728166ff30bfc4b58edf3b18f8f4b053c3152f7e43b60c6c671cb2ad2eb8de7d6544d844ba6456d74f2376d6967dcaf  qubes-input-proxy-v1.0.39.tar.gz
+4f8881928a32d83dbf0872067e04ab269e8f4cc622bdf0e35c53ccc330456e4b15112a142aa648fb07070ae88d9c327e6958cc8e39600820a9291fc4cd7ea242  qubes-input-trigger_use-openrc.patch
 21e7b95c94ec1a3f3499e79cf8b1931da2c3e33d8f1af2efe6b52b7e2678d4648bb0597b3a4a95cc10d0ca3cb83df93075b99cf1b615d8493a9e2fd21fb7f8f7  makefile_skip-systemd.patch
 2d5cb4369bc4d4c83403bb3e7cd7bc784769950a8fbf581996074fe53cc65c56fe4039e2689b6fa34e51ce22e552fc145115c12e71601809767962a3682dd299  qubes-input-sender.openrc
 "
diff --git a/qubes-input-proxy/qubes-input-trigger_use-openrc.patch b/qubes-input-proxy/qubes-input-trigger_use-openrc.patch
index 2c49700..3abfd86 100644
--- a/qubes-input-proxy/qubes-input-trigger_use-openrc.patch
+++ b/qubes-input-proxy/qubes-input-trigger_use-openrc.patch
@@ -1,15 +1,16 @@
 diff --git a/qubes-rpc/qubes-input-trigger.orig b/qubes-rpc/qubes-input-trigger
-index 5fa0e5a..0dd3773 100755
+index 264788e..edd40ec 100755
 --- a/qubes-rpc/qubes-input-trigger.orig
 +++ b/qubes-rpc/qubes-input-trigger
-@@ -42,48 +42,68 @@ def get_service_name(udevreturn, input_dev):
+@@ -51,49 +51,69 @@ def get_service_name(udevreturn, input_dev):
              ('ID_INPUT_TOUCHPAD' in udevreturn) or
              ('QEMU_USB_Tablet' in udevreturn)
      ) and 'ID_INPUT_KEY' not in udevreturn:
 -        service = 'qubes-input-sender-tablet'
 +        service = 'qubes-input-sender.tablet'
-     # PiKVM "mouse" is special, as it sends absolute events
-     elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_USB_VENDOR=PiKVM' in udevreturn:
+     # if mouse report absolute events, prefer tablet service
+     # (0x3 is ABS_X | ABS_Y)
+     elif 'ID_INPUT_MOUSE' in udevreturn and abs_caps & 0x3:
 -        service = 'qubes-input-sender-tablet'
 +        service = 'qubes-input-sender.tablet'
      elif 'ID_INPUT_MOUSE' in udevreturn and 'ID_INPUT_KEY' not in udevreturn: