From 69976da4277d87ad7e10994fa2dd1102130e82d5 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Fri, 11 Oct 2013 11:54:37 +0200 Subject: [PATCH] Java for SDL2 Updates --- changeAppSettings.sh | 7 +++++++ project/java/Globals.java | 1 + project/javaSDL2/Globals.java | 1 + project/javaSDL2/Settings.java | 2 +- project/javaSDL2/SettingsMenuMisc.java | 2 +- .../jni/application/commandergenius/AndroidAppSettings.cfg | 4 ++-- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 29b350a16..801992a1b 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -1002,6 +1002,11 @@ if [ "$LibSdlVersion" = "1.3" ] ; then UsingSdl13=true fi +UsingSdl20=false +if [ "$LibSdlVersion" = "2.0" ] ; then + UsingSdl20=true +fi + if [ "$ScreenOrientation" = "h" -o "$ScreenOrientation" = "l" ] ; then ScreenOrientation1=landscape HorizontalOrientation=true @@ -1292,6 +1297,8 @@ echo Patching project/src/Globals.java $SEDI "s/public static String ApplicationName = .*;/public static String ApplicationName = \"$AppShortName\";/" project/src/Globals.java $SEDI "s/public static final boolean Using_SDL_1_3 = .*;/public static final boolean Using_SDL_1_3 = $UsingSdl13;/" project/src/Globals.java +$SEDI "s/public static final boolean Using_SDL_2_0 = .*;/public static final boolean Using_SDL_2_0 = $UsingSdl20;/" project/src/Globals.java + # Work around "Argument list too long" problem when compiling VICE #$SEDI "s@public static String DataDownloadUrl = .*@public static String DataDownloadUrl = \"$AppDataDownloadUrl1\";@" project/src/Globals.java $SEDI "s@public static String\[\] DataDownloadUrl = .*@public static String[] DataDownloadUrl = { ### };@" project/src/Globals.java diff --git a/project/java/Globals.java b/project/java/Globals.java index 5e2959a3c..03edeb80c 100644 --- a/project/java/Globals.java +++ b/project/java/Globals.java @@ -33,6 +33,7 @@ class Globals public static String AppLibraries[] = { "sdl-1.2", }; public static String AppMainLibraries[] = { "application", "sdl_main" }; public static final boolean Using_SDL_1_3 = false; + public static final boolean Using_SDL_2_0 = false; public static String[] DataDownloadUrl = { "Data files are 2 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-data.zip/download", "High-quality GFX and music - 40 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-hqp.zip/download" }; public static int VideoDepthBpp = 16; public static boolean SwVideoMode = false; diff --git a/project/javaSDL2/Globals.java b/project/javaSDL2/Globals.java index 5e2959a3c..03edeb80c 100644 --- a/project/javaSDL2/Globals.java +++ b/project/javaSDL2/Globals.java @@ -33,6 +33,7 @@ class Globals public static String AppLibraries[] = { "sdl-1.2", }; public static String AppMainLibraries[] = { "application", "sdl_main" }; public static final boolean Using_SDL_1_3 = false; + public static final boolean Using_SDL_2_0 = false; public static String[] DataDownloadUrl = { "Data files are 2 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-data.zip/download", "High-quality GFX and music - 40 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-hqp.zip/download" }; public static int VideoDepthBpp = 16; public static boolean SwVideoMode = false; diff --git a/project/javaSDL2/Settings.java b/project/javaSDL2/Settings.java index 5a7720876..f6dc08fd6 100644 --- a/project/javaSDL2/Settings.java +++ b/project/javaSDL2/Settings.java @@ -187,7 +187,7 @@ class Settings return; } Log.i("SDL", "libSDL: Settings.Load(): enter"); - nativeInitKeymap(); +// nativeInitKeymap(); if( p.isRunningOnOUYA() ) nativeSetKeymapKey(KeyEvent.KEYCODE_MENU, nativeGetKeymapKey(KeyEvent.KEYCODE_BACK)); // Ouya does not have Back key, only Menu, so remap Back keycode to Menu for( int i = 0; i < SDL_Keys.JAVA_KEYCODE_LAST; i++ ) diff --git a/project/javaSDL2/SettingsMenuMisc.java b/project/javaSDL2/SettingsMenuMisc.java index 2e9e30fd2..2bdbe105e 100644 --- a/project/javaSDL2/SettingsMenuMisc.java +++ b/project/javaSDL2/SettingsMenuMisc.java @@ -368,7 +368,7 @@ class SettingsMenuMisc extends SettingsMenu defaults = defaults2; } - if(Globals.Using_SDL_1_3) + if(Globals.Using_SDL_1_3 || Globals.Using_SDL_2_0) { CharSequence[] items2 = { p.getResources().getString(R.string.pointandclick_keepaspectratio), diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 511e06237..8245d4f87 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -153,13 +153,13 @@ RedefinedKeysGamepad="LCTRL LALT SPACE RETURN" StartupMenuButtonTimeout=3000 # Menu items to hide from startup menu, available menu items: -# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout +# HiddenMenuOptions='' # Menu items to show at startup - this is Java code snippet, leave empty for default # new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration() # Available menu items: -# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout +# FirstStartMenuOptions='' # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,