chore: Adjust Clang-format linter rules

120 Column Lines
 Block Indent for Bracket Align
 Custom Line Break Rules
 No Single Line Functions
This commit is contained in:
sithlord48
2024-10-17 14:04:35 -04:00
committed by Nick Bolton
parent 3f2bb2531a
commit 9b9ecb0d05
633 changed files with 14725 additions and 11479 deletions

View File

@ -32,10 +32,9 @@
namespace deskflow {
EiKeyState::EiKeyState(EiScreen *screen, IEventQueue *events)
: KeyState(
events, AppUtil::instance().getKeyboardLayoutList(),
ClientApp::instance().args().m_enableLangSync),
screen_{screen} {
: KeyState(events, AppUtil::instance().getKeyboardLayoutList(), ClientApp::instance().args().m_enableLangSync),
screen_{screen}
{
xkb_ = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
// FIXME: PrimaryClient->enable() calls into our keymap, so we must have
@ -45,12 +44,12 @@ EiKeyState::EiKeyState(EiScreen *screen, IEventQueue *events)
init_default_keymap();
}
void EiKeyState::init_default_keymap() {
void EiKeyState::init_default_keymap()
{
if (xkb_keymap_) {
xkb_keymap_unref(xkb_keymap_);
}
xkb_keymap_ =
xkb_keymap_new_from_names(xkb_, nullptr, XKB_KEYMAP_COMPILE_NO_FLAGS);
xkb_keymap_ = xkb_keymap_new_from_names(xkb_, nullptr, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (xkb_state_) {
xkb_state_unref(xkb_state_);
@ -58,7 +57,8 @@ void EiKeyState::init_default_keymap() {
xkb_state_ = xkb_state_new(xkb_keymap_);
}
void EiKeyState::init(int fd, size_t len) {
void EiKeyState::init(int fd, size_t len)
{
auto buffer = std::make_unique<char[]>(len + 1);
auto sz = read(fd, buffer.get(), len);
@ -73,9 +73,7 @@ void EiKeyState::init(int fd, size_t len) {
// whole thing as string.
buffer[len] = '\0'; // guarantee null-termination
auto keymap = xkb_keymap_new_from_string(
xkb_, buffer.get(), XKB_KEYMAP_FORMAT_TEXT_V1,
XKB_KEYMAP_COMPILE_NO_FLAGS);
auto keymap = xkb_keymap_new_from_string(xkb_, buffer.get(), XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
LOG_NOTE("failed to compile keymap, falling back to defaults");
// Falling back to layout "us" is a lot more useful than segfaulting
@ -94,37 +92,41 @@ void EiKeyState::init(int fd, size_t len) {
xkb_state_ = xkb_state_new(xkb_keymap_);
}
EiKeyState::~EiKeyState() {
EiKeyState::~EiKeyState()
{
xkb_context_unref(xkb_);
xkb_keymap_unref(xkb_keymap_);
xkb_state_unref(xkb_state_);
}
bool EiKeyState::fakeCtrlAltDel() {
bool EiKeyState::fakeCtrlAltDel()
{
// pass keys through unchanged
return false;
}
KeyModifierMask EiKeyState::pollActiveModifiers() const {
std::uint32_t xkb_mask =
xkb_state_serialize_mods(xkb_state_, XKB_STATE_MODS_EFFECTIVE);
KeyModifierMask EiKeyState::pollActiveModifiers() const
{
std::uint32_t xkb_mask = xkb_state_serialize_mods(xkb_state_, XKB_STATE_MODS_EFFECTIVE);
return convert_mod_mask(xkb_mask);
}
std::int32_t EiKeyState::pollActiveGroup() const {
std::int32_t EiKeyState::pollActiveGroup() const
{
return xkb_state_serialize_layout(xkb_state_, XKB_STATE_LAYOUT_EFFECTIVE);
}
void EiKeyState::pollPressedKeys(KeyButtonSet &pressedKeys) const {
void EiKeyState::pollPressedKeys(KeyButtonSet &pressedKeys) const
{
// FIXME
return;
}
std::uint32_t EiKeyState::convert_mod_mask(std::uint32_t xkb_mask) const {
std::uint32_t EiKeyState::convert_mod_mask(std::uint32_t xkb_mask) const
{
std::uint32_t barrier_mask = 0;
for (xkb_mod_index_t xkbmod = 0; xkbmod < xkb_keymap_num_mods(xkb_keymap_);
xkbmod++) {
for (xkb_mod_index_t xkbmod = 0; xkbmod < xkb_keymap_num_mods(xkb_keymap_); xkbmod++) {
if ((xkb_mask & (1 << xkbmod)) == 0)
continue;
@ -147,12 +149,11 @@ std::uint32_t EiKeyState::convert_mod_mask(std::uint32_t xkb_mask) const {
// Only way to figure out whether a key is a modifier key is to press it,
// check if a modifier changed state and then release it again.
// Luckily xkbcommon allows us to do this in a separate state.
void EiKeyState::assign_generated_modifiers(
std::uint32_t keycode, deskflow::KeyMap::KeyItem &item) {
void EiKeyState::assign_generated_modifiers(std::uint32_t keycode, deskflow::KeyMap::KeyItem &item)
{
std::uint32_t mods_generates = 0;
auto state = xkb_state_new(xkb_keymap_);
enum xkb_state_component changed =
xkb_state_update_key(state, keycode, XKB_KEY_DOWN);
enum xkb_state_component changed = xkb_state_update_key(state, keycode, XKB_KEY_DOWN);
if (changed) {
for (xkb_mod_index_t m = 0; m < xkb_keymap_num_mods(xkb_keymap_); m++) {
@ -170,7 +171,8 @@ void EiKeyState::assign_generated_modifiers(
item.m_generates = convert_mod_mask(mods_generates);
}
void EiKeyState::getKeyMap(deskflow::KeyMap &keyMap) {
void EiKeyState::getKeyMap(deskflow::KeyMap &keyMap)
{
auto min_keycode = xkb_keymap_min_keycode(xkb_keymap_);
auto max_keycode = xkb_keymap_max_keycode(xkb_keymap_);
@ -181,25 +183,18 @@ void EiKeyState::getKeyMap(deskflow::KeyMap &keyMap) {
if (xkb_keymap_num_layouts_for_key(xkb_keymap_, keycode) == 0)
continue;
for (auto group = 0U; group < xkb_keymap_num_layouts(xkb_keymap_);
group++) {
for (auto level = 0U;
level < xkb_keymap_num_levels_for_key(xkb_keymap_, keycode, group);
level++) {
for (auto group = 0U; group < xkb_keymap_num_layouts(xkb_keymap_); group++) {
for (auto level = 0U; level < xkb_keymap_num_levels_for_key(xkb_keymap_, keycode, group); level++) {
const xkb_keysym_t *syms;
xkb_mod_mask_t masks[64];
auto nmasks = xkb_keymap_key_get_mods_for_level(
xkb_keymap_, keycode, group, level, masks, 64);
auto nsyms = xkb_keymap_key_get_syms_by_level(
xkb_keymap_, keycode, group, level, &syms);
auto nmasks = xkb_keymap_key_get_mods_for_level(xkb_keymap_, keycode, group, level, masks, 64);
auto nsyms = xkb_keymap_key_get_syms_by_level(xkb_keymap_, keycode, group, level, &syms);
if (nsyms == 0)
continue;
if (nsyms > 1)
LOG_WARN(
"multiple keysyms per keycode are not supported, keycode %d",
keycode);
LOG_WARN("multiple keysyms per keycode are not supported, keycode %d", keycode);
deskflow::KeyMap::KeyItem item{};
xkb_keysym_t keysym = syms[0];
@ -228,8 +223,7 @@ void EiKeyState::getKeyMap(deskflow::KeyMap &keyMap) {
assign_generated_modifiers(keycode, item);
// add capslock version of key is sensitive to capslock
if (item.m_sensitive & KeyModifierShift &&
item.m_sensitive & KeyModifierCapsLock) {
if (item.m_sensitive & KeyModifierShift && item.m_sensitive & KeyModifierCapsLock) {
item.m_required &= ~KeyModifierShift;
item.m_required |= KeyModifierCapsLock;
keyMap.addKeyEntry(item);
@ -246,37 +240,37 @@ void EiKeyState::getKeyMap(deskflow::KeyMap &keyMap) {
keyMap.allowGroupSwitchDuringCompose();
}
void EiKeyState::fakeKey(const Keystroke &keystroke) {
void EiKeyState::fakeKey(const Keystroke &keystroke)
{
switch (keystroke.m_type) {
case Keystroke::kButton:
LOG_DEBUG1(
"fake key: %03x (%08x) %s", keystroke.m_data.m_button.m_button,
keystroke.m_data.m_button.m_client,
keystroke.m_data.m_button.m_press ? "down" : "up");
screen_->fakeKey(
keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_press);
"fake key: %03x (%08x) %s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client,
keystroke.m_data.m_button.m_press ? "down" : "up"
);
screen_->fakeKey(keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_press);
break;
default:
break;
}
}
KeyID EiKeyState::map_key_from_keyval(uint32_t keyval) const {
KeyID EiKeyState::map_key_from_keyval(uint32_t keyval) const
{
// FIXME: That might be a bit crude...?
xkb_keysym_t xkb_keysym = xkb_state_key_get_one_sym(xkb_state_, keyval);
KeySym keysym = static_cast<KeySym>(xkb_keysym);
KeyID keyid = XWindowsUtil::mapKeySymToKeyID(keysym);
LOG_DEBUG1(
"mapped key: code=%d keysym=0x%04lx to keyID=%d", keyval, keysym, keyid);
LOG_DEBUG1("mapped key: code=%d keysym=0x%04lx to keyID=%d", keyval, keysym, keyid);
return keyid;
}
void EiKeyState::update_xkb_state(uint32_t keyval, bool is_pressed) {
void EiKeyState::update_xkb_state(uint32_t keyval, bool is_pressed)
{
LOG_DEBUG1("update key state: keyval=%d pressed=%i", keyval, is_pressed);
xkb_state_update_key(
xkb_state_, keyval, is_pressed ? XKB_KEY_DOWN : XKB_KEY_UP);
xkb_state_update_key(xkb_state_, keyval, is_pressed ? XKB_KEY_DOWN : XKB_KEY_UP);
}
} // namespace deskflow