|
@@ -1345,23 +1345,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
|
|
|
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
|
|
|
- if (isTextInputEvent(event)) {
|
|
|
- if (ic != null) {
|
|
|
- ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
|
|
|
- } else {
|
|
|
- SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
|
|
|
- }
|
|
|
- }
|
|
|
- onNativeKeyDown(keyCode);
|
|
|
- return true;
|
|
|
- } else if (event.getAction() == KeyEvent.ACTION_UP) {
|
|
|
- onNativeKeyUp(keyCode);
|
|
|
- return true;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
|
|
|
// on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
|
|
|
// they are ignored here because sending them as mouse input to SDL is messy
|
|
@@ -1376,6 +1359,21 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
|
|
|
+ if (isTextInputEvent(event)) {
|
|
|
+ if (ic != null) {
|
|
|
+ ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
|
|
|
+ } else {
|
|
|
+ SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ onNativeKeyDown(keyCode);
|
|
|
+ return true;
|
|
|
+ } else if (event.getAction() == KeyEvent.ACTION_UP) {
|
|
|
+ onNativeKeyUp(keyCode);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
return false;
|
|
|
}
|
|
|
|