forked from pool/fcitx
97386b479f
add patch to support sogou-pinyin OBS-URL: https://build.opensuse.org/request/show/230507 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=88
60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
From: Xuetian Weng <wengxt@gmail.com>
|
|
Date: Tue, 11 Mar 2014 00:13:43 +0800
|
|
Subject: add a context variable to disable punc
|
|
|
|
---
|
|
src/lib/fcitx/context.h | 2 ++
|
|
src/module/punc/punc.c | 12 ++++++++++++
|
|
2 files changed, 14 insertions(+)
|
|
|
|
diff --git a/src/lib/fcitx/context.h b/src/lib/fcitx/context.h
|
|
index 32115af..05f0f91 100644
|
|
--- a/src/lib/fcitx/context.h
|
|
+++ b/src/lib/fcitx/context.h
|
|
@@ -70,6 +70,8 @@ extern "C" {
|
|
#define CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT "CONTEXT_DISABLE_AUTO_FIRST_CANDIDATE_HIGHTLIGHT"
|
|
/** disable auto first candidate highlight */
|
|
#define CONTEXT_DISABLE_FULLWIDTH "CONTEXT_DISABLE_FULLWIDTH"
|
|
+ /** disable punc module */
|
|
+ #define CONTEXT_DISABLE_PUNC "CONTEXT_DISABLE_PUNC"
|
|
|
|
/**
|
|
* @brief register a new global context variable
|
|
diff --git a/src/module/punc/punc.c b/src/module/punc/punc.c
|
|
index be6dec3..3327f9c 100644
|
|
--- a/src/module/punc/punc.c
|
|
+++ b/src/module/punc/punc.c
|
|
@@ -154,6 +154,8 @@ void* PuncCreate(FcitxInstance* instance)
|
|
PuncWhichCopy, PuncWhichFree,
|
|
puncState);
|
|
|
|
+ FcitxInstanceRegisterWatchableContext(instance, CONTEXT_DISABLE_PUNC, FCT_Boolean, FCF_ResetOnInputMethodChange);
|
|
+
|
|
FcitxPuncAddFunctions(instance);
|
|
return puncState;
|
|
}
|
|
@@ -250,6 +252,11 @@ boolean PuncPreFilter(void* arg, FcitxKeySym sym, unsigned int state,
|
|
{
|
|
FCITX_UNUSED(retVal);
|
|
FcitxPuncState *puncState = (FcitxPuncState*)arg;
|
|
+ boolean disablePunc = FcitxInstanceGetContextBoolean(
|
|
+ puncState->owner, CONTEXT_DISABLE_PUNC);
|
|
+ if (disablePunc)
|
|
+ return false;
|
|
+
|
|
if (FcitxHotkeyIsHotKeySimple(sym, state) &&
|
|
!FcitxHotkeyIsHotKeyDigit(sym, state) && !IsHotKeyPunc(sym, state))
|
|
puncState->bLastIsNumber = false;
|
|
@@ -269,6 +276,11 @@ boolean ProcessPunc(void* arg, FcitxKeySym sym, unsigned int state, INPUT_RETURN
|
|
if (*retVal != IRV_TO_PROCESS)
|
|
return false;
|
|
|
|
+ boolean disablePunc = FcitxInstanceGetContextBoolean(
|
|
+ puncState->owner, CONTEXT_DISABLE_PUNC);
|
|
+ if (disablePunc)
|
|
+ return false;
|
|
+
|
|
FcitxCandidateWordList *candList = FcitxInputStateGetCandidateList(input);
|
|
if (FcitxCandidateWordGetListSize(candList) != 0) {
|
|
if (FcitxCandidateWordGetHasGoneToNextPage(candList) &&
|