vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port fix for batch text removing from SDL2, fix twice text input on some T9/Swype-like keyboards

Browse source
This commit is contained in:
Alibek Omarov (a1batross) 2017-09-28 21:57:40 +03:00
parent a1e8f0e1df
commit dcd92e8a57
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/in/celest/xash3d/XashActivity.java
View file

@ -705,6 +705,17 @@ public class XashActivity extends Activity {
return true; return true;
} }
/*else if( action == KeyEvent.ACTION_MULTIPLE )
{
if( keyCode == KeyEvent.KEYCODE_UNKNOWN )
{
XashActivity.nativeString( event.getCharacters() );
}
else
{
// maybe unneeded
}
}*/
else if( action == KeyEvent.ACTION_UP ) else if( action == KeyEvent.ACTION_UP )
{ {
XashActivity.nativeKey( 0, keyCode ); XashActivity.nativeKey( 0, keyCode );
@ -1302,8 +1313,13 @@ class XashInputConnection extends BaseInputConnection
@Override @Override
public boolean setComposingText( CharSequence text, int newCursorPosition ) public boolean setComposingText( CharSequence text, int newCursorPosition )
{ {
// nativeSetComposingText(text.toString(), newCursorPosition); // a1batross:
XashActivity.nativeString( text.toString() ); // This method is intended to show composed text immediately
// that after will be replaced by text from "commitText" method
// Just leaving this unimplemented fixes "twice" input on T9/Swype-like keyboards
//ativeSetComposingText(text.toString(), newCursorPosition);
// XashActivity.nativeString( text.toString() );
return super.setComposingText( text, newCursorPosition ); return super.setComposingText( text, newCursorPosition );
} }
@ -1314,14 +1330,21 @@ class XashInputConnection extends BaseInputConnection
public boolean deleteSurroundingText( int beforeLength, int afterLength ) public boolean deleteSurroundingText( int beforeLength, int afterLength )
{ {
// Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
if( beforeLength == 1 && afterLength == 0 ) // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
if( beforeLength > 0 && afterLength == 0 )
{ {
// backspace boolean ret = true;
XashActivity.nativeKey( 1, KeyEvent.KEYCODE_DEL ); // backspace(s)
XashActivity.nativeKey( 0, KeyEvent.KEYCODE_DEL ); while( beforeLength-- > 0 )
{
boolean ret_key = sendKeyEvent( new KeyEvent( KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL ) )
&& sendKeyEvent( new KeyEvent( KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL ) );
ret = ret && ret_key;
}
return ret;
} }
return super.deleteSurroundingText( beforeLength, afterLength ); return super.deleteSurroundingText(beforeLength, afterLength);
} }
} }
class EngineTouchListener_v1 implements View.OnTouchListener class EngineTouchListener_v1 implements View.OnTouchListener