OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.content.browser.input; | 5 package org.chromium.content.browser.input; |
6 | 6 |
7 import android.os.Handler; | 7 import android.os.Handler; |
8 import android.os.ResultReceiver; | 8 import android.os.ResultReceiver; |
9 import android.os.SystemClock; | 9 import android.os.SystemClock; |
10 import android.text.Editable; | 10 import android.text.Editable; |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
109 static int sTextInputTypeUrl; | 109 static int sTextInputTypeUrl; |
110 static int sTextInputTypeEmail; | 110 static int sTextInputTypeEmail; |
111 static int sTextInputTypeTel; | 111 static int sTextInputTypeTel; |
112 static int sTextInputTypeNumber; | 112 static int sTextInputTypeNumber; |
113 static int sTextInputTypeContentEditable; | 113 static int sTextInputTypeContentEditable; |
114 static int sModifierShift; | 114 static int sModifierShift; |
115 static int sModifierAlt; | 115 static int sModifierAlt; |
116 static int sModifierCtrl; | 116 static int sModifierCtrl; |
117 static int sModifierCapsLockOn; | 117 static int sModifierCapsLockOn; |
118 static int sModifierNumLockOn; | 118 static int sModifierNumLockOn; |
119 static char[] sSingleCharArray = new char[1]; | |
120 static KeyCharacterMap sKeyCharacterMap; | |
119 | 121 |
120 private long mNativeImeAdapterAndroid; | 122 private long mNativeImeAdapterAndroid; |
121 private InputMethodManagerWrapper mInputMethodManagerWrapper; | 123 private InputMethodManagerWrapper mInputMethodManagerWrapper; |
122 private AdapterInputConnection mInputConnection; | 124 private AdapterInputConnection mInputConnection; |
123 private final ImeAdapterDelegate mViewEmbedder; | 125 private final ImeAdapterDelegate mViewEmbedder; |
124 private final Handler mHandler; | 126 private final Handler mHandler; |
125 private DelayedDismissInput mDismissInput = null; | 127 private DelayedDismissInput mDismissInput = null; |
126 private int mTextInputType; | 128 private int mTextInputType; |
129 private String mLastComposeText; | |
130 | |
131 @VisibleForTesting | |
132 int mLastSyntheticKeyCode; | |
127 | 133 |
128 @VisibleForTesting | 134 @VisibleForTesting |
129 boolean mIsShowWithoutHideOutstanding = false; | 135 boolean mIsShowWithoutHideOutstanding = false; |
130 | 136 |
131 /** | 137 /** |
132 * @param wrapper InputMethodManagerWrapper that should receive all the call directed to | 138 * @param wrapper InputMethodManagerWrapper that should receive all the call directed to |
133 * InputMethodManager. | 139 * InputMethodManager. |
134 * @param embedder The view that is used for callbacks from ImeAdapter. | 140 * @param embedder The view that is used for callbacks from ImeAdapter. |
135 */ | 141 */ |
136 public ImeAdapter(InputMethodManagerWrapper wrapper, ImeAdapterDelegate embe dder) { | 142 public ImeAdapter(InputMethodManagerWrapper wrapper, ImeAdapterDelegate embe dder) { |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
310 } | 316 } |
311 | 317 |
312 private int shouldSendKeyEventWithKeyCode(String text) { | 318 private int shouldSendKeyEventWithKeyCode(String text) { |
313 if (text.length() != 1) return COMPOSITION_KEY_CODE; | 319 if (text.length() != 1) return COMPOSITION_KEY_CODE; |
314 | 320 |
315 if (text.equals("\n")) return KeyEvent.KEYCODE_ENTER; | 321 if (text.equals("\n")) return KeyEvent.KEYCODE_ENTER; |
316 else if (text.equals("\t")) return KeyEvent.KEYCODE_TAB; | 322 else if (text.equals("\t")) return KeyEvent.KEYCODE_TAB; |
317 else return COMPOSITION_KEY_CODE; | 323 else return COMPOSITION_KEY_CODE; |
318 } | 324 } |
319 | 325 |
326 private static int androidKeyCodeForCharacter(char chr) { | |
327 if (sKeyCharacterMap == null) { | |
328 sKeyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYB OARD); | |
329 } | |
330 sSingleCharArray[0] = chr; | |
331 KeyEvent[] events = sKeyCharacterMap.getEvents(sSingleCharArray); | |
332 return events[0].getKeyCode(); | |
aurimas (slooooooooow)
2014/07/21 20:21:58
Do we just ignore the other keyEvents if there is
bcwhite
2014/07/21 20:27:18
Yes. Perhaps it would be better to return UNKNOWN
aurimas (slooooooooow)
2014/07/21 20:35:55
Acknowledged.
| |
333 } | |
334 | |
335 @VisibleForTesting | |
336 public static int getTypedKeycodeGuess(String oldtext, String newtext) { | |
337 // Starting typing a new composition should add only a single character. Any composition | |
338 // beginning with text longer than that must come from something other t han typing so | |
339 // return 0. | |
340 if (oldtext == null) { | |
341 if (newtext.length() == 1) { | |
342 return androidKeyCodeForCharacter(newtext.charAt(0)); | |
343 } else { | |
344 return 0; | |
345 } | |
346 } | |
347 | |
348 // The content has grown in length: assume the last character is the key that caused it. | |
349 if (newtext.length() > oldtext.length() && newtext.startsWith(oldtext)) | |
350 return androidKeyCodeForCharacter(newtext.charAt(newtext.length() - 1)); | |
351 | |
352 // The content has shrunk in length: assume that backspace was pressed. | |
353 if (oldtext.length() > newtext.length() && oldtext.startsWith(newtext)) | |
354 return KeyEvent.KEYCODE_DEL; | |
355 | |
356 // The content is unchanged or has undergone a complex change (i.e. not a simple tail | |
357 // modification) so return an unknown key-code. | |
358 return 0; | |
359 } | |
360 | |
320 void sendKeyEventWithKeyCode(int keyCode, int flags) { | 361 void sendKeyEventWithKeyCode(int keyCode, int flags) { |
321 long eventTime = SystemClock.uptimeMillis(); | 362 long eventTime = SystemClock.uptimeMillis(); |
363 mLastSyntheticKeyCode = keyCode; | |
322 translateAndSendNativeEvents(new KeyEvent(eventTime, eventTime, | 364 translateAndSendNativeEvents(new KeyEvent(eventTime, eventTime, |
323 KeyEvent.ACTION_DOWN, keyCode, 0, 0, | 365 KeyEvent.ACTION_DOWN, keyCode, 0, 0, |
324 KeyCharacterMap.VIRTUAL_KEYBOARD, 0, | 366 KeyCharacterMap.VIRTUAL_KEYBOARD, 0, |
325 flags)); | 367 flags)); |
326 translateAndSendNativeEvents(new KeyEvent(SystemClock.uptimeMillis(), ev entTime, | 368 translateAndSendNativeEvents(new KeyEvent(SystemClock.uptimeMillis(), ev entTime, |
327 KeyEvent.ACTION_UP, keyCode, 0, 0, | 369 KeyEvent.ACTION_UP, keyCode, 0, 0, |
328 KeyCharacterMap.VIRTUAL_KEYBOARD, 0, | 370 KeyCharacterMap.VIRTUAL_KEYBOARD, 0, |
329 flags)); | 371 flags)); |
330 } | 372 } |
331 | 373 |
332 // Calls from Java to C++ | 374 // Calls from Java to C++ |
333 | 375 |
334 boolean checkCompositionQueueAndCallNative(CharSequence text, int newCursorP osition, | 376 boolean checkCompositionQueueAndCallNative(CharSequence text, int newCursorP osition, |
335 boolean isCommit) { | 377 boolean isCommit) { |
336 if (mNativeImeAdapterAndroid == 0) return false; | 378 if (mNativeImeAdapterAndroid == 0) return false; |
337 String textStr = text.toString(); | 379 String textStr = text.toString(); |
338 | 380 |
339 // Committing an empty string finishes the current composition. | 381 // Committing an empty string finishes the current composition. |
340 boolean isFinish = textStr.isEmpty(); | 382 boolean isFinish = textStr.isEmpty(); |
341 mViewEmbedder.onImeEvent(isFinish); | 383 mViewEmbedder.onImeEvent(isFinish); |
342 int keyCode = shouldSendKeyEventWithKeyCode(textStr); | 384 int keyCode = shouldSendKeyEventWithKeyCode(textStr); |
343 long timeStampMs = SystemClock.uptimeMillis(); | 385 long timeStampMs = SystemClock.uptimeMillis(); |
344 | 386 |
345 if (keyCode != COMPOSITION_KEY_CODE) { | 387 if (keyCode != COMPOSITION_KEY_CODE) { |
346 sendKeyEventWithKeyCode(keyCode, | 388 sendKeyEventWithKeyCode(keyCode, |
347 KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE) ; | 389 KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE) ; |
348 } else { | 390 } else { |
391 keyCode = getTypedKeycodeGuess(mLastComposeText, textStr); | |
392 mLastComposeText = textStr; | |
393 mLastSyntheticKeyCode = keyCode; | |
394 | |
395 // When typing, there is no issue sending KeyDown and KeyUp events a round the | |
aurimas (slooooooooow)
2014/07/21 20:21:57
Why is it the case that these key events do not ch
bcwhite
2014/07/21 20:27:18
Only KeyPress events cause insertions and those ar
aurimas (slooooooooow)
2014/07/21 20:35:54
Acknowledged.
| |
396 // composition event because those key events do nothing (other than call JS | |
397 // handlers). Tying does not cause changes outside of a KeyPress ev ent which | |
aurimas (slooooooooow)
2014/07/21 20:21:57
s/Tying/Typing
bcwhite
2014/07/21 20:27:18
Done.
| |
398 // we don't call here. However, if the key-code is a control key su ch as | |
399 // KEYCODE_DEL then there never is an associated KeyPress event and the KeyDown | |
400 // event itself causes the action. The net result below is that the Renderer calls | |
401 // cancelComposition() and then Android starts anew with setComposin gRegion(). | |
402 // This stopping and restarting of composition could be a source of problems | |
403 // with 3rd party keyboards. | |
404 // | |
405 // An alternative is to *not* call nativeSetComposingText() in the n on-commit case | |
406 // below. This avoids the restart of composition described above bu t fails to send | |
407 // an update to the composition while in composition which, strictly speaking, | |
408 // does not match the spec. | |
409 // | |
410 // For now, the solution is to endure the restarting of composition and only dive | |
411 // into the alternate solution should there be problems in the field . --bcwhite | |
aurimas (slooooooooow)
2014/07/21 20:21:57
Have you tested at least the most popular keyboard
bcwhite
2014/07/21 20:27:18
I've verified it with Google and Hacker's. Longer
aurimas (slooooooooow)
2014/07/21 20:35:55
Acknowledged.
| |
412 | |
349 nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeRawK eyDown, | 413 nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeRawK eyDown, |
350 timeStampMs, keyCode, 0); | 414 timeStampMs, keyCode, 0); |
415 | |
351 if (isCommit) { | 416 if (isCommit) { |
352 nativeCommitText(mNativeImeAdapterAndroid, textStr); | 417 nativeCommitText(mNativeImeAdapterAndroid, textStr); |
418 mLastComposeText = null; | |
353 } else { | 419 } else { |
354 nativeSetComposingText(mNativeImeAdapterAndroid, text, textStr, newCursorPosition); | 420 nativeSetComposingText(mNativeImeAdapterAndroid, text, textStr, newCursorPosition); |
355 } | 421 } |
422 | |
356 nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeKeyU p, | 423 nativeSendSyntheticKeyEvent(mNativeImeAdapterAndroid, sEventTypeKeyU p, |
357 timeStampMs, keyCode, 0); | 424 timeStampMs, keyCode, 0); |
358 } | 425 } |
359 | 426 |
360 return true; | 427 return true; |
361 } | 428 } |
362 | 429 |
363 void finishComposingText() { | 430 void finishComposingText() { |
364 if (mNativeImeAdapterAndroid == 0) return; | 431 if (mNativeImeAdapterAndroid == 0) return; |
365 nativeFinishComposingText(mNativeImeAdapterAndroid); | 432 nativeFinishComposingText(mNativeImeAdapterAndroid); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
418 * @param end Selection end index. | 485 * @param end Selection end index. |
419 * @return Whether the native counterpart of ImeAdapter received the call. | 486 * @return Whether the native counterpart of ImeAdapter received the call. |
420 */ | 487 */ |
421 boolean setEditableSelectionOffsets(int start, int end) { | 488 boolean setEditableSelectionOffsets(int start, int end) { |
422 if (mNativeImeAdapterAndroid == 0) return false; | 489 if (mNativeImeAdapterAndroid == 0) return false; |
423 nativeSetEditableSelectionOffsets(mNativeImeAdapterAndroid, start, end); | 490 nativeSetEditableSelectionOffsets(mNativeImeAdapterAndroid, start, end); |
424 return true; | 491 return true; |
425 } | 492 } |
426 | 493 |
427 /** | 494 /** |
428 * Send a request to the native counterpart to set compositing region to giv en indices. | 495 * Send a request to the native counterpart to set composing region to given indices. |
429 * @param start The start of the composition. | 496 * @param start The start of the composition. |
430 * @param end The end of the composition. | 497 * @param end The end of the composition. |
431 * @return Whether the native counterpart of ImeAdapter received the call. | 498 * @return Whether the native counterpart of ImeAdapter received the call. |
432 */ | 499 */ |
433 boolean setComposingRegion(int start, int end) { | 500 boolean setComposingRegion(CharSequence text, int start, int end) { |
434 if (mNativeImeAdapterAndroid == 0) return false; | 501 if (mNativeImeAdapterAndroid == 0) return false; |
435 nativeSetComposingRegion(mNativeImeAdapterAndroid, start, end); | 502 nativeSetComposingRegion(mNativeImeAdapterAndroid, start, end); |
503 mLastComposeText = text != null ? text.toString() : null; | |
436 return true; | 504 return true; |
437 } | 505 } |
438 | 506 |
439 /** | 507 /** |
440 * Send a request to the native counterpart to unselect text. | 508 * Send a request to the native counterpart to unselect text. |
441 * @return Whether the native counterpart of ImeAdapter received the call. | 509 * @return Whether the native counterpart of ImeAdapter received the call. |
442 */ | 510 */ |
443 public boolean unselect() { | 511 public boolean unselect() { |
444 if (mNativeImeAdapterAndroid == 0) return false; | 512 if (mNativeImeAdapterAndroid == 0) return false; |
445 nativeUnselect(mNativeImeAdapterAndroid); | 513 nativeUnselect(mNativeImeAdapterAndroid); |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
539 } else if (span instanceof UnderlineSpan) { | 607 } else if (span instanceof UnderlineSpan) { |
540 nativeAppendUnderlineSpan(underlines, spannableString.getSpanSta rt(span), | 608 nativeAppendUnderlineSpan(underlines, spannableString.getSpanSta rt(span), |
541 spannableString.getSpanEnd(span)); | 609 spannableString.getSpanEnd(span)); |
542 } | 610 } |
543 } | 611 } |
544 } | 612 } |
545 | 613 |
546 @CalledByNative | 614 @CalledByNative |
547 private void cancelComposition() { | 615 private void cancelComposition() { |
548 if (mInputConnection != null) mInputConnection.restartInput(); | 616 if (mInputConnection != null) mInputConnection.restartInput(); |
617 mLastComposeText = null; | |
549 } | 618 } |
550 | 619 |
551 @CalledByNative | 620 @CalledByNative |
552 void detach() { | 621 void detach() { |
553 if (mDismissInput != null) mHandler.removeCallbacks(mDismissInput); | 622 if (mDismissInput != null) mHandler.removeCallbacks(mDismissInput); |
554 mNativeImeAdapterAndroid = 0; | 623 mNativeImeAdapterAndroid = 0; |
555 mTextInputType = 0; | 624 mTextInputType = 0; |
556 } | 625 } |
557 | 626 |
558 private native boolean nativeSendSyntheticKeyEvent(long nativeImeAdapterAndr oid, | 627 private native boolean nativeSendSyntheticKeyEvent(long nativeImeAdapterAndr oid, |
(...skipping 25 matching lines...) Expand all Loading... | |
584 private native void nativeDeleteSurroundingText(long nativeImeAdapterAndroid , | 653 private native void nativeDeleteSurroundingText(long nativeImeAdapterAndroid , |
585 int before, int after); | 654 int before, int after); |
586 | 655 |
587 private native void nativeUnselect(long nativeImeAdapterAndroid); | 656 private native void nativeUnselect(long nativeImeAdapterAndroid); |
588 private native void nativeSelectAll(long nativeImeAdapterAndroid); | 657 private native void nativeSelectAll(long nativeImeAdapterAndroid); |
589 private native void nativeCut(long nativeImeAdapterAndroid); | 658 private native void nativeCut(long nativeImeAdapterAndroid); |
590 private native void nativeCopy(long nativeImeAdapterAndroid); | 659 private native void nativeCopy(long nativeImeAdapterAndroid); |
591 private native void nativePaste(long nativeImeAdapterAndroid); | 660 private native void nativePaste(long nativeImeAdapterAndroid); |
592 private native void nativeResetImeAdapter(long nativeImeAdapterAndroid); | 661 private native void nativeResetImeAdapter(long nativeImeAdapterAndroid); |
593 } | 662 } |
OLD | NEW |