From d7e2afd1f88bf735b010461ff505470bfa468547 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Sun, 30 Jun 2019 08:34:46 +1000
Subject: 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.

---
 include/Scintilla.h     |  4 ++++
 include/Scintilla.iface | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/Scintilla.h b/include/Scintilla.h
index c7db899d7..808ad9985 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -1091,6 +1091,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
@@ -1233,6 +1236,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 661a6a12b..8107ae47c 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -3017,6 +3017,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_
@@ -5165,7 +5174,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)
-- 
cgit v1.2.3