Skip to content

Add a new function to create key event handlers. #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add a new function to create key event handlers. #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 44 additions & 37 deletions src/lib/fcitx/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,43 +754,7 @@ Instance::Instance(int argc, char **argv) {
CheckInputMethodChanged imChangedRAII(ic, d);
auto origKey = keyEvent.origKey().normalize();

struct {
const KeyList &list;
std::function<bool()> check;
std::function<void(bool)> trigger;
} keyHandlers[] = {
{.list = d->globalConfig_.triggerKeys(),
.check = [this]() { return canTrigger(); },
.trigger =
[this, ic](bool totallyReleased) {
return trigger(ic, totallyReleased);
}},
{.list = d->globalConfig_.altTriggerKeys(),
.check = [this, ic]() { return canAltTrigger(ic); },
.trigger = [this, ic](bool) { return altTrigger(ic); }},
{.list = d->globalConfig_.activateKeys(),
.check = [ic, d]() { return d->canActivate(ic); },
.trigger = [this, ic](bool) { return activate(ic); }},
{.list = d->globalConfig_.deactivateKeys(),
.check = [ic, d]() { return d->canDeactivate(ic); },
.trigger = [this, ic](bool) { return deactivate(ic); }},
{.list = d->globalConfig_.enumerateForwardKeys(),
.check = [this, ic]() { return canEnumerate(ic); },
.trigger = [this, ic](bool) { return enumerate(ic, true); }},
{.list = d->globalConfig_.enumerateBackwardKeys(),
.check = [this, ic]() { return canEnumerate(ic); },
.trigger = [this, ic](bool) { return enumerate(ic, false); }},
{.list = d->globalConfig_.enumerateGroupForwardKeys(),
.check = [this]() { return canChangeGroup(); },
.trigger = [ic, d, origKey](
bool) { d->navigateGroup(ic, origKey, true); }},
{.list = d->globalConfig_.enumerateGroupBackwardKeys(),
.check = [this]() { return canChangeGroup(); },
.trigger =
[ic, d, origKey](bool) {
d->navigateGroup(ic, origKey, false);
}},
};
auto keyHandlers = createKeyEventHandlers(keyEvent);

auto *inputState = ic->propertyFor(&d->inputStateFactory_);
int keyReleased = inputState->keyReleased_;
Expand Down Expand Up @@ -2148,6 +2112,49 @@ void Instance::toggle() {
}
}

std::vector<Instance::KeyEventHandler>
Instance::createKeyEventHandlers(const KeyEvent &keyEvent) {
FCITX_D();

auto *ic = keyEvent.inputContext();
const auto origKey = keyEvent.origKey().normalize();

const KeyEventHandler keyEventHandlers[] = {
{.list = d->globalConfig_.triggerKeys(),
.check = [this]() { return canTrigger(); },
.trigger =
[this, ic](bool totallyReleased) {
return trigger(ic, totallyReleased);
}},
{.list = d->globalConfig_.altTriggerKeys(),
.check = [this, ic]() { return canAltTrigger(ic); },
.trigger = [this, ic](bool) { return altTrigger(ic); }},
{.list = d->globalConfig_.activateKeys(),
.check = [ic, d]() { return d->canActivate(ic); },
.trigger = [this, ic](bool) { return activate(ic); }},
{.list = d->globalConfig_.deactivateKeys(),
.check = [ic, d]() { return d->canDeactivate(ic); },
.trigger = [this, ic](bool) { return deactivate(ic); }},
{.list = d->globalConfig_.enumerateForwardKeys(),
.check = [this, ic]() { return canEnumerate(ic); },
.trigger = [this, ic](bool) { return enumerate(ic, true); }},
{.list = d->globalConfig_.enumerateBackwardKeys(),
.check = [this, ic]() { return canEnumerate(ic); },
.trigger = [this, ic](bool) { return enumerate(ic, false); }},
{.list = d->globalConfig_.enumerateGroupForwardKeys(),
.check = [this]() { return canChangeGroup(); },
.trigger = [ic, d,
origKey](bool) { d->navigateGroup(ic, origKey, true); }},
{.list = d->globalConfig_.enumerateGroupBackwardKeys(),
.check = [this]() { return canChangeGroup(); },
.trigger = [ic, d,
origKey](bool) { d->navigateGroup(ic, origKey, false); }},
};

return std::vector<KeyEventHandler>(std::cbegin(keyEventHandlers),
std::cend(keyEventHandlers));
}

void Instance::enumerate(bool forward) {
FCITX_D();
if (auto *ic = mostRecentInputContext()) {
Expand Down
7 changes: 7 additions & 0 deletions src/lib/fcitx/instance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,13 @@ class FCITXCORE_EXPORT Instance : public ConnectableObject {
bool enumerate(InputContext *ic, bool forward);
bool toggle(InputContext *ic, InputMethodSwitchedReason reason =
InputMethodSwitchedReason::Trigger);
struct KeyEventHandler {
const KeyList &list;
std::function<bool()> check;
std::function<void(bool)> trigger;
};
std::vector<KeyEventHandler>
createKeyEventHandlers(const KeyEvent &keyEvent);

void activateInputMethod(InputContextEvent &event);
void deactivateInputMethod(InputContextEvent &event);
Expand Down
Loading