Skip to content

Use upper case "V" for shuangpin's quickphrase triggering. #226

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

Merged
merged 1 commit into from
Jun 28, 2025
Merged

Use upper case "V" for shuangpin's quickphrase triggering. #226

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
20 changes: 13 additions & 7 deletions im/pinyin/pinyin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2004,14 +2004,20 @@ void PinyinEngine::keyEvent(const InputMethodEntry &entry, KeyEvent &event) {
(event.key().check(FcitxKey_apostrophe) && !state->context_.empty()) ||
checkSp(event, state)) {
// first v, use it to trigger quickphrase
if (!state->context_.useShuangpin() && quickphrase() &&
*config_.useVAsQuickphrase && event.key().check(FcitxKey_v) &&
if (*config_.useVAsQuickphrase && quickphrase() &&
state->context_.empty()) {

quickphrase()->call<IQuickPhrase::trigger>(
inputContext, "", "v", "", "", Key(FcitxKey_None));
event.filterAndAccept();
return;
const bool isSp = state->context_.useShuangpin();
if ((event.key().check(FcitxKey_v) && !isSp) ||
(event.key().check(FcitxKey_V) && isSp)) {
const std::string leadingString =
Key::keySymToUTF8(event.key().sym());

quickphrase()->call<IQuickPhrase::trigger>(
inputContext, "", leadingString, "", "",
Key(FcitxKey_None));
event.filterAndAccept();
return;
}
}
event.filterAndAccept();
if (!state->context_.type(keyStr.get())) {
Expand Down
129 changes: 79 additions & 50 deletions test/testpinyin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
#include <fcitx-utils/macros.h>
#include <fcitx-utils/standardpaths.h>
#include <fcitx-utils/testing.h>
#include <fcitx/addoninstance.h>
#include <fcitx/addonmanager.h>
#include <fcitx/inputcontext.h>
#include <fcitx/inputmethodgroup.h>
#include <fcitx/inputmethodmanager.h>
#include <fcitx/inputpanel.h>
Expand Down Expand Up @@ -54,7 +56,21 @@ void findAndSelectCandidate(InputContext *ic, std::string_view word) {
candList->candidate(findCandidateOrDie(ic, word)).select(ic);
}

void testBasic(Instance *instance) {
void sendControlSpace(AddonInstance *testfrontend, InputContext *ic) {
for (int i = 0; i < 2; i++) {
testfrontend->call<ITestFrontend::keyEvent>(ic->uuid(),
Key("Control_L"), false);
testfrontend->call<ITestFrontend::keyEvent>(
ic->uuid(), Key("Control+space"), false);
testfrontend->call<ITestFrontend::keyEvent>(ic->uuid(),
Key("Control+space"), true);
testfrontend->call<ITestFrontend::keyEvent>(
ic->uuid(), Key("Control+Control_L"), true);
ic->reset();
}
}

void setup(Instance *instance) {
instance->eventDispatcher().schedule([instance]() {
auto *pinyin = instance->addonManager().addon("pinyin", true);
FCITX_ASSERT(pinyin);
Expand All @@ -64,17 +80,27 @@ void testBasic(Instance *instance) {
InputMethodGroupItem("keyboard-us"));
defaultGroup.inputMethodList().push_back(
InputMethodGroupItem("pinyin"));
defaultGroup.inputMethodList().push_back(
InputMethodGroupItem("shuangpin"));
defaultGroup.setDefaultInputMethod("");
instance->inputMethodManager().setGroup(std::move(defaultGroup));
});
}

void testBasic(Instance *instance) {
instance->eventDispatcher().schedule([instance]() {
auto *pinyin = instance->addonManager().addon("pinyin");
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");
testfrontend->call<ITestFrontend::pushCommitExpectation>("俺");
testfrontend->call<ITestFrontend::pushCommitExpectation>("ni");
testfrontend->call<ITestFrontend::pushCommitExpectation>("ni");
testfrontend->call<ITestFrontend::pushCommitExpectation>("你hao");
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("a"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("`"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("n"), false);
Expand All @@ -98,8 +124,6 @@ void testBasic(Instance *instance) {
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("h"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("a"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("o"), false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
// Make a partial selection, we do search because the data might change.
findAndSelectCandidate(ic, "你");
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Return"), false);
Expand All @@ -111,10 +135,7 @@ void testBasic(Instance *instance) {
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("h"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("a"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("o"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
sendControlSpace(testfrontend, ic);

testfrontend->call<ITestFrontend::pushCommitExpectation>("你hao");
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("n"), false);
Expand All @@ -124,10 +145,7 @@ void testBasic(Instance *instance) {
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("o"), false);
// Make a partial selection, we do search because the data might change.
findAndSelectCandidate(ic, "你");
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
sendControlSpace(testfrontend, ic);

RawConfig config;
config.setValueByPath("SwitchInputMethodBehavior",
Expand All @@ -141,10 +159,7 @@ void testBasic(Instance *instance) {
auto sentence =
ic->inputPanel().candidateList()->candidate(0).text().toString();
testfrontend->call<ITestFrontend::pushCommitExpectation>(sentence);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
sendControlSpace(testfrontend, ic);

config.setValueByPath("SwitchInputMethodBehavior", "Clear");
pinyin->setConfig(config);
Expand All @@ -153,10 +168,7 @@ void testBasic(Instance *instance) {
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("h"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("a"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("o"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
sendControlSpace(testfrontend, ic);
});
}

Expand All @@ -165,9 +177,9 @@ void testSelectByChar(Instance *instance) {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("n"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("i"), false);
Expand All @@ -187,8 +199,6 @@ void testSelectByChar(Instance *instance) {
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("g"), false);

testfrontend->call<ITestFrontend::pushCommitExpectation>("你好主病");
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
findAndSelectCandidate(ic, "你好");
auto candidateIdx = findCandidateOrDie(ic, "公主");
ic->inputPanel().candidateList()->toBulkCursor()->setGlobalCursorIndex(
Expand All @@ -204,9 +214,9 @@ void testUppercase(Instance *instance) {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::pushCommitExpectation>("Apple");

Expand Down Expand Up @@ -234,17 +244,15 @@ void testForget(Instance *instance) {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("n"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("i"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("h"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("a"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("o"), false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
auto *candidateList = ic->inputPanel().candidateList().get();
const auto &cand = candidateList->candidate(0);
auto *actionable = candidateList->toActionable();
Expand All @@ -265,9 +273,8 @@ void testActionInStrokeFilter(Instance *instance) {
testfrontend->call<ITestFrontend::createInputContext>("testapp");
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
// Target ppp for 彡
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("p"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("p"), false);
Expand Down Expand Up @@ -298,9 +305,9 @@ void testPin(Instance *instance) {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("t"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("o"), false);
Expand All @@ -309,8 +316,6 @@ void testPin(Instance *instance) {
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("y"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("i"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("n"), false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
auto index1 = findCandidateOrDie(ic, "同音");
auto index2 = findCandidateOrDie(ic, "痛饮");
const auto oldIndex1 = index1;
Expand Down Expand Up @@ -374,16 +379,14 @@ void testQuickPhraseTrigger(Instance *instance) {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("w"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("w"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("w"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("."), false);
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
FCITX_ASSERT(ic->inputPanel().preedit().toString() == "www.");

ic->reset();
Expand Down Expand Up @@ -428,14 +431,37 @@ void testQuickPhraseTrigger(Instance *instance) {
});
}

void testVQuickPhraseTrigger(Instance *instance) {
instance->eventDispatcher().schedule([instance]() {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");

auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("v"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("."), false);
FCITX_ASSERT(ic->inputPanel().preedit().toString() == "v.");

instance->setCurrentInputMethod(ic, "shuangpin", true);
ic->reset();
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("V"), false);
testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("."), false);
FCITX_ASSERT(ic->inputPanel().preedit().toString() == "V.");
});
}

void testPunctuation(Instance *instance) {
instance->eventDispatcher().schedule([instance]() {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
testfrontend->call<ITestFrontend::pushCommitExpectation>("。");
FCITX_ASSERT(testfrontend->call<ITestFrontend::sendKeyEvent>(
uuid, Key("."), false));
Expand Down Expand Up @@ -468,9 +494,10 @@ void testPunctuationPart2(Instance *instance) {
auto *testfrontend = instance->addonManager().addon("testfrontend");
auto uuid =
testfrontend->call<ITestFrontend::createInputContext>("testapp");
auto *ic = instance->inputContextManager().findByUUID(uuid);
FCITX_ASSERT(ic);
instance->setCurrentInputMethod(ic, "pinyin", true);

testfrontend->call<ITestFrontend::keyEvent>(uuid, Key("Control+space"),
false);
FCITX_ASSERT(!testfrontend->call<ITestFrontend::sendKeyEvent>(
uuid, Key("1"), false));
FCITX_ASSERT(!testfrontend->call<ITestFrontend::sendKeyEvent>(
Expand Down Expand Up @@ -505,13 +532,15 @@ int main() {
fcitx::Log::setLogRule("default=5,pinyin=5");
Instance instance(FCITX_ARRAY_SIZE(argv), argv);
instance.addonManager().registerDefaultLoader(nullptr);
setup(&instance);
testBasic(&instance);
testSelectByChar(&instance);
testUppercase(&instance);
testForget(&instance);
testActionInStrokeFilter(&instance);
testPin(&instance);
testQuickPhraseTrigger(&instance);
testVQuickPhraseTrigger(&instance);
testPunctuation(&instance);
instance.exec();
endTestEvent.reset();
Expand Down
Loading