|
@@ -872,7 +872,7 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint) |
|
|
} |
|
|
} |
|
|
|
|
|
Log.v("SDL", "setOrientation() requestedOrientation=" + req + " width=" + w +" height="+ h +" resizable=" + resizable + " hint=" + hint); |
|
|
Log.v(TAG, "setOrientation() requestedOrientation=" + req + " width=" + w +" height="+ h +" resizable=" + resizable + " hint=" + hint); |
|
|
mSingleton.setRequestedOrientation(req); |
|
|
} |
|
|
|
|
@@ -1082,7 +1082,7 @@ public static boolean getManifestEnvironmentVariables() { |
|
|
/* environment variables set! */ |
|
|
return true; |
|
|
} catch (Exception e) { |
|
|
Log.v("SDL", "exception " + e.toString()); |
|
|
Log.v(TAG, "exception " + e.toString()); |
|
|
} |
|
|
return false; |
|
|
} |
|
@@ -1868,6 +1868,19 @@ public boolean onKey(View v, int keyCode, KeyEvent event) { |
|
|
int deviceId = event.getDeviceId(); |
|
|
int source = event.getSource(); |
|
|
|
|
|
if (source == InputDevice.SOURCE_UNKNOWN) { |
|
|
InputDevice device = InputDevice.getDevice(deviceId); |
|
|
if (device != null) { |
|
|
source = device.getSources(); |
|
|
} |
|
|
} |
|
|
|
|
|
// if (event.getAction() == KeyEvent.ACTION_DOWN) { |
|
|
// Log.v("SDL", "key down: " + keyCode + ", deviceId = " + deviceId + ", source = " + source); |
|
|
// } else if (event.getAction() == KeyEvent.ACTION_UP) { |
|
|
// Log.v("SDL", "key up: " + keyCode + ", deviceId = " + deviceId + ", source = " + source); |
|
|
// } |
|
|
|
|
|
// Dispatch the different events depending on where they come from |
|
|
// Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD |
|
|
// So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD |
|
@@ -1888,24 +1901,14 @@ public boolean onKey(View v, int keyCode, KeyEvent event) { |
|
|
} |
|
|
} |
|
|
|
|
|
if (source == InputDevice.SOURCE_UNKNOWN) { |
|
|
InputDevice device = InputDevice.getDevice(deviceId); |
|
|
if (device != null) { |
|
|
source = device.getSources(); |
|
|
} |
|
|
} |
|
|
|
|
|
if ((source & InputDevice.SOURCE_KEYBOARD) != 0) { |
|
|
if (event.getAction() == KeyEvent.ACTION_DOWN) { |
|
|
//Log.v("SDL", "key down: " + keyCode); |
|
|
if (SDLActivity.isTextInputEvent(event)) { |
|
|
SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1); |
|
|
} |
|
|
SDLActivity.onNativeKeyDown(keyCode); |
|
|
return true; |
|
|
} |
|
|
else if (event.getAction() == KeyEvent.ACTION_UP) { |
|
|
//Log.v("SDL", "key up: " + keyCode); |
|
|
} else if (event.getAction() == KeyEvent.ACTION_UP) { |
|
|
SDLActivity.onNativeKeyUp(keyCode); |
|
|
return true; |
|
|
} |
|
|