diff options
| author | mitchell <unknown> | 2019-07-11 14:12:28 -0400 |
|---|---|---|
| committer | mitchell <unknown> | 2019-07-11 14:12:28 -0400 |
| commit | 2a15b94200abe8ee0df2dddc296f3dafd55655f8 (patch) | |
| tree | 7236773c70225185fe1532d109a66f98c39e8d18 /include | |
| parent | 55446b8967ed0a7f66502424d309f0b8fa74919f (diff) | |
| download | scintilla-mirror-2a15b94200abe8ee0df2dddc296f3dafd55655f8.tar.gz | |
Backport: Bug [#2038]. Source of input reported in SCN_CHARADDED.
This may be SC_CHARACTERSOURCE_DIRECT_INPUT, SC_CHARACTERSOURCE_TENTATIVE_INPUT,
or SC_CHARACTERSOURCE_IME_RESULT.
Backport of changeset 7613:4cfac35c71bd.
Diffstat (limited to 'include')
| -rw-r--r-- | include/Scintilla.h | 4 | ||||
| -rw-r--r-- | include/Scintilla.iface | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index 5d535ae76..2c9a8ac43 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -1093,6 +1093,9 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SC_AC_TAB 3 #define SC_AC_NEWLINE 4 #define SC_AC_COMMAND 5 +#define SC_CHARACTERSOURCE_DIRECT_INPUT 0 +#define SC_CHARACTERSOURCE_TENTATIVE_INPUT 1 +#define SC_CHARACTERSOURCE_IME_RESULT 2 #define SCN_STYLENEEDED 2000 #define SCN_CHARADDED 2001 #define SCN_SAVEPOINTREACHED 2002 @@ -1230,6 +1233,7 @@ struct SCNotification { int updated; /* SCN_UPDATEUI */ int listCompletionMethod; /* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */ + int characterSource; /* SCN_CHARADDED */ }; #ifdef INCLUDE_DEPRECATED_FEATURES diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 10ac9091e..7280f71b8 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -3024,6 +3024,15 @@ val SC_AC_COMMAND=5 ali SC_AC_FILLUP=FILL_UP ali SC_AC_DOUBLECLICK=DOUBLE_CLICK +# characterSource for SCN_CHARADDED +enu CharacterSource=SC_CHARACTERSOURCE_ +# Direct input characters. +val SC_CHARACTERSOURCE_DIRECT_INPUT=0 +# IME (inline mode) or dead key tentative input characters. +val SC_CHARACTERSOURCE_TENTATIVE_INPUT=1 +# IME (either inline or windowed mode) full composited string. +val SC_CHARACTERSOURCE_IME_RESULT=2 + ################################################ # For SciLexer.h enu Lexer=SCLEX_ @@ -5173,7 +5182,7 @@ val SCE_DF_ICODE=14 # Events evt void StyleNeeded=2000(int position) -evt void CharAdded=2001(int ch) +evt void CharAdded=2001(int ch, int characterSource) evt void SavePointReached=2002(void) evt void SavePointLeft=2003(void) evt void ModifyAttemptRO=2004(void) |