From 6223e170dffd2b37c22d37b6f6f5128a8c03130e Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 13 Jun 2012 20:17:26 +0300 Subject: [PATCH] Some support for Galaxy Note Gingerbread stylus --- project/java/Settings.java | 1 + project/java/Video.java | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/project/java/Settings.java b/project/java/Settings.java index 966fc95a1..0cd182132 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -206,6 +206,7 @@ class Settings // And I don't know whether this is true for ICS update for Galaxy Note Globals.RemapHwKeycode[112] = SDL_1_2_Keycodes.SDLK_UNKNOWN; } + try { ObjectInputStream settingsFile = new ObjectInputStream(new FileInputStream( p.getFilesDir().getAbsolutePath() + "/" + SettingsFileName )); diff --git a/project/java/Video.java b/project/java/Video.java index 8e23a56f5..cbe2c68f8 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -337,9 +337,13 @@ abstract class DifferentTouchInput minRange = Math.min( Math.abs(ymax - ymin), Math.abs(xmax - xmin) ); } } + private int GalaxyNoteGingerStylus = 0; public void process(final MotionEvent event) { - boolean hwMouseEvent = ( event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == InputDevice.SOURCE_STYLUS ); + boolean hwMouseEvent = ( event.getSource() == InputDevice.SOURCE_MOUSE || + event.getSource() == InputDevice.SOURCE_STYLUS || + (event.getMetaState() & KeyEvent.FLAG_TRACKING) != 0 ); // Hack to recognize Galaxy Note Gingerbread stylus + System.out.println("Event source: " + event.getSource() + " stylus: " + hwMouseEvent + " meta " + event.getMetaState()); if( ExternalMouseDetected != hwMouseEvent ) { ExternalMouseDetected = hwMouseEvent; @@ -670,7 +674,7 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL { // This seems like redundant code - it handled in MainActivity.java @Override public boolean onKeyDown(int keyCode, final KeyEvent event) { - //System.out.println("Got key down event, id " + keyCode); + //System.out.println("Got key down event, id " + keyCode + " meta " + event.getMetaState() + " event " + event.toString()); if( nativeKey( keyCode, 1 ) == 0 ) return super.onKeyDown(keyCode, event); return true; @@ -678,7 +682,7 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL { @Override public boolean onKeyUp(int keyCode, final KeyEvent event) { - //System.out.println("Got key up event, id " + keyCode); + //System.out.println("Got key up event, id " + keyCode + " meta " + event.getMetaState()); if( nativeKey( keyCode, 0 ) == 0 ) return super.onKeyUp(keyCode, event); return true;