From e0adc66b9288ce8634ba2aadcad66a0f27df23c4 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 14 Jan 2013 17:42:14 +0200 Subject: [PATCH 1/5] Updated TODO --- bugs.txt | 26 ++++-------------------- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- project/jni/boost/src | 2 +- todo.txt | 25 +++++++++++++++++++++-- 5 files changed, 30 insertions(+), 27 deletions(-) diff --git a/bugs.txt b/bugs.txt index c2b476e7c..e1ac31c5d 100644 --- a/bugs.txt +++ b/bugs.txt @@ -1,10 +1,14 @@ Known bugs ========== +- Stylus input is broken in Cyanogenmod 10.1 and in stock JellyBean Samsung ROM. + - With 4:3 screen aspect ratio the on-screen buttons are not shown on the inactive part of screen. - Put video at the center of the screen with 4:3 aspect ratio option +- SdlVideoResizeKeepAspect=y in AndroidAppSettings.cfg does no work + - Calling SDL_SetVideoMode() with SDL 1.3 several times makes it crash. - Calling SDL_Init()/SDL_Quit() several times will make SDL 1.2 crash. @@ -14,25 +18,3 @@ Known bugs - 32-bpp color mode does not work with SW video surface, 24-bpp and 32-bpp mode does not work with SDL_HWSURFACE. - Option SdlVideoResizeKeepAspect has no effect - -Requested features -================== - -- Perform a check for free space available on SD card before writing there, and write to the internal storage if SD card is unplugged. - -- Split Settings.java into several files - -- Show/hide screen controls with longpress on Text Edit button. - -- Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported) - -- Floating on-screen joystick - initially invisible, it appears when you touch the screen, - centered on your finger, then it slides with your finger if you bump the joystick edge. - -- Export phone vibrator to SDL - interface is available in SDL 1.3 - -- Control screen brightness with SDL_SetGamma() - -- Zoom in-out whole screen in SW mode with some SDL key - - much like the "On-screen magnifying glass" feature (lazy porter's golden hammer) - diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 9104eb974..82513e886 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 9104eb9749bd9ef21805cc1ac0d5a1840adf46d8 +Subproject commit 82513e88619941eef9649a0ef73c2b866d3fd005 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 26cafdcda..5c6363076 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 26cafdcdab7099d4992e747649f98ac42a3a8be8 +Subproject commit 5c6363076d61fecfa97889f5c45ec422ba890d99 diff --git a/project/jni/boost/src b/project/jni/boost/src index 6ccbf9772..b59d6e854 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 6ccbf9772e027b8f16a4635b893d62b37f20b156 +Subproject commit b59d6e854713568f6c1811aba28d54ce07fe8c1a diff --git a/todo.txt b/todo.txt index a2976458c..07b30a306 100644 --- a/todo.txt +++ b/todo.txt @@ -1,2 +1,23 @@ -I'm not planning any more games to port, or any development on this SDL port. -See bugs.txt if you want to contribute. \ No newline at end of file +Requested features +================== + +- Option for default on-screen key theme in AndroidAppSettings.cfg. + +- Perform a check for free space available on SD card before writing there, and write to the internal storage if SD card is unplugged. + +- Split Settings.java into several files + +- Show/hide screen controls with longpress on Text Edit button. + +- Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported) + +- Floating on-screen joystick - initially invisible, it appears when you touch the screen, + centered on your finger, then it slides with your finger if you bump the joystick edge. + +- Export phone vibrator to SDL - interface is available in SDL 1.3 + +- Control screen brightness with SDL_SetGamma() + +- Zoom in-out whole screen in SW mode with some SDL key - + much like the "On-screen magnifying glass" feature (lazy porter's golden hammer) + From 5cd025dccb4e97a1ffd010e1f5cbb88efd7541e5 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 16 Jan 2013 23:49:11 +0200 Subject: [PATCH 2/5] Updated OpenArena --- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index c0b892352..d1b8a7ae0 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit c0b892352ddd702d5b028f53dde775a867f33585 +Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index d005816c5..d99f7bbd7 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit d005816c5b89a577f9127203dc31f7365a565edf +Subproject commit d99f7bbd73c9d05942c93ebc144bd3e210e24bff diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 3546f88fc..7e15a99f5 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 3546f88fcf261df1322d8a47d517446e87ed5fc4 +Subproject commit 7e15a99f54248e86070473a5e2588016f1d03ee4 From 0d4bbe81d75dcb2def62a45dff1fe9726a78fd5e Mon Sep 17 00:00:00 2001 From: pelya Date: Thu, 17 Jan 2013 16:12:09 +0200 Subject: [PATCH 3/5] Updated bugs and todo --- bugs.txt | 4 ++-- todo.txt | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bugs.txt b/bugs.txt index e1ac31c5d..3e220c233 100644 --- a/bugs.txt +++ b/bugs.txt @@ -1,5 +1,5 @@ -Known bugs -========== +Known bugs (see also todo.txt) +============================== - Stylus input is broken in Cyanogenmod 10.1 and in stock JellyBean Samsung ROM. diff --git a/todo.txt b/todo.txt index 07b30a306..205761511 100644 --- a/todo.txt +++ b/todo.txt @@ -1,23 +1,22 @@ -Requested features -================== +Requested features (see also bugs.txt) +====================================== - Option for default on-screen key theme in AndroidAppSettings.cfg. -- Perform a check for free space available on SD card before writing there, and write to the internal storage if SD card is unplugged. +- Select between normal mouse input and magnifying glass/relative input automatically, based on screen size. -- Split Settings.java into several files +- Split Settings.java into several files. - Show/hide screen controls with longpress on Text Edit button. -- Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported) - - Floating on-screen joystick - initially invisible, it appears when you touch the screen, centered on your finger, then it slides with your finger if you bump the joystick edge. -- Export phone vibrator to SDL - interface is available in SDL 1.3 +- Export phone vibrator to SDL - interface is available in SDL 1.3. -- Control screen brightness with SDL_SetGamma() +- Control screen brightness with SDL_SetGamma(). -- Zoom in-out whole screen in SW mode with some SDL key - - much like the "On-screen magnifying glass" feature (lazy porter's golden hammer) +- Zoom in-out whole screen in SW mode with some SDL key or gesture, as in AndroidVNC. - +- Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported). + This is not relevant already, as every device around is fast enough with GL. From 103b5543bce018d601ed66f9dfc1ff97c25af2f6 Mon Sep 17 00:00:00 2001 From: pelya Date: Sat, 19 Jan 2013 20:44:00 +0200 Subject: [PATCH 4/5] Fixed Galaxy Note 2 stylus events, removed Note-specific hack to stylus input --- project/java/Video.java | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/project/java/Video.java b/project/java/Video.java index 1468a3b10..3803a4af9 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -108,10 +108,9 @@ abstract class DifferentTouchInput multiTouchAvailable2 = true; } try { + System.out.println("Device model: " + android.os.Build.MODEL); if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH ) { - if(android.os.Build.MODEL.equals("GT-N7000") || android.os.Build.MODEL.equals("SGH-I717")) - return GalaxyNoteIcsTouchInput.Holder.sInstance; return IcsTouchInput.Holder.sInstance; } if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD ) @@ -345,8 +344,8 @@ abstract class DifferentTouchInput } 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) == InputDevice.SOURCE_MOUSE || + (event.getSource() & InputDevice.SOURCE_STYLUS) == InputDevice.SOURCE_STYLUS || (event.getMetaState() & KeyEvent.FLAG_TRACKING) != 0 ); // Hack to recognize Galaxy Note Gingerbread stylus if( ExternalMouseDetected != hwMouseEvent ) { @@ -422,20 +421,6 @@ abstract class DifferentTouchInput super.processGenericEvent(event); } } - private static class GalaxyNoteIcsTouchInput extends IcsTouchInput - { - private static class Holder - { - private static final GalaxyNoteIcsTouchInput sInstance = new GalaxyNoteIcsTouchInput(); - } - public void process(final MotionEvent event) - { - // HACK for Galaxy Note stylus, which pushes the cursor to the lower-right part of the screen, when you lift the stylus. - // Also it reports the stylus as the mouse - if(! (event.getSource() == InputDevice.SOURCE_MOUSE && (int)event.getX() == 0 && (int)event.getY() == 799)) - super.process(event); - } - } } From dbc5ea143911d3b174119f832f381e53808818ef Mon Sep 17 00:00:00 2001 From: pelya Date: Sat, 19 Jan 2013 21:40:08 +0200 Subject: [PATCH 5/5] Updated OpenTTD project --- project/jni/application/openarena/engine | 2 +- project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd/readme.txt | 4 +++- project/jni/boost/src | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index d99f7bbd7..4becead5a 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit d99f7bbd73c9d05942c93ebc144bd3e210e24bff +Subproject commit 4becead5ad9a44d83a3c0793a0ce8bf1834279ea diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 7bf0af636..9ebf24a23 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -37,9 +37,9 @@ HiddenMenuOptions='OptionalDownloadConfig' FirstStartMenuOptions='' MultiABI=n AppMinimumRAM=0 -AppVersionCode=12324 -AppVersionName="1.2.3.24" -ResetSdlConfigForThisVersion=y +AppVersionCode=12325 +AppVersionName="1.2.3.25" +ResetSdlConfigForThisVersion=n DeleteFilesOnUpgrade="%" CompiledLibraries="jpeg png freetype timidity lzma lzo2" CustomBuildScript=y diff --git a/project/jni/application/openttd/readme.txt b/project/jni/application/openttd/readme.txt index 870b3e77a..21fc3ccc0 100644 --- a/project/jni/application/openttd/readme.txt +++ b/project/jni/application/openttd/readme.txt @@ -1,5 +1,7 @@ Quick compilation guide: -Download my GIT repo from https://github.com/pelya/commandergenius, +Install liblzma-dev, it's needed for configure script +sudo apt-get install liblzma-dev +Download my Git repo from https://github.com/pelya/commandergenius, then install Android SDK, Android NDK, and "ant" tool, then launch commands rm project/jni/application/src ln -s openttd project/jni/application/src diff --git a/project/jni/boost/src b/project/jni/boost/src index b59d6e854..6ccbf9772 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit b59d6e854713568f6c1811aba28d54ce07fe8c1a +Subproject commit 6ccbf9772e027b8f16a4635b893d62b37f20b156