hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-02-17 01:02:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

log shit in tablets

Browse source
This commit is contained in:
vaxerski 2022-06-09 14:40:56 +02:00
parent 47404534d0
commit 1841d244f0
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/managers/input/Tablets.cpp
View file

@ -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->wlrTabletV2 = wlr_tablet_create(g_pCompositor->m_sWLRTabletManager, g_pCompositor->m_sSeat.seat, pDevice);
PNEWTABLET->wlrTablet->data = PNEWTABLET; PNEWTABLET->wlrTablet->data = PNEWTABLET;
Debug::log(LOG, "Attaching tablet to cursor!");
wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, pDevice); wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, pDevice);
PNEWTABLET->hyprListener_Destroy.initCallback(&pDevice->events.destroy, [](void* owner, void* data) { 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) { 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 EVENT = (wlr_tablet_tool_axis_event*)data;
const auto PTAB = (STablet*)owner; 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 EVENT = (wlr_tablet_tool_tip_event*)data;
const auto PTAB = (STablet*)owner; const auto PTAB = (STablet*)owner;
Debug::log(LOG, "Tablet tip");
const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool);
// TODO: this might be wrong // 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 EVENT = (wlr_tablet_tool_button_event*)data;
const auto PTAB = (STablet*)owner; const auto PTAB = (STablet*)owner;
Debug::log(LOG, "Tablet button");
const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); 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); 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 EVENT = (wlr_tablet_tool_proximity_event*)data;
const auto PTAB = (STablet*)owner; const auto PTAB = (STablet*)owner;
Debug::log(LOG, "Tablet proxim");
const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool); const auto PTOOL = g_pInputManager->ensureTabletToolPresent(PTAB, EVENT->tool);
if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) { if (EVENT->state == WLR_TABLET_TOOL_PROXIMITY_OUT) {
PTOOL->active = false; PTOOL->active = false;
Debug::log(LOG, "Tool active -> false");
} else { } else {
PTOOL->active = true; PTOOL->active = true;
Debug::log(LOG, "Tool active -> true");
g_pInputManager->refocus(); g_pInputManager->refocus();
} }
@ -113,6 +125,8 @@ STabletTool* CInputManager::ensureTabletToolPresent(STablet* pTablet, wlr_tablet
if (pTool->data == nullptr) { if (pTool->data == nullptr) {
const auto PTOOL = &m_lTabletTools.emplace_back(); const auto PTOOL = &m_lTabletTools.emplace_back();
Debug::log(LOG, "Creating tablet tool v2 for %x", pTool);
PTOOL->wlrTabletTool = pTool; PTOOL->wlrTabletTool = pTool;
pTool->data = 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) { 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 EVENT = (wlr_tablet_pad_button_event*)data;
const auto PPAD = (STabletPad*)owner; 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 EVENT = (wlr_tablet_pad_strip_event*)data;
const auto PPAD = (STabletPad*)owner; 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); 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, "Tablet Pad");
@ -160,6 +178,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) {
const auto EVENT = (wlr_tablet_pad_ring_event*)data; const auto EVENT = (wlr_tablet_pad_ring_event*)data;
const auto PPAD = (STabletPad*)owner; 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); 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, "Tablet Pad");
@ -169,6 +189,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) {
const auto TABLET = (wlr_tablet_tool*)data; const auto TABLET = (wlr_tablet_tool*)data;
const auto PPAD = (STabletPad*)owner; const auto PPAD = (STabletPad*)owner;
Debug::log(LOG, "TabletPad attach");
PPAD->pTabletParent = (STablet*)TABLET->data; PPAD->pTabletParent = (STablet*)TABLET->data;
if (!PPAD->pTabletParent) if (!PPAD->pTabletParent)
@ -180,6 +202,8 @@ void CInputManager::newTabletPad(wlr_input_device* pDevice) {
const auto PPAD = (STabletPad*)owner; const auto PPAD = (STabletPad*)owner;
Debug::log(LOG, "TabletPad destroy");
g_pInputManager->m_lTabletPads.remove(*PPAD); g_pInputManager->m_lTabletPads.remove(*PPAD);
Debug::log(LOG, "Removed a tablet pad"); Debug::log(LOG, "Removed a tablet pad");