summaryrefslogtreecommitdiff
path: root/src/devices/VirtualKeyboard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/VirtualKeyboard.cpp')
-rw-r--r--src/devices/VirtualKeyboard.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/VirtualKeyboard.cpp b/src/devices/VirtualKeyboard.cpp
index 548711c2..4fb25b5b 100644
--- a/src/devices/VirtualKeyboard.cpp
+++ b/src/devices/VirtualKeyboard.cpp
@@ -5,43 +5,43 @@
SP<CVirtualKeyboard> CVirtualKeyboard::create(SP<CVirtualKeyboardV1Resource> keeb) {
SP<CVirtualKeyboard> pKeeb = SP<CVirtualKeyboard>(new CVirtualKeyboard(keeb));
- pKeeb->self = pKeeb;
+ pKeeb->m_self = pKeeb;
return pKeeb;
}
-CVirtualKeyboard::CVirtualKeyboard(SP<CVirtualKeyboardV1Resource> keeb_) : keyboard(keeb_) {
+CVirtualKeyboard::CVirtualKeyboard(SP<CVirtualKeyboardV1Resource> keeb_) : m_keyboard(keeb_) {
if (!keeb_)
return;
- listeners.destroy = keeb_->events.destroy.registerListener([this](std::any d) {
- keyboard.reset();
- events.destroy.emit();
+ m_listeners.destroy = keeb_->events.destroy.registerListener([this](std::any d) {
+ m_keyboard.reset();
+ m_events.destroy.emit();
});
- listeners.key = keeb_->events.key.registerListener([this](std::any d) { keyboardEvents.key.emit(d); });
- listeners.modifiers = keeb_->events.modifiers.registerListener([this](std::any d) {
+ m_listeners.key = keeb_->events.key.registerListener([this](std::any d) { m_keyboardEvents.key.emit(d); });
+ m_listeners.modifiers = keeb_->events.modifiers.registerListener([this](std::any d) {
auto E = std::any_cast<SModifiersEvent>(d);
updateModifiers(E.depressed, E.latched, E.locked, E.group);
- keyboardEvents.modifiers.emit(SModifiersEvent{
- .depressed = modifiersState.depressed,
- .latched = modifiersState.latched,
- .locked = modifiersState.locked,
- .group = modifiersState.group,
+ m_keyboardEvents.modifiers.emit(SModifiersEvent{
+ .depressed = m_modifiersState.depressed,
+ .latched = m_modifiersState.latched,
+ .locked = m_modifiersState.locked,
+ .group = m_modifiersState.group,
});
});
- listeners.keymap = keeb_->events.keymap.registerListener([this](std::any d) {
+ m_listeners.keymap = keeb_->events.keymap.registerListener([this](std::any d) {
auto E = std::any_cast<SKeymapEvent>(d);
- if (xkbKeymap)
- xkb_keymap_unref(xkbKeymap);
- xkbKeymap = xkb_keymap_ref(E.keymap);
- keymapOverridden = true;
- updateXKBTranslationState(xkbKeymap);
+ if (m_xkbKeymap)
+ xkb_keymap_unref(m_xkbKeymap);
+ m_xkbKeymap = xkb_keymap_ref(E.keymap);
+ m_keymapOverridden = true;
+ updateXKBTranslationState(m_xkbKeymap);
updateKeymapFD();
- keyboardEvents.keymap.emit(d);
+ m_keyboardEvents.keymap.emit(d);
});
- deviceName = keeb_->name;
+ m_deviceName = keeb_->name;
}
bool CVirtualKeyboard::isVirtual() {
@@ -53,7 +53,7 @@ SP<Aquamarine::IKeyboard> CVirtualKeyboard::aq() {
}
wl_client* CVirtualKeyboard::getClient() {
- if (keyboard.expired())
+ if (m_keyboard.expired())
return nullptr;
- return keyboard->client();
+ return m_keyboard->client();
}