Cleanup: use break rather than nested if/else constructs.

This commit is contained in:
Albert Weichselbraun 2013-11-18 06:17:56 +01:00
parent 6b33298a6e
commit 3fcfc348ed

@ -632,37 +632,39 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift)
XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks); XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks);
if (ks == keysym) { if (ks == keysym) {
shift &= ~m_altgrMask; shift &= ~m_altgrMask;
shift &= ~ShiftMask;
found = TRUE; found = TRUE;
} else { break;
}
XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks); XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks);
if (ks == keysym) { if (ks == keysym) {
shift &= ~m_altgrMask; shift &= ~m_altgrMask;
shift |= ShiftMask; shift |= ShiftMask;
found = TRUE; found = TRUE;
} else { break;
}
XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
if (ks == keysym) { if (ks == keysym) {
shift &= ~ShiftMask; shift &= ~ShiftMask;
shift |= m_altgrMask; shift |= m_altgrMask;
found = TRUE; found = TRUE;
} else { break;
}
XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
if (ks == keysym) { if (ks == keysym) {
shift |= ShiftMask | m_altgrMask; shift |= ShiftMask | m_altgrMask;
found = TRUE; found = TRUE;
} break;
}
}
} }
if (found) break; if (found) break;
if (0xF000 <= keysym) { if (0xF000 <= keysym) {
/* for special keys such as function keys, /* for special keys such as function keys,
first try to add it in the non-shifted position of the keymap */ first try to add it in the non-shifted position of the keymap */
if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE); if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE);
} else { } else {
AddKeysym(keysym, FALSE); AddKeysym(keysym, FALSE);
} }