Commit 257cacab183b312bbe60bd7967eee44a3ad7be85
2022-09-30T17:25:58
Android text input now works like iOS, where you get text in progress and then backspaces and new text if autocomplete changes it or the IME commits it.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index c9019da..61e4dfe 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -1876,7 +1876,7 @@ class DummyEdit extends View implements View.OnKeyListener {
class SDLInputConnection extends BaseInputConnection {
protected EditText mEditText;
- protected int m_nLastContentLength = 0;
+ protected String mCommittedText = "";
public SDLInputConnection(View targetView, boolean fullEditor) {
super(targetView, fullEditor);
@@ -1913,149 +1913,74 @@ class SDLInputConnection extends BaseInputConnection {
@Override
public boolean commitText(CharSequence text, int newCursorPosition) {
- replaceText(text, newCursorPosition, false);
-
- return super.commitText(text, newCursorPosition);
+ if (!super.commitText(text, newCursorPosition)) {
+ return false;
+ }
+ updateText();
+ return true;
}
@Override
public boolean setComposingText(CharSequence text, int newCursorPosition) {
- replaceText(text, newCursorPosition, true);
-
- return super.setComposingText(text, newCursorPosition);
- }
-
- @Override
- public boolean setComposingRegion(int start, int end) {
- final Editable content = getEditable();
- if (content != null) {
- int a = start;
- int b = end;
- if (a > b) {
- int tmp = a;
- a = b;
- b = tmp;
- }
-
- // Clip the end points to be within the content bounds.
- final int length = content.length();
- if (a < 0) {
- a = 0;
- }
- if (b < 0) {
- b = 0;
- }
- if (a > length) {
- a = length;
- }
- if (b > length) {
- b = length;
- }
-
- deleteText(a, b);
+ if (!super.setComposingText(text, newCursorPosition)) {
+ return false;
}
-
- return super.setComposingRegion(start, end);
+ updateText();
+ return true;
}
@Override
public boolean deleteSurroundingText(int beforeLength, int afterLength) {
- final Editable content = getEditable();
- if (content != null) {
- int a = Selection.getSelectionStart(content);
- int b = Selection.getSelectionEnd(content);
-
- if (a > b) {
- int tmp = a;
- a = b;
- b = tmp;
- }
-
- // ignore the composing text.
- int ca = getComposingSpanStart(content);
- int cb = getComposingSpanEnd(content);
- if (cb < ca) {
- int tmp = ca;
- ca = cb;
- cb = tmp;
- }
-
- if (ca != -1 && cb != -1) {
- if (ca < a) {
- a = ca;
- }
- if (cb > b) {
- b = cb;
- }
- }
-
- if (beforeLength > 0) {
- int start = a - beforeLength;
- if (start < 0) {
- start = 0;
- }
- deleteText(start, a);
- }
+ if (!super.deleteSurroundingText(beforeLength, afterLength)) {
+ return false;
}
-
- return super.deleteSurroundingText(beforeLength, afterLength);
+ updateText();
+ return true;
}
- protected void replaceText(CharSequence text, int newCursorPosition, boolean composing) {
+ protected void updateText() {
final Editable content = getEditable();
if (content == null) {
return;
}
-
- // delete composing text set previously.
- int a = getComposingSpanStart(content);
- int b = getComposingSpanEnd(content);
-
- if (b < a) {
- int tmp = a;
- a = b;
- b = tmp;
- }
- if (a == -1 || b == -1) {
- a = Selection.getSelectionStart(content);
- b = Selection.getSelectionEnd(content);
- if (a < 0) {
- a = 0;
- }
- if (b < 0) {
- b = 0;
- }
- if (b < a) {
- int tmp = a;
- a = b;
- b = tmp;
+
+ String text = content.toString();
+ int compareLength = Math.min(text.length(), mCommittedText.length());
+ int matchLength, offset;
+
+ /* Backspace over characters that are no longer in the string */
+ for (matchLength = 0; matchLength < compareLength; ) {
+ int codePoint = mCommittedText.codePointAt(matchLength);
+ if (codePoint != text.codePointAt(matchLength)) {
+ break;
}
+ matchLength += Character.charCount(codePoint);
+ }
+ /* FIXME: This doesn't handle graphemes, like '🌬️' */
+ for (offset = matchLength; offset < mCommittedText.length(); ) {
+ int codePoint = mCommittedText.codePointAt(offset);
+ nativeGenerateScancodeForUnichar('\b');
+ offset += Character.charCount(codePoint);
}
- deleteText(a, b);
-
- if (composing) {
- nativeSetComposingText(text.toString(), newCursorPosition);
- } else {
- for (int i = 0; i < text.length(); i++) {
- char c = text.charAt(i);
- if (c == '\n') {
+ if (matchLength < text.length()) {
+ String pendingText = text.subSequence(matchLength, text.length()).toString();
+ for (offset = 0; offset < pendingText.length(); ) {
+ int codePoint = pendingText.codePointAt(offset);
+ if (codePoint == '\n') {
if (SDLActivity.onNativeSoftReturnKey()) {
return;
}
}
- ++m_nLastContentLength;
- nativeGenerateScancodeForUnichar(c);
+ /* Higher code points don't generate simulated scancodes */
+ if (codePoint < 128) {
+ nativeGenerateScancodeForUnichar((char)codePoint);
+ }
+ offset += Character.charCount(codePoint);
}
- SDLInputConnection.nativeCommitText(text.toString(), newCursorPosition);
- }
- }
-
- protected void deleteText(int start, int end) {
- while (m_nLastContentLength > start) {
- --m_nLastContentLength;
- nativeGenerateScancodeForUnichar('\b');
+ SDLInputConnection.nativeCommitText(pendingText, 0);
}
+ mCommittedText = text;
}
public static native void nativeCommitText(String text, int newCursorPosition);