From 47404534d0cf94b969daee5e0e4dc20c65c35fb2 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 12:46:55 +0200 Subject: [PATCH 01/13] added tablet v2 support (alpha alpha) --- src/Compositor.hpp | 2 +- src/events/Devices.cpp | 14 +- src/events/Layers.cpp | 2 +- src/events/Misc.cpp | 2 +- src/events/Monitors.cpp | 2 +- src/events/Popups.cpp | 2 +- src/events/Windows.cpp | 2 +- src/helpers/WLClasses.hpp | 50 ++++++ src/managers/{ => input}/InputManager.cpp | 22 ++- src/managers/{ => input}/InputManager.hpp | 19 ++- src/managers/input/Tablets.cpp | 188 ++++++++++++++++++++++ 11 files changed, 291 insertions(+), 14 deletions(-) rename src/managers/{ => input}/InputManager.cpp (97%) rename src/managers/{ => input}/InputManager.hpp (69%) create mode 100644 src/managers/input/Tablets.cpp diff --git a/src/Compositor.hpp b/src/Compositor.hpp index 2cf867db..e00ea0fd 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -10,7 +10,7 @@ #include "config/ConfigManager.hpp" #include "managers/ThreadManager.hpp" #include "managers/XWaylandManager.hpp" -#include "managers/InputManager.hpp" +#include "managers/input/InputManager.hpp" #include "managers/LayoutManager.hpp" #include "managers/KeybindManager.hpp" #include "managers/AnimationManager.hpp" diff --git a/src/events/Devices.cpp b/src/events/Devices.cpp index 89443af2..7a47df77 100644 --- a/src/events/Devices.cpp +++ b/src/events/Devices.cpp @@ -2,7 +2,7 @@ #include "../Compositor.hpp" #include "../helpers/WLClasses.hpp" -#include "../managers/InputManager.hpp" +#include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" // ---------------------------------------------------- // @@ -78,14 +78,20 @@ void Events::listener_newInput(wl_listener* listener, void* data) { Debug::log(WARN, "!!!! Hyprland does not directly support touchscreens, bugs may occur !!!!"); wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, DEVICE); break; + case WLR_INPUT_DEVICE_TABLET_TOOL: + Debug::log(LOG, "Attached a tablet tool with name %s", DEVICE->name); + g_pInputManager->newTabletTool(DEVICE); + break; + case WLR_INPUT_DEVICE_TABLET_PAD: + Debug::log(LOG, "Attached a tablet pad with name %s", DEVICE->name); + g_pInputManager->newTabletPad(DEVICE); + break; default: Debug::log(WARN, "Unrecognized input device plugged in: %s", DEVICE->name); break; } - uint32_t capabilities = WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_KEYBOARD; - - wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, capabilities); + g_pInputManager->updateCapabilities(DEVICE); } void Events::listener_newConstraint(wl_listener* listener, void* data) { diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index 1503f8cb..a1aa7764 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -1,6 +1,6 @@ #include "../Compositor.hpp" #include "../helpers/WLClasses.hpp" -#include "../managers/InputManager.hpp" +#include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" #include "Events.hpp" diff --git a/src/events/Misc.cpp b/src/events/Misc.cpp index eec42f6d..c25b1c6a 100644 --- a/src/events/Misc.cpp +++ b/src/events/Misc.cpp @@ -2,7 +2,7 @@ #include "../Compositor.hpp" #include "../helpers/WLClasses.hpp" -#include "../managers/InputManager.hpp" +#include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" // ------------------------------ // diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index 7756bfa2..accdd3d7 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -1,6 +1,6 @@ #include "../Compositor.hpp" #include "../helpers/WLClasses.hpp" -#include "../managers/InputManager.hpp" +#include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" #include "Events.hpp" #include "../debug/HyprCtl.hpp" diff --git a/src/events/Popups.cpp b/src/events/Popups.cpp index 457a95fe..0b075295 100644 --- a/src/events/Popups.cpp +++ b/src/events/Popups.cpp @@ -2,7 +2,7 @@ #include "../Compositor.hpp" #include "../helpers/WLClasses.hpp" -#include "../managers/InputManager.hpp" +#include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" // --------------------------------------------- // diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index ffe2ac96..b84b9d2d 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -2,7 +2,7 @@ #include "../Compositor.hpp" #include "../helpers/WLClasses.hpp" -#include "../managers/InputManager.hpp" +#include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" // ------------------------------------------------------------ // diff --git a/src/helpers/WLClasses.hpp b/src/helpers/WLClasses.hpp index 461d02e0..723ffdff 100644 --- a/src/helpers/WLClasses.hpp +++ b/src/helpers/WLClasses.hpp @@ -153,4 +153,54 @@ struct SDrag { DYNLISTENER(mapIcon); DYNLISTENER(unmapIcon); DYNLISTENER(commitIcon); +}; + +struct STablet { + DYNLISTENER(Tip); + DYNLISTENER(Axis); + DYNLISTENER(Button); + DYNLISTENER(Proximity); + DYNLISTENER(Destroy); + + wlr_tablet* wlrTablet = nullptr; + wlr_tablet_v2_tablet* wlrTabletV2 = nullptr; + wlr_input_device* wlrDevice = nullptr; + + bool operator==(const STablet& b) { + return wlrDevice == b.wlrDevice; + } +}; + +struct STabletTool { + wlr_tablet_tool* wlrTabletTool = nullptr; + wlr_tablet_v2_tablet_tool* wlrTabletToolV2 = nullptr; + + wlr_tablet_v2_tablet* wlrTabletOwnerV2 = nullptr; + + double tiltX = 0; + double tiltY = 0; + + bool active = true; + + DYNLISTENER(TabletToolDestroy); + DYNLISTENER(TabletToolSetCursor); + + bool operator==(const STabletTool& b) { + return wlrTabletTool == b.wlrTabletTool; + } +}; + +struct STabletPad { + wlr_tablet_v2_tablet_pad* wlrTabletPadV2 = nullptr; + STablet* pTabletParent = nullptr; + + DYNLISTENER(Attach); + DYNLISTENER(Button); + DYNLISTENER(Strip); + DYNLISTENER(Ring); + DYNLISTENER(Destroy); + + bool operator==(const STabletPad& b) { + return wlrTabletPadV2 == b.wlrTabletPadV2; + } }; \ No newline at end of file diff --git a/src/managers/InputManager.cpp b/src/managers/input/InputManager.cpp similarity index 97% rename from src/managers/InputManager.cpp rename to src/managers/input/InputManager.cpp index be861532..26e20ffb 100644 --- a/src/managers/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -1,5 +1,5 @@ #include "InputManager.hpp" -#include "../Compositor.hpp" +#include "../../Compositor.hpp" void CInputManager::onMouseMoved(wlr_pointer_motion_event* e) { @@ -500,3 +500,23 @@ void CInputManager::constrainMouse(SMouse* pMouse, wlr_pointer_constraint_v1* co void Events::listener_commitConstraint(void* owner, void* data) { //g_pInputManager->recheckConstraint((SMouse*)owner); } + +void CInputManager::updateCapabilities(wlr_input_device* pDev) { + // TODO: this is dumb + + 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; + } + + wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, m_uiCapabilities); +} \ No newline at end of file diff --git a/src/managers/InputManager.hpp b/src/managers/input/InputManager.hpp similarity index 69% rename from src/managers/InputManager.hpp rename to src/managers/input/InputManager.hpp index a6f436da..e83a1e34 100644 --- a/src/managers/InputManager.hpp +++ b/src/managers/input/InputManager.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../defines.hpp" +#include "../../defines.hpp" #include -#include "../helpers/WLClasses.hpp" -#include "../Window.hpp" +#include "../../helpers/WLClasses.hpp" +#include "../../Window.hpp" class CInputManager { public: @@ -28,6 +28,7 @@ public: void setKeyboardLayout(); void updateDragIcon(); + void updateCapabilities(wlr_input_device*); // for dragging floating windows @@ -40,11 +41,23 @@ public: std::list m_lKeyboards; std::list m_lMice; + // tablets + std::list m_lTablets; + std::list m_lTabletTools; + std::list m_lTabletPads; + + void newTabletTool(wlr_input_device*); + void newTabletPad(wlr_input_device*); + SKeyboard* m_pActiveKeyboard = nullptr; private: + uint32_t m_uiCapabilities = 0; + void mouseMoveUnified(uint32_t, bool refocus = false); + + STabletTool* ensureTabletToolPresent(STablet*, wlr_tablet_tool*); }; inline std::unique_ptr g_pInputManager; \ No newline at end of file diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp new file mode 100644 index 00000000..df0a7171 --- /dev/null +++ b/src/managers/input/Tablets.cpp @@ -0,0 +1,188 @@ +#include "InputManager.hpp" +#include "../../Compositor.hpp" + +void CInputManager::newTabletTool(wlr_input_device* pDevice) { + const auto PNEWTABLET = &m_lTablets.emplace_back(); + + PNEWTABLET->wlrTablet = pDevice->tablet; + PNEWTABLET->wlrDevice = pDevice; + PNEWTABLET->wlrTabletV2 = wlr_tablet_create(g_pCompositor->m_sWLRTabletManager, g_pCompositor->m_sSeat.seat, pDevice); + PNEWTABLET->wlrTablet->data = PNEWTABLET; + + wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, pDevice); + + PNEWTABLET->hyprListener_Destroy.initCallback(&pDevice->events.destroy, [](void* owner, void* data) { + const auto PTAB = (STablet*)owner; + + g_pInputManager->m_lTablets.remove(*PTAB); + + Debug::log(LOG, "Removed a tablet"); + }, PNEWTABLET, "Tablet"); + + PNEWTABLET->hyprListener_Axis.initCallback(&pDevice->tablet->events.axis, [](void* owner, void* data) { + + const auto EVENT = (wlr_tablet_tool_axis_event*)data; + const auto PTAB = (STablet*)owner; + + switch (EVENT->tool->type) { + case WLR_TABLET_TOOL_TYPE_MOUSE: + wlr_cursor_move(g_pCompositor->m_sWLRCursor, PTAB->wlrDevice, EVENT->dx, EVENT->dy); + g_pInputManager->refocus(); + break; + default: + double x = (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_X) ? EVENT->x : NAN; + double y = (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_Y) ? EVENT->y : NAN; + wlr_cursor_warp_absolute(g_pCompositor->m_sWLRCursor, PTAB->wlrDevice, x, y); + g_pInputManager->refocus(); + break; + } + + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + + // TODO: this might be wrong + if (PTOOL->active) + g_pInputManager->refocus(); + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) + wlr_tablet_v2_tablet_tool_notify_pressure(PTOOL->wlrTabletToolV2, EVENT->pressure); + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) + wlr_tablet_v2_tablet_tool_notify_distance(PTOOL->wlrTabletToolV2, EVENT->distance); + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) + wlr_tablet_v2_tablet_tool_notify_rotation(PTOOL->wlrTabletToolV2, EVENT->rotation); + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) + wlr_tablet_v2_tablet_tool_notify_slider(PTOOL->wlrTabletToolV2, EVENT->slider); + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) + wlr_tablet_v2_tablet_tool_notify_wheel(PTOOL->wlrTabletToolV2, EVENT->wheel_delta, 0); + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_X) + PTOOL->tiltX = EVENT->tilt_x; + + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_Y) + PTOOL->tiltY = EVENT->tilt_y; + + if (EVENT->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) + wlr_tablet_v2_tablet_tool_notify_tilt(PTOOL->wlrTabletToolV2, PTOOL->tiltX, PTOOL->tiltY); + + }, PNEWTABLET, "Tablet"); + + PNEWTABLET->hyprListener_Tip.initCallback(&pDevice->tablet->events.tip, [](void* owner, void* data) { + const auto EVENT = (wlr_tablet_tool_tip_event*)data; + const auto PTAB = (STablet*)owner; + + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + + // TODO: this might be wrong + if (EVENT->state == WLR_TABLET_TOOL_TIP_DOWN) + wlr_send_tablet_v2_tablet_tool_down(PTOOL->wlrTabletToolV2); + else + wlr_send_tablet_v2_tablet_tool_up(PTOOL->wlrTabletToolV2); + + }, PNEWTABLET, "Tablet"); + + PNEWTABLET->hyprListener_Button.initCallback(&pDevice->tablet->events.button, [](void* owner, void* data) { + const auto EVENT = (wlr_tablet_tool_button_event*)data; + const auto PTAB = (STablet*)owner; + + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + + wlr_tablet_v2_tablet_tool_notify_button(PTOOL->wlrTabletToolV2, (zwp_tablet_pad_v2_button_state)EVENT->button, (zwp_tablet_pad_v2_button_state)EVENT->state); + + }, PNEWTABLET, "Tablet"); + + PNEWTABLET->hyprListener_Proximity.initCallback(&pDevice->tablet->events.proximity, [](void* owner, void* data) { + const auto EVENT = (wlr_tablet_tool_proximity_event*)data; + const auto PTAB = (STablet*)owner; + + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + + if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { + PTOOL->active = false; + } else { + PTOOL->active = true; + g_pInputManager->refocus(); + } + + }, PNEWTABLET, "Tablet"); +} + +STabletTool* CInputManager::ensureTabletToolPresent(STablet* pTablet, wlr_tablet_tool* pTool) { + if (pTool->data == nullptr) { + const auto PTOOL = &m_lTabletTools.emplace_back(); + + PTOOL->wlrTabletTool = pTool; + pTool->data = PTOOL; + + PTOOL->wlrTabletToolV2 = wlr_tablet_tool_create(g_pCompositor->m_sWLRTabletManager, g_pCompositor->m_sSeat.seat, pTool); + + PTOOL->hyprListener_TabletToolDestroy.initCallback(&pTool->events.destroy, [](void* owner, void* data) { + const auto PTOOL = (STabletTool*)owner; + + PTOOL->wlrTabletTool->data = nullptr; + g_pInputManager->m_lTabletTools.remove(*PTOOL); + }, PTOOL, "Tablet Tool V1"); + + //TODO: set cursor request + } + + return (STabletTool*)pTool->data; +} + +void CInputManager::newTabletPad(wlr_input_device* pDevice) { + const auto PNEWPAD = &m_lTabletPads.emplace_back(); + + PNEWPAD->wlrTabletPadV2 = wlr_tablet_pad_create(g_pCompositor->m_sWLRTabletManager, g_pCompositor->m_sSeat.seat, pDevice); + + PNEWPAD->hyprListener_Button.initCallback(&pDevice->tablet_pad->events.button, [](void* owner, void* data) { + + const auto EVENT = (wlr_tablet_pad_button_event*)data; + const auto PPAD = (STabletPad*)owner; + + wlr_tablet_v2_tablet_pad_notify_mode(PPAD->wlrTabletPadV2, EVENT->group, EVENT->mode, EVENT->time_msec); + wlr_tablet_v2_tablet_pad_notify_button(PPAD->wlrTabletPadV2, EVENT->button, EVENT->time_msec, (zwp_tablet_pad_v2_button_state)EVENT->state); + + }, PNEWPAD, "Tablet Pad"); + + PNEWPAD->hyprListener_Strip.initCallback(&pDevice->tablet_pad->events.strip, [](void* owner, void* data) { + + const auto EVENT = (wlr_tablet_pad_strip_event*)data; + const auto PPAD = (STabletPad*)owner; + + wlr_tablet_v2_tablet_pad_notify_strip(PPAD->wlrTabletPadV2, EVENT->strip, EVENT->position, EVENT->source == WLR_TABLET_PAD_STRIP_SOURCE_FINGER, EVENT->time_msec); + + }, PNEWPAD, "Tablet Pad"); + + PNEWPAD->hyprListener_Ring.initCallback(&pDevice->tablet_pad->events.strip, [](void* owner, void* data) { + + const auto EVENT = (wlr_tablet_pad_ring_event*)data; + const auto PPAD = (STabletPad*)owner; + + wlr_tablet_v2_tablet_pad_notify_ring(PPAD->wlrTabletPadV2, EVENT->ring, EVENT->position, EVENT->source == WLR_TABLET_PAD_RING_SOURCE_FINGER, EVENT->time_msec); + + }, PNEWPAD, "Tablet Pad"); + + PNEWPAD->hyprListener_Attach.initCallback(&pDevice->tablet_pad->events.strip, [](void* owner, void* data) { + + const auto TABLET = (wlr_tablet_tool*)data; + const auto PPAD = (STabletPad*)owner; + + PPAD->pTabletParent = (STablet*)TABLET->data; + + if (!PPAD->pTabletParent) + Debug::log(ERR, "tabletpad got attached to a nullptr tablet!! this might be bad."); + + }, PNEWPAD, "Tablet Pad"); + + PNEWPAD->hyprListener_Destroy.initCallback(&pDevice->events.destroy, [](void* owner, void* data) { + + const auto PPAD = (STabletPad*)owner; + + g_pInputManager->m_lTabletPads.remove(*PPAD); + + Debug::log(LOG, "Removed a tablet pad"); + + }, PNEWPAD, "Tablet Pad"); +} \ No newline at end of file From 1841d244f03793acc260ddadd34d64095e08dfa2 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 14:40:56 +0200 Subject: [PATCH 02/13] log shit in tablets --- src/managers/input/Tablets.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index df0a7171..b6a3c7d7 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -9,6 +9,8 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PNEWTABLET->wlrTabletV2 = wlr_tablet_create(g_pCompositor->m_sWLRTabletManager, g_pCompositor->m_sSeat.seat, pDevice); PNEWTABLET->wlrTablet->data = PNEWTABLET; + Debug::log(LOG, "Attaching tablet to cursor!"); + wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, pDevice); PNEWTABLET->hyprListener_Destroy.initCallback(&pDevice->events.destroy, [](void* owner, void* data) { @@ -21,6 +23,8 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PNEWTABLET->hyprListener_Axis.initCallback(&pDevice->tablet->events.axis, [](void* owner, void* data) { + Debug::log(LOG, "Tablet axis"); + const auto EVENT = (wlr_tablet_tool_axis_event*)data; const auto PTAB = (STablet*)owner; @@ -73,6 +77,8 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_tip_event*)data; const auto PTAB = (STablet*)owner; + Debug::log(LOG, "Tablet tip"); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); // TODO: this might be wrong @@ -87,6 +93,8 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_button_event*)data; const auto PTAB = (STablet*)owner; + Debug::log(LOG, "Tablet button"); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); wlr_tablet_v2_tablet_tool_notify_button(PTOOL->wlrTabletToolV2, (zwp_tablet_pad_v2_button_state)EVENT->button, (zwp_tablet_pad_v2_button_state)EVENT->state); @@ -97,12 +105,16 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_proximity_event*)data; const auto PTAB = (STablet*)owner; + Debug::log(LOG, "Tablet proxim"); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { PTOOL->active = false; + Debug::log(LOG, "Tool active -> false"); } else { PTOOL->active = true; + Debug::log(LOG, "Tool active -> true"); g_pInputManager->refocus(); } @@ -113,6 +125,8 @@ STabletTool* CInputManager::ensureTabletToolPresent(STablet* pTablet, wlr_tablet if (pTool->data == nullptr) { const auto PTOOL = &m_lTabletTools.emplace_back(); + Debug::log(LOG, "Creating tablet tool v2 for %x", pTool); + PTOOL->wlrTabletTool = pTool; pTool->data = PTOOL; @@ -138,6 +152,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { PNEWPAD->hyprListener_Button.initCallback(&pDevice->tablet_pad->events.button, [](void* owner, void* data) { + Debug::log(LOG, "TabletPad button"); + const auto EVENT = (wlr_tablet_pad_button_event*)data; const auto PPAD = (STabletPad*)owner; @@ -151,6 +167,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_pad_strip_event*)data; const auto PPAD = (STabletPad*)owner; + Debug::log(LOG, "TabletPad strip"); + wlr_tablet_v2_tablet_pad_notify_strip(PPAD->wlrTabletPadV2, EVENT->strip, EVENT->position, EVENT->source == WLR_TABLET_PAD_STRIP_SOURCE_FINGER, EVENT->time_msec); }, PNEWPAD, "Tablet Pad"); @@ -160,6 +178,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_pad_ring_event*)data; const auto PPAD = (STabletPad*)owner; + Debug::log(LOG, "TabletPad ring"); + wlr_tablet_v2_tablet_pad_notify_ring(PPAD->wlrTabletPadV2, EVENT->ring, EVENT->position, EVENT->source == WLR_TABLET_PAD_RING_SOURCE_FINGER, EVENT->time_msec); }, PNEWPAD, "Tablet Pad"); @@ -169,6 +189,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto TABLET = (wlr_tablet_tool*)data; const auto PPAD = (STabletPad*)owner; + Debug::log(LOG, "TabletPad attach"); + PPAD->pTabletParent = (STablet*)TABLET->data; if (!PPAD->pTabletParent) @@ -180,6 +202,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto PPAD = (STabletPad*)owner; + Debug::log(LOG, "TabletPad destroy"); + g_pInputManager->m_lTabletPads.remove(*PPAD); Debug::log(LOG, "Removed a tablet pad"); From f97b90859ae95571a2a16cd9827f5f623369c732 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:03:34 +0200 Subject: [PATCH 03/13] Add envvars to exec cfg --- src/config/ConfigManager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index ad5ea5a7..56548580 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -156,8 +156,18 @@ void CConfigManager::configSetValueSafe(const std::string& COMMAND, const std::s void CConfigManager::handleRawExec(const std::string& command, const std::string& args) { // Exec in the background dont wait for it. + + std::string toExec = args; + + if (g_pXWaylandManager->m_sWLRXWayland) + toExec = std::string("WAYLAND_DISPLAY=") + std::string(g_pCompositor->m_szWLDisplaySocket) + " DISPLAY=" + std::string(g_pXWaylandManager->m_sWLRXWayland->display_name) + " " + toExec; + else + toExec = std::string("WAYLAND_DISPLAY=") + std::string(g_pCompositor->m_szWLDisplaySocket) + " " + toExec; + + Debug::log(LOG, "Config executing %s", toExec.c_str()); + if (fork() == 0) { - execl("/bin/sh", "/bin/sh", "-c", args.c_str(), nullptr); + execl("/bin/sh", "/bin/sh", "-c", toExec.c_str(), nullptr); _exit(0); } From c218ed443243017ca32a8b2dde4180f520c25c00 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 17:16:01 +0200 Subject: [PATCH 04/13] notify tablet motion --- src/managers/input/Tablets.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index b6a3c7d7..f46ad775 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -44,9 +44,18 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); // TODO: this might be wrong - if (PTOOL->active) + if (PTOOL->active) { g_pInputManager->refocus(); + if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { + const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); + + const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); + + wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); + } + } + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) wlr_tablet_v2_tablet_tool_notify_pressure(PTOOL->wlrTabletToolV2, EVENT->pressure); @@ -116,6 +125,14 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PTOOL->active = true; Debug::log(LOG, "Tool active -> true"); g_pInputManager->refocus(); + + if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { + const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); + + const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); + + wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); + } } }, PNEWTABLET, "Tablet"); From 49fc1ccdb4842749095ad1f00f988d928a6e3815 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 17:32:58 +0200 Subject: [PATCH 05/13] oops --- src/events/Layers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index a1aa7764..01cc25cc 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -26,7 +26,7 @@ void Events::listener_newLayerSurface(wl_listener* listener, void* data) { return; } - Debug::log(LOG, "New LayerSurface has no preferred monitor. Assigning Monitor %s", PMONITOR->szName); + Debug::log(LOG, "New LayerSurface has no preferred monitor. Assigning Monitor %s", PMONITOR->szName.c_str()); WLRLAYERSURFACE->output = PMONITOR->output; } From 824d8b954dd012a6a60c20ced71fdbb00ca3b35c Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 17:40:05 +0200 Subject: [PATCH 06/13] logify even more --- src/managers/input/Tablets.cpp | 40 +++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index f46ad775..bb139000 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -52,24 +52,36 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); + Debug::log(LOG, "Tablet Tool focus to %s", PWINDOW->m_szTitle.c_str()); + wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); } } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) { + Debug::log(LOG, "Updated pressure to %f", EVENT->pressure); wlr_tablet_v2_tablet_tool_notify_pressure(PTOOL->wlrTabletToolV2, EVENT->pressure); + } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) { + Debug::log(LOG, "Updated distance to %f", EVENT->distance); wlr_tablet_v2_tablet_tool_notify_distance(PTOOL->wlrTabletToolV2, EVENT->distance); + } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) { + Debug::log(LOG, "Updated rotation to %f", EVENT->rotation); wlr_tablet_v2_tablet_tool_notify_rotation(PTOOL->wlrTabletToolV2, EVENT->rotation); + } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) { + Debug::log(LOG, "Updated slider to %f", EVENT->slider); wlr_tablet_v2_tablet_tool_notify_slider(PTOOL->wlrTabletToolV2, EVENT->slider); + } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) { + Debug::log(LOG, "Updated wheel delta to %f", EVENT->wheel_delta); wlr_tablet_v2_tablet_tool_notify_wheel(PTOOL->wlrTabletToolV2, EVENT->wheel_delta, 0); + } if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_X) PTOOL->tiltX = EVENT->tilt_x; @@ -77,9 +89,10 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_Y) PTOOL->tiltY = EVENT->tilt_y; - if (EVENT->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) + if (EVENT->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)){ + Debug::log(LOG, "Updated tilt to %f, %f", EVENT->tilt_x, EVENT->tilt_y); wlr_tablet_v2_tablet_tool_notify_tilt(PTOOL->wlrTabletToolV2, PTOOL->tiltX, PTOOL->tiltY); - + } }, PNEWTABLET, "Tablet"); PNEWTABLET->hyprListener_Tip.initCallback(&pDevice->tablet->events.tip, [](void* owner, void* data) { @@ -91,10 +104,15 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); // TODO: this might be wrong - if (EVENT->state == WLR_TABLET_TOOL_TIP_DOWN) + if (EVENT->state == WLR_TABLET_TOOL_TIP_DOWN) { + Debug::log(LOG, "Tip down"); + g_pInputManager->refocus(); wlr_send_tablet_v2_tablet_tool_down(PTOOL->wlrTabletToolV2); - else + } + else { + Debug::log(LOG, "Tip up"); wlr_send_tablet_v2_tablet_tool_up(PTOOL->wlrTabletToolV2); + } }, PNEWTABLET, "Tablet"); @@ -125,12 +143,14 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PTOOL->active = true; Debug::log(LOG, "Tool active -> true"); g_pInputManager->refocus(); - + if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); + Debug::log(LOG, "Tablet Tool focus to %s", PWINDOW->m_szTitle.c_str()); + wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); } } From 6317f64ba0eb304de47bf3f5aa490d76ea0c4384 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:09:09 +0200 Subject: [PATCH 07/13] set proximity in tablets --- src/managers/input/InputManager.cpp | 2 +- src/managers/input/InputManager.hpp | 1 + src/managers/input/Tablets.cpp | 45 ++++++++++++++++------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 26e20ffb..775ee7b4 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -519,4 +519,4 @@ void CInputManager::updateCapabilities(wlr_input_device* pDev) { } wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, m_uiCapabilities); -} \ No newline at end of file +} diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp index e83a1e34..a1bc8db4 100644 --- a/src/managers/input/InputManager.hpp +++ b/src/managers/input/InputManager.hpp @@ -48,6 +48,7 @@ public: void newTabletTool(wlr_input_device*); void newTabletPad(wlr_input_device*); + void focusTablet(STablet*, wlr_tablet_tool*, bool motion = false); SKeyboard* m_pActiveKeyboard = nullptr; diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index bb139000..75ee0316 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -47,15 +47,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { if (PTOOL->active) { g_pInputManager->refocus(); - if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { - const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); - - const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); - - Debug::log(LOG, "Tablet Tool focus to %s", PWINDOW->m_szTitle.c_str()); - - wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); - } + g_pInputManager->focusTablet(PTAB, EVENT->tool, true); } if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) { @@ -107,6 +99,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { if (EVENT->state == WLR_TABLET_TOOL_TIP_DOWN) { Debug::log(LOG, "Tip down"); g_pInputManager->refocus(); + g_pInputManager->focusTablet(PTAB, EVENT->tool); wlr_send_tablet_v2_tablet_tool_down(PTOOL->wlrTabletToolV2); } else { @@ -143,16 +136,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PTOOL->active = true; Debug::log(LOG, "Tool active -> true"); g_pInputManager->refocus(); - - if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { - const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); - - const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); - - Debug::log(LOG, "Tablet Tool focus to %s", PWINDOW->m_szTitle.c_str()); - - wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); - } + g_pInputManager->focusTablet(PTAB, EVENT->tool); } }, PNEWTABLET, "Tablet"); @@ -246,4 +230,25 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { Debug::log(LOG, "Removed a tablet pad"); }, PNEWPAD, "Tablet Pad"); -} \ No newline at end of file +} + +void CInputManager::focusTablet(STablet* pTab, wlr_tablet_tool* pTool, bool motion) { + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(pTab, pTool); + + if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { + const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); + + const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); + + Debug::log(LOG, "Tablet Tool focus to %s", PWINDOW->m_szTitle.c_str()); + + if (PTOOL->wlrTabletToolV2->focused_surface != g_pCompositor->m_pLastFocus) + wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); + + if (g_pCompositor->m_pLastFocus) + wlr_tablet_v2_tablet_tool_notify_proximity_in(PTOOL->wlrTabletToolV2, pTab->wlrTabletV2, g_pCompositor->m_pLastFocus); + + if (motion) + wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); + } +} From 8929172bc2cbd9e0c931065091d45f2012466d33 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 19:19:42 +0200 Subject: [PATCH 08/13] remove redundant logs --- src/managers/input/Tablets.cpp | 49 +++++----------------------------- 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index 75ee0316..32eef28d 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -23,8 +23,6 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PNEWTABLET->hyprListener_Axis.initCallback(&pDevice->tablet->events.axis, [](void* owner, void* data) { - Debug::log(LOG, "Tablet axis"); - const auto EVENT = (wlr_tablet_tool_axis_event*)data; const auto PTAB = (STablet*)owner; @@ -50,30 +48,20 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { g_pInputManager->focusTablet(PTAB, EVENT->tool, true); } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) { - Debug::log(LOG, "Updated pressure to %f", EVENT->pressure); + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) wlr_tablet_v2_tablet_tool_notify_pressure(PTOOL->wlrTabletToolV2, EVENT->pressure); - } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) { - Debug::log(LOG, "Updated distance to %f", EVENT->distance); + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) wlr_tablet_v2_tablet_tool_notify_distance(PTOOL->wlrTabletToolV2, EVENT->distance); - } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) { - Debug::log(LOG, "Updated rotation to %f", EVENT->rotation); + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) wlr_tablet_v2_tablet_tool_notify_rotation(PTOOL->wlrTabletToolV2, EVENT->rotation); - } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) { - Debug::log(LOG, "Updated slider to %f", EVENT->slider); + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) wlr_tablet_v2_tablet_tool_notify_slider(PTOOL->wlrTabletToolV2, EVENT->slider); - } - if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) { - Debug::log(LOG, "Updated wheel delta to %f", EVENT->wheel_delta); + if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) wlr_tablet_v2_tablet_tool_notify_wheel(PTOOL->wlrTabletToolV2, EVENT->wheel_delta, 0); - } if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_X) PTOOL->tiltX = EVENT->tilt_x; @@ -81,29 +69,24 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { if (EVENT->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_Y) PTOOL->tiltY = EVENT->tilt_y; - if (EVENT->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)){ - Debug::log(LOG, "Updated tilt to %f, %f", EVENT->tilt_x, EVENT->tilt_y); + if (EVENT->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) wlr_tablet_v2_tablet_tool_notify_tilt(PTOOL->wlrTabletToolV2, PTOOL->tiltX, PTOOL->tiltY); - } + }, PNEWTABLET, "Tablet"); PNEWTABLET->hyprListener_Tip.initCallback(&pDevice->tablet->events.tip, [](void* owner, void* data) { const auto EVENT = (wlr_tablet_tool_tip_event*)data; const auto PTAB = (STablet*)owner; - Debug::log(LOG, "Tablet tip"); - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); // TODO: this might be wrong if (EVENT->state == WLR_TABLET_TOOL_TIP_DOWN) { - Debug::log(LOG, "Tip down"); g_pInputManager->refocus(); g_pInputManager->focusTablet(PTAB, EVENT->tool); wlr_send_tablet_v2_tablet_tool_down(PTOOL->wlrTabletToolV2); } else { - Debug::log(LOG, "Tip up"); wlr_send_tablet_v2_tablet_tool_up(PTOOL->wlrTabletToolV2); } @@ -113,8 +96,6 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_button_event*)data; const auto PTAB = (STablet*)owner; - Debug::log(LOG, "Tablet button"); - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); wlr_tablet_v2_tablet_tool_notify_button(PTOOL->wlrTabletToolV2, (zwp_tablet_pad_v2_button_state)EVENT->button, (zwp_tablet_pad_v2_button_state)EVENT->state); @@ -125,16 +106,12 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_proximity_event*)data; const auto PTAB = (STablet*)owner; - Debug::log(LOG, "Tablet proxim"); - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { PTOOL->active = false; - Debug::log(LOG, "Tool active -> false"); } else { PTOOL->active = true; - Debug::log(LOG, "Tool active -> true"); g_pInputManager->refocus(); g_pInputManager->focusTablet(PTAB, EVENT->tool); } @@ -173,8 +150,6 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { PNEWPAD->hyprListener_Button.initCallback(&pDevice->tablet_pad->events.button, [](void* owner, void* data) { - Debug::log(LOG, "TabletPad button"); - const auto EVENT = (wlr_tablet_pad_button_event*)data; const auto PPAD = (STabletPad*)owner; @@ -188,8 +163,6 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_pad_strip_event*)data; const auto PPAD = (STabletPad*)owner; - Debug::log(LOG, "TabletPad strip"); - wlr_tablet_v2_tablet_pad_notify_strip(PPAD->wlrTabletPadV2, EVENT->strip, EVENT->position, EVENT->source == WLR_TABLET_PAD_STRIP_SOURCE_FINGER, EVENT->time_msec); }, PNEWPAD, "Tablet Pad"); @@ -199,8 +172,6 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_pad_ring_event*)data; const auto PPAD = (STabletPad*)owner; - Debug::log(LOG, "TabletPad ring"); - wlr_tablet_v2_tablet_pad_notify_ring(PPAD->wlrTabletPadV2, EVENT->ring, EVENT->position, EVENT->source == WLR_TABLET_PAD_RING_SOURCE_FINGER, EVENT->time_msec); }, PNEWPAD, "Tablet Pad"); @@ -210,8 +181,6 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto TABLET = (wlr_tablet_tool*)data; const auto PPAD = (STabletPad*)owner; - Debug::log(LOG, "TabletPad attach"); - PPAD->pTabletParent = (STablet*)TABLET->data; if (!PPAD->pTabletParent) @@ -223,8 +192,6 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto PPAD = (STabletPad*)owner; - Debug::log(LOG, "TabletPad destroy"); - g_pInputManager->m_lTabletPads.remove(*PPAD); Debug::log(LOG, "Removed a tablet pad"); @@ -240,8 +207,6 @@ void CInputManager::focusTablet(STablet* pTab, wlr_tablet_tool* pTool, bool moti const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); - Debug::log(LOG, "Tablet Tool focus to %s", PWINDOW->m_szTitle.c_str()); - if (PTOOL->wlrTabletToolV2->focused_surface != g_pCompositor->m_pLastFocus) wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); From b53c093b8846c8029954908a5620e82a91b6090b Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 19:25:26 +0200 Subject: [PATCH 09/13] log tablets in hyprctl --- src/debug/HyprCtl.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index 0699921a..83656e13 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -88,6 +88,20 @@ std::string devicesRequest() { result += getFormat("\tKeyboard at %x:\n\t\t%s\n", &k, k.keyboard->name); } + result += "\n\nTablets:\n"; + + for (auto& d : g_pInputManager->m_lTabletPads) { + result += getFormat("\tTablet Pad at %x (belongs to %x -> %s)\n", &d, d.pTabletParent, d.pTabletParent ? d.pTabletParent->wlrDevice ? d.pTabletParent->wlrDevice->name : "" : ""); + } + + for (auto& d : g_pInputManager->m_lTablets) { + result += getFormat("\tTablet at %x:\n\t\t%s\n", &d, d.wlrDevice ? d.wlrDevice->name : ""); + } + + for (auto& d : g_pInputManager->m_lTabletTools) { + result += getFormat("\tTablet Tool at %x (belongs to %x)\n", &d, d.wlrTabletTool ? d.wlrTabletTool->data : 0); + } + return result; } From 09b130374df035188b34a36e55d6fdda935c7df8 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 19:38:39 +0200 Subject: [PATCH 10/13] unfocus tablets --- src/managers/input/InputManager.cpp | 3 +++ src/managers/input/InputManager.hpp | 4 +++- src/managers/input/Tablets.cpp | 23 +++++++++++++++++------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 775ee7b4..79d4f305 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -2,6 +2,7 @@ #include "../../Compositor.hpp" void CInputManager::onMouseMoved(wlr_pointer_motion_event* e) { + unfocusAllTablets(); float sensitivity = g_pConfigManager->getFloat("general:sensitivity"); @@ -18,6 +19,8 @@ void CInputManager::onMouseMoved(wlr_pointer_motion_event* e) { } void CInputManager::onMouseWarp(wlr_pointer_motion_absolute_event* e) { + unfocusAllTablets(); + wlr_cursor_warp_absolute(g_pCompositor->m_sWLRCursor, &e->pointer->base, e->x, e->y); mouseMoveUnified(e->time_msec); diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp index a1bc8db4..1cd99658 100644 --- a/src/managers/input/InputManager.hpp +++ b/src/managers/input/InputManager.hpp @@ -58,7 +58,9 @@ public: void mouseMoveUnified(uint32_t, bool refocus = false); - STabletTool* ensureTabletToolPresent(STablet*, wlr_tablet_tool*); + STabletTool* ensureTabletToolPresent(wlr_tablet_tool*); + + void unfocusAllTablets(); }; inline std::unique_ptr g_pInputManager; \ No newline at end of file diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index 32eef28d..5029ac45 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -39,7 +39,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { break; } - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(EVENT->tool); // TODO: this might be wrong if (PTOOL->active) { @@ -78,7 +78,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_tip_event*)data; const auto PTAB = (STablet*)owner; - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(EVENT->tool); // TODO: this might be wrong if (EVENT->state == WLR_TABLET_TOOL_TIP_DOWN) { @@ -96,7 +96,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_button_event*)data; const auto PTAB = (STablet*)owner; - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(EVENT->tool); wlr_tablet_v2_tablet_tool_notify_button(PTOOL->wlrTabletToolV2, (zwp_tablet_pad_v2_button_state)EVENT->button, (zwp_tablet_pad_v2_button_state)EVENT->state); @@ -106,7 +106,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { const auto EVENT = (wlr_tablet_tool_proximity_event*)data; const auto PTAB = (STablet*)owner; - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(EVENT->tool); if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { PTOOL->active = false; @@ -119,7 +119,7 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { }, PNEWTABLET, "Tablet"); } -STabletTool* CInputManager::ensureTabletToolPresent(STablet* pTablet, wlr_tablet_tool* pTool) { +STabletTool* CInputManager::ensureTabletToolPresent(wlr_tablet_tool* pTool) { if (pTool->data == nullptr) { const auto PTOOL = &m_lTabletTools.emplace_back(); @@ -200,7 +200,7 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { } void CInputManager::focusTablet(STablet* pTab, wlr_tablet_tool* pTool, bool motion) { - const auto PTOOL = g_pInputManager->ensureTabletToolPresent(pTab, pTool); + const auto PTOOL = g_pInputManager->ensureTabletToolPresent(pTool); if (const auto PWINDOW = g_pCompositor->m_pLastWindow; g_pCompositor->windowValidMapped(PWINDOW)) { const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal(); @@ -215,5 +215,16 @@ void CInputManager::focusTablet(STablet* pTab, wlr_tablet_tool* pTool, bool moti if (motion) wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); + } else { + wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); } } + +void CInputManager::unfocusAllTablets() { + for (auto& tt : m_lTabletTools) { + if (!tt.wlrTabletTool->data) + continue; + + wlr_tablet_v2_tablet_tool_notify_proximity_out(((STabletTool*)tt.wlrTabletTool->data)->wlrTabletToolV2); + } +} \ No newline at end of file From 506977c13d118feedffb7b7fc10d5b16e5400f78 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 19:40:16 +0200 Subject: [PATCH 11/13] unfocus on destroy --- src/managers/input/Tablets.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index 5029ac45..bb2c5c6d 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -16,6 +16,8 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { PNEWTABLET->hyprListener_Destroy.initCallback(&pDevice->events.destroy, [](void* owner, void* data) { const auto PTAB = (STablet*)owner; + g_pInputManager->unfocusAllTablets(); + g_pInputManager->m_lTablets.remove(*PTAB); Debug::log(LOG, "Removed a tablet"); @@ -133,6 +135,8 @@ STabletTool* CInputManager::ensureTabletToolPresent(wlr_tablet_tool* pTool) { PTOOL->hyprListener_TabletToolDestroy.initCallback(&pTool->events.destroy, [](void* owner, void* data) { const auto PTOOL = (STabletTool*)owner; + g_pInputManager->unfocusAllTablets(); + PTOOL->wlrTabletTool->data = nullptr; g_pInputManager->m_lTabletTools.remove(*PTOOL); }, PTOOL, "Tablet Tool V1"); @@ -192,6 +196,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) { const auto PPAD = (STabletPad*)owner; + g_pInputManager->unfocusAllTablets(); + g_pInputManager->m_lTabletPads.remove(*PPAD); Debug::log(LOG, "Removed a tablet pad"); From 53146ccf69a53850f8ad2af85f0ccf6e1143b878 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 19:47:05 +0200 Subject: [PATCH 12/13] oopsie --- src/helpers/WLClasses.hpp | 2 ++ src/managers/input/Tablets.cpp | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/helpers/WLClasses.hpp b/src/helpers/WLClasses.hpp index 723ffdff..534b0de6 100644 --- a/src/helpers/WLClasses.hpp +++ b/src/helpers/WLClasses.hpp @@ -177,6 +177,8 @@ struct STabletTool { wlr_tablet_v2_tablet* wlrTabletOwnerV2 = nullptr; + wlr_surface* pSurface = nullptr; + double tiltX = 0; double tiltY = 0; diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index bb2c5c6d..d21ef518 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -213,24 +213,27 @@ void CInputManager::focusTablet(STablet* pTab, wlr_tablet_tool* pTool, bool moti const auto LOCAL = CURSORPOS - PWINDOW->m_vRealPosition.goalv(); - if (PTOOL->wlrTabletToolV2->focused_surface != g_pCompositor->m_pLastFocus) + if (PTOOL->pSurface != g_pCompositor->m_pLastFocus) wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); - if (g_pCompositor->m_pLastFocus) + if (g_pCompositor->m_pLastFocus) { + PTOOL->pSurface = g_pCompositor->m_pLastFocus; wlr_tablet_v2_tablet_tool_notify_proximity_in(PTOOL->wlrTabletToolV2, pTab->wlrTabletV2, g_pCompositor->m_pLastFocus); + } if (motion) wlr_tablet_v2_tablet_tool_notify_motion(PTOOL->wlrTabletToolV2, LOCAL.x, LOCAL.y); } else { - wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); + if (PTOOL->pSurface) + wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); } } void CInputManager::unfocusAllTablets() { for (auto& tt : m_lTabletTools) { - if (!tt.wlrTabletTool->data) + if (!tt.wlrTabletToolV2 || !tt.pSurface || !tt.active) continue; - wlr_tablet_v2_tablet_tool_notify_proximity_out(((STabletTool*)tt.wlrTabletTool->data)->wlrTabletToolV2); + wlr_tablet_v2_tablet_tool_notify_proximity_out(tt.wlrTabletToolV2); } } \ No newline at end of file From fbc78534599f3129b11899795ba3d099eae4c5fd Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 9 Jun 2022 21:19:31 +0200 Subject: [PATCH 13/13] de-focusify on lost proximity --- src/managers/input/Tablets.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp index d21ef518..3977fc94 100644 --- a/src/managers/input/Tablets.cpp +++ b/src/managers/input/Tablets.cpp @@ -112,6 +112,12 @@ void CInputManager::newTabletTool(wlr_input_device* pDevice) { if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { PTOOL->active = false; + + if (PTOOL->pSurface) { + wlr_tablet_v2_tablet_tool_notify_proximity_out(PTOOL->wlrTabletToolV2); + PTOOL->pSurface = nullptr; + } + } else { PTOOL->active = true; g_pInputManager->refocus();