hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 12:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

keybindmanager doesnt work and will crash on bindo rn. need fix

Browse source
This commit is contained in:
littleblack111 2024-11-07 13:09:25 +08:00 committed by Vaxry
parent b6f41f8d77
commit 6b9a9af9a8
2 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/managers/KeybindManager.cpp
View file

@ -13,6 +13,7 @@
#include "eventLoop/EventLoopManager.hpp" #include "eventLoop/EventLoopManager.hpp"
#include "debug/Log.hpp" #include "debug/Log.hpp"
#include "helpers/varlist/VarList.hpp" #include "helpers/varlist/VarList.hpp"
#include "eventLoop/EventLoopManager.hpp"
#include <optional> #include <optional>
#include <iterator> #include <iterator>
@ -130,6 +131,27 @@ CKeybindManager::CKeybindManager() {
m_tScrollTimer.reset(); m_tScrollTimer.reset();
m_pLongPressTimer = makeShared<CEventLoopTimer>(
std::nullopt,
[this](SP<CEventLoopTimer> self, void* data) {
SKeybind** ppActiveKeybind = (SKeybind**)m_pActiveKeybind;
if (!m_pActiveKeybind)
return 0;
// if (!*ppActiveKeybind || g_pSeatManager->keyboard.expired())
// return 0;
// const auto DISPATCHER = g_pKeybindManager->m_mDispatchers.find((*ppActiveKeybind)->handler);
// Debug::log(LOG, "Keybind long press triggered, calling dispatcher.");
// DISPATCHER->second((*ppActiveKeybind)->arg);
},
nullptr
);
g_pEventLoopManager->addTimer(m_pLongPressTimer);
static auto P = g_pHookSystem->hookDynamic("configReloaded", [this](void* hk, SCallbackInfo& info, std::any param) { static auto P = g_pHookSystem->hookDynamic("configReloaded", [this](void* hk, SCallbackInfo& info, std::any param) {
// clear cuz realloc'd // clear cuz realloc'd
m_pActiveKeybind = nullptr; m_pActiveKeybind = nullptr;
@ -140,6 +162,10 @@ CKeybindManager::CKeybindManager() {
CKeybindManager::~CKeybindManager() { CKeybindManager::~CKeybindManager() {
if (m_pXKBTranslationState) if (m_pXKBTranslationState)
xkb_state_unref(m_pXKBTranslationState); xkb_state_unref(m_pXKBTranslationState);
if (m_pLongPressTimer && g_pEventLoopManager) {
g_pEventLoopManager->removeTimer(m_pLongPressTimer);
m_pLongPressTimer.reset();
}
} }
void CKeybindManager::addKeybind(SKeybind kb) { void CKeybindManager::addKeybind(SKeybind kb) {
@ -567,16 +593,8 @@ int repeatKeyHandler(void* data) {
return 0; return 0;
} }
int longPressHandler(void* data) { int longPressHandler(SP<CEventLoopTimer> self, void* data) {
SKeybind** ppActiveKeybind = (SKeybind**)data;
if (!*ppActiveKeybind || g_pSeatManager->keyboard.expired())
return 0;
const auto DISPATCHER = g_pKeybindManager->m_mDispatchers.find((*ppActiveKeybind)->handler);
Debug::log(LOG, "Keybind long press triggered, calling dispatcher.");
DISPATCHER->second((*ppActiveKeybind)->arg);
return 0; return 0;
} }
@ -695,6 +713,17 @@ SDispatchResult CKeybindManager::handleKeybinds(const uint32_t modmask, const SP
continue; continue;
} }
if (k.longPress) {
m_pActiveKeybind = &k;
const auto PACTIVEKEEB = g_pSeatManager->keyboard.lock();
m_pLongPressTimer->updateTimeout(std::chrono::milliseconds(PACTIVEKEEB->repeatDelay));
// m_pLastLongPressKeybind = &k;
// continue;
}
if (!pressed) { if (!pressed) {
// Require mods to be matching when the key was first pressed. // Require mods to be matching when the key was first pressed.
if (key.modmaskAtPressTime != modmask && !k.ignoreMods) { if (key.modmaskAtPressTime != modmask && !k.ignoreMods) {
@ -714,17 +743,6 @@ SDispatchResult CKeybindManager::handleKeybinds(const uint32_t modmask, const SP
continue; continue;
} }
} }
if (k.longPress) {
m_pActiveKeybind = &k;
m_pActiveKeybindEventSource = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, longPressHandler, &m_pActiveKeybind);
const auto PACTIVEKEEB = g_pSeatManager->keyboard.lock();
wl_event_source_timer_update(m_pActiveKeybindEventSource, PACTIVEKEEB->repeatDelay);
continue;
}
const auto DISPATCHER = m_mDispatchers.find(k.mouse ? "mouse" : k.handler); const auto DISPATCHER = m_mDispatchers.find(k.mouse ? "mouse" : k.handler);
if (SPECIALTRIGGERED && !pressed) if (SPECIALTRIGGERED && !pressed)
@ -753,7 +771,7 @@ SDispatchResult CKeybindManager::handleKeybinds(const uint32_t modmask, const SP
found = true; // don't process keybinds on submap change. found = true; // don't process keybinds on submap change.
break; break;
} }
} }
if (k.repeat) { if (k.repeat) {
m_pActiveKeybind = &k; m_pActiveKeybind = &k;

2
src/managers/KeybindManager.hpp
View file

@ -8,6 +8,7 @@
#include <functional> #include <functional>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include "../devices/IPointer.hpp" #include "../devices/IPointer.hpp"
#include "eventLoop/EventLoopTimer.hpp"
class CInputManager; class CInputManager;
class CConfigManager; class CConfigManager;
@ -121,6 +122,7 @@ class CKeybindManager {
inline static std::string m_szCurrentSelectedSubmap = ""; inline static std::string m_szCurrentSelectedSubmap = "";
SKeybind* m_pActiveKeybind = nullptr; SKeybind* m_pActiveKeybind = nullptr;
SP<CEventLoopTimer> m_pLongPressTimer;
uint32_t m_uTimeLastMs = 0; uint32_t m_uTimeLastMs = 0;
uint32_t m_uLastCode = 0; uint32_t m_uLastCode = 0;