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

virtual-keyboard: destroy on vdestroy event

Browse source
This commit is contained in:
Vaxry 2024-05-03 00:54:32 +01:00
parent 6aa2d123ae
commit 7d49819b5e
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/helpers/WLClasses.hpp
View file

@ -7,6 +7,7 @@
#include "../desktop/Popup.hpp" #include "../desktop/Popup.hpp"
#include "AnimatedVariable.hpp" #include "AnimatedVariable.hpp"
#include "../desktop/WLSurface.hpp" #include "../desktop/WLSurface.hpp"
#include "signal/Listener.hpp"
#include "Region.hpp" #include "Region.hpp"
class CMonitor; class CMonitor;
@ -92,6 +93,10 @@ struct SKeyboard {
void updateXKBTranslationState(xkb_keymap* const keymap = nullptr); void updateXKBTranslationState(xkb_keymap* const keymap = nullptr);
struct {
CHyprSignalListener destroyVKeyboard;
} listeners;
// For the list lookup // For the list lookup
bool operator==(const SKeyboard& rhs) const { bool operator==(const SKeyboard& rhs) const {
return keyboard == rhs.keyboard; return keyboard == rhs.keyboard;

3
src/managers/input/InputManager.cpp
View file

@ -816,6 +816,9 @@ void CInputManager::newVirtualKeyboard(SP<CVirtualKeyboard> keyboard) {
}, },
PNEWKEYBOARD, "VKeyboard"); PNEWKEYBOARD, "VKeyboard");
// TODO: this pointer pass sucks.
PNEWKEYBOARD->listeners.destroyVKeyboard = keyboard->events.destroy.registerListener([this, PNEWKEYBOARD](std::any data) { destroyKeyboard(PNEWKEYBOARD); });
disableAllKeyboards(true); disableAllKeyboards(true);
m_pActiveKeyboard = PNEWKEYBOARD; m_pActiveKeyboard = PNEWKEYBOARD;