From ac0e675f3b0bcd9f5c01f43b050d1da6d1215be0 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Mon, 5 Dec 2022 14:28:27 +0000
Subject: [PATCH] better capability handling

---
 src/events/Devices.cpp              |  2 +-
 src/managers/input/InputManager.cpp | 28 ++++++++++++----------------
 src/managers/input/InputManager.hpp |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/events/Devices.cpp b/src/events/Devices.cpp
index eecba44f..6ab23a67 100644
--- a/src/events/Devices.cpp
+++ b/src/events/Devices.cpp
@@ -91,7 +91,7 @@ void Events::listener_newInput(wl_listener* listener, void* data) {
             break;
     }
 
-    g_pInputManager->updateCapabilities(DEVICE);
+    g_pInputManager->updateCapabilities();
 }
 
 void Events::listener_newConstraint(wl_listener* listener, void* data) {
diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 228d64ad..b6fa3996 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -1014,24 +1014,20 @@ void Events::listener_commitConstraint(void* owner, void* data) {
     //g_pInputManager->recheckConstraint((SMouse*)owner);
 }
 
-void CInputManager::updateCapabilities(wlr_input_device* pDev) {
-    // TODO: this is dumb
+void CInputManager::updateCapabilities() {
+    uint32_t caps = 0;
 
-    switch (pDev->type) {
-        case WLR_INPUT_DEVICE_KEYBOARD:
-            m_uiCapabilities |= WL_SEAT_CAPABILITY_KEYBOARD;
-            break;
-        case WLR_INPUT_DEVICE_POINTER:
-            m_uiCapabilities |= WL_SEAT_CAPABILITY_POINTER;
-            break;
-        case WLR_INPUT_DEVICE_TOUCH:
-            m_uiCapabilities |= WL_SEAT_CAPABILITY_TOUCH;
-            break;
-        default:
-            break;
-    }
+    if (!m_lKeyboards.empty())
+        caps |= WL_SEAT_CAPABILITY_KEYBOARD;
+    if (!m_lMice.empty())
+        caps |= WL_SEAT_CAPABILITY_POINTER;
+    if (!m_lTouchDevices.empty())
+        caps |= WL_SEAT_CAPABILITY_TOUCH;
+    if (!m_lTabletTools.empty())
+        caps |= WL_SEAT_CAPABILITY_POINTER;
 
-    wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, m_uiCapabilities);
+    wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, caps);
+    m_uiCapabilities = caps;
 }
 
 uint32_t CInputManager::accumulateModsFromAllKBs() {
diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp
index f606fa77..01f2aec6 100644
--- a/src/managers/input/InputManager.hpp
+++ b/src/managers/input/InputManager.hpp
@@ -60,7 +60,7 @@ public:
     void            setTouchDeviceConfigs();
 
     void            updateDragIcon();
-    void            updateCapabilities(wlr_input_device*);
+    void            updateCapabilities();
 
     void            setClickMode(eClickBehaviorMode);
     eClickBehaviorMode getClickMode();