smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: XWindowsKeyState, use auto where possible

Browse source
This commit is contained in:
sithlord48 2025-04-27 13:06:46 -04:00 committed by Nick Bolton
parent b103f28202
commit 352a871729
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/platform/XWindowsKeyState.cpp
View file

@ -361,7 +361,7 @@ void XWindowsKeyState::updateKeysymMap(deskflow::KeyMap &keyMap)
// it's more convenient to always have maxKeysyms KeySyms per key // it's more convenient to always have maxKeysyms KeySyms per key
{ {
KeySym *tmpKeysyms = new KeySym[maxKeysyms * numKeycodes]; auto *tmpKeysyms = new KeySym[maxKeysyms * numKeycodes];
for (int i = 0; i < numKeycodes; ++i) { for (int i = 0; i < numKeycodes; ++i) {
for (int j = 0; j < maxKeysyms; ++j) { for (int j = 0; j < maxKeysyms; ++j) {
if (j < keysymsPerKeycode) { if (j < keysymsPerKeycode) {
@ -420,7 +420,7 @@ void XWindowsKeyState::updateKeysymMap(deskflow::KeyMap &keyMap)
deskflow::KeyMap::KeyItem item; deskflow::KeyMap::KeyItem item;
for (int i = 0; i < numKeycodes; ++i) { for (int i = 0; i < numKeycodes; ++i) {
KeySym *keysyms = allKeysyms + maxKeysyms * i; KeySym *keysyms = allKeysyms + maxKeysyms * i;
KeyCode keycode = static_cast<KeyCode>(i + minKeycode); auto keycode = static_cast<KeyCode>(i + minKeycode);
item.m_button = static_cast<KeyButton>(keycode); item.m_button = static_cast<KeyButton>(keycode);
item.m_client = 0; item.m_client = 0;
@ -601,7 +601,7 @@ void XWindowsKeyState::updateKeysymMapXKB(deskflow::KeyMap &keyMap)
// X modifier masks. // X modifier masks.
deskflow::KeyMap::KeyItem item; deskflow::KeyMap::KeyItem item;
for (int i = m_xkb->min_key_code; i <= m_xkb->max_key_code; ++i) { for (int i = m_xkb->min_key_code; i <= m_xkb->max_key_code; ++i) {
KeyCode keycode = static_cast<KeyCode>(i); auto keycode = static_cast<KeyCode>(i);
item.m_button = static_cast<KeyButton>(keycode); item.m_button = static_cast<KeyButton>(keycode);
item.m_client = 0; item.m_client = 0;
@ -780,7 +780,7 @@ void XWindowsKeyState::updateKeysymMapXKB(deskflow::KeyMap &keyMap)
void XWindowsKeyState::remapKeyModifiers(KeyID id, int32_t group, deskflow::KeyMap::KeyItem &item, void *vself) void XWindowsKeyState::remapKeyModifiers(KeyID id, int32_t group, deskflow::KeyMap::KeyItem &item, void *vself)
{ {
XWindowsKeyState *self = static_cast<XWindowsKeyState *>(vself); auto *self = static_cast<XWindowsKeyState *>(vself);
item.m_required = self->mapModifiersFromX(XkbBuildCoreState(item.m_required, group)); item.m_required = self->mapModifiersFromX(XkbBuildCoreState(item.m_required, group));
item.m_sensitive = self->mapModifiersFromX(XkbBuildCoreState(item.m_sensitive, group)); item.m_sensitive = self->mapModifiersFromX(XkbBuildCoreState(item.m_sensitive, group));
} }
@ -790,7 +790,7 @@ bool XWindowsKeyState::hasModifiersXKB() const
#if HAVE_XKB_EXTENSION #if HAVE_XKB_EXTENSION
// iterate over all keycodes // iterate over all keycodes
for (int i = m_xkb->min_key_code; i <= m_xkb->max_key_code; ++i) { for (int i = m_xkb->min_key_code; i <= m_xkb->max_key_code; ++i) {
KeyCode keycode = static_cast<KeyCode>(i); auto keycode = static_cast<KeyCode>(i);
if (XkbKeyHasActions(m_xkb, keycode) == True) { if (XkbKeyHasActions(m_xkb, keycode) == True) {
// iterate over all groups // iterate over all groups
int numGroups = XkbKeyNumGroups(m_xkb, keycode); int numGroups = XkbKeyNumGroups(m_xkb, keycode);