From 7c5fde6cbbfad4fc2fef2db03b0f711fd91380ca Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 13 Feb 2014 11:56:42 -0800 Subject: [PATCH] Use charCode and keyCode from Android --- project/src/platform/android/AndroidFrame.cpp | 6 +++--- .../android/template/src/org/haxe/lime/MainView.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/src/platform/android/AndroidFrame.cpp b/project/src/platform/android/AndroidFrame.cpp index fe7a2bf1e..cea7986a8 100644 --- a/project/src/platform/android/AndroidFrame.cpp +++ b/project/src/platform/android/AndroidFrame.cpp @@ -122,12 +122,12 @@ public: HandleEvent(evt); } - void OnKey(int inCode, bool inDown) + void OnKey(int inKeyCode, int inCharCode, bool inDown) { //__android_log_print(ANDROID_LOG_INFO, "lime", "OnKey %d %d", inCode, inDown); Event key( inDown ? etKeyDown : etKeyUp ); - key.code = inCode; - key.value = inCode; + key.code = inCharCode + key.value = inKeyCode; HandleEvent(key); } diff --git a/templates/android/template/src/org/haxe/lime/MainView.java b/templates/android/template/src/org/haxe/lime/MainView.java index 939dcd2d8..ae36807ec 100644 --- a/templates/android/template/src/org/haxe/lime/MainView.java +++ b/templates/android/template/src/org/haxe/lime/MainView.java @@ -366,7 +366,7 @@ class MainView extends GLSurfaceView { }::end:: - final int keyCode = translateKey (inKeyCode, event); + final int charCode = translateKey (inKeyCode, event); if (keyCode != 0) { @@ -374,7 +374,7 @@ class MainView extends GLSurfaceView { public void run () { - me.HandleResult (Lime.onKeyChange (keyCode, true)); + me.HandleResult (Lime.onKeyChange (inKeyCode, charCode, true)); } @@ -384,7 +384,7 @@ class MainView extends GLSurfaceView { } - return super.onKeyDown(inKeyCode, event); + return super.onKeyDown (inKeyCode, event); } @@ -415,7 +415,7 @@ class MainView extends GLSurfaceView { }::end:: - final int keyCode = translateKey (inKeyCode, event); + final int charCode = translateKey (inKeyCode, event); if (keyCode != 0) { @@ -423,7 +423,7 @@ class MainView extends GLSurfaceView { public void run () { - me.HandleResult (Lime.onKeyChange (keyCode, false)); + me.HandleResult (Lime.onKeyChange (inKeyCode, charCode, false)); } @@ -433,7 +433,7 @@ class MainView extends GLSurfaceView { } - return super.onKeyDown(inKeyCode, event); + return super.onKeyDown (inKeyCode, event); }