aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-09-12 11:22:39 +1000
committerNeil <nyamatongwe@gmail.com>2014-09-12 11:22:39 +1000
commitd744f3aedb7b09625f45ef659ed4c787bf45c42f (patch)
tree00da8be0e8c426d00c3195d22fd998792187afba /doc
parent2fffff0d5d691f314829b0b3c8ecd59707afdb38 (diff)
downloadscintilla-mirror-d744f3aedb7b09625f45ef659ed4c787bf45c42f.tar.gz
Allow choice between windowed and inline IME.
Diffstat (limited to 'doc')
-rw-r--r--doc/ScintillaDoc.html17
-rw-r--r--doc/ScintillaHistory.html3
2 files changed, 19 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 0d1f33bcb..e71b39a4d 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -82,7 +82,7 @@
<h1>Scintilla Documentation</h1>
- <p>Last edited 4 September 2014 NH</p>
+ <p>Last edited 12 September 2014 NH</p>
<p>There is <a class="jump" href="Design.html">an overview of the internal design of
Scintilla</a>.<br />
@@ -3171,6 +3171,8 @@ struct Sci_TextToFind {
<a class="message" href="#SCI_GETFONTQUALITY">SCI_GETFONTQUALITY</a><br />
<a class="message" href="#SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</a><br />
<a class="message" href="#SCI_GETCODEPAGE">SCI_GETCODEPAGE</a><br />
+ <a class="message" href="#SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</a><br />
+ <a class="message" href="#SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION</a><br />
<a class="message" href="#SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</a><br />
<a class="message" href="#SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</a><br />
<a class="message" href="#SCI_SETWORDCHARS">SCI_SETWORDCHARS(&lt;unused&gt;, const char *characters)</a><br />
@@ -3281,6 +3283,19 @@ struct Sci_TextToFind {
949 (Korean Unified Hangul Code), 950 (Traditional Chinese Big5), or 1361 (Korean Johab)
although these may require installation of language specific support.</p>
+ <p><b id="SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</b><br />
+ <b id="SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION</b><br />
+ When entering text in Chinese, Japanese, or Korean an Input Method Editor (IME) may be displayed.
+ The IME may be an extra window appearing above Scintilla or may be displayed by Scintilla itself
+ as text. On some platforms there is a choice between the two techniques.
+ A windowed IME <code>SC_IME_WINDOWED</code> (0) may be more similar in appearance and
+ behaviour to the IME in other applications.
+ An inline IME <code>SC_IME_INLINE</code> (1) may work better with some Scintilla features such as
+ rectangular and multiple selection.</p>
+ <p>The windowed behaviour can be chosen with <code>SCI_SETIMEINTERACTION(SC_IME_WINDOWED)</code>
+ and the inline behaviour with <code>SCI_SETIMEINTERACTION(SC_IME_INLINE)</code>.
+ Scintilla may ignore this call in some cases. For example, the inline behaviour might only be supported for some languages.</p>
+
<p><b id="SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</b><br />
<b id="SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</b><br />
On Windows, character keys are normally handled differently depending on whether Scintilla is a wide
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index b2fa52fb2..daf06d14e 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -497,6 +497,9 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1652/">Bug #1652</a>.
</li>
<li>
+ Allow choice between windowed and inline IME on some platforms.
+ </li>
+ <li>
On GTK+ cache autocomplete window to avoid platform bug where windows
were sometimes lost.
<a href="http://sourceforge.net/p/scintilla/bugs/1649/">Bug #1649</a>.