diff --git a/changeAppSettings.sh b/changeAppSettings.sh index fd4d7bcf7..a500564a3 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -229,13 +229,18 @@ echo >> AndroidAppSettings.cfg echo "# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)" >> AndroidAppSettings.cfg echo ForceRelativeMouseMode=$ForceRelativeMouseMode >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg -echo "# Application needs arrow keys (y) or (n), will show on-screen dpad/joystick (y) or (n)" >> AndroidAppSettings.cfg +echo "# Show on-screen dpad/joystick, that will act as arrow keys (y) or (n)" >> AndroidAppSettings.cfg echo AppNeedsArrowKeys=$AppNeedsArrowKeys >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg +echo "# On-screen dpad/joystick will appear under finger when it touches the screen (y) or (n)" >> AndroidAppSettings.cfg +echo "# Joystick always follows finger, so moving mouse requires touching the screen with other finger" >> AndroidAppSettings.cfg +echo FloatingScreenJoystick=$FloatingScreenJoystick >> AndroidAppSettings.cfg +echo >> AndroidAppSettings.cfg echo "# Application needs text input (y) or (n), enables button for text input on screen" >> AndroidAppSettings.cfg echo AppNeedsTextInput=$AppNeedsTextInput >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1" >> AndroidAppSettings.cfg +echo "# This will disable AppNeedsArrowKeys option" >> AndroidAppSettings.cfg echo AppUsesJoystick=$AppUsesJoystick >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n)" >> AndroidAppSettings.cfg @@ -532,6 +537,12 @@ else AppNeedsArrowKeys=false fi +if [ "$FloatingScreenJoystick" = "y" ] ; then + FloatingScreenJoystick=true +else + FloatingScreenJoystick=false +fi + if [ "$AppNeedsTextInput" = "y" ] ; then AppNeedsTextInput=true else @@ -767,6 +778,7 @@ $SEDI "s/public static boolean ForceRelativeMouseMode = .*;/public static boolea $SEDI "s/public static boolean ShowMouseCursor = .*;/public static boolean ShowMouseCursor = $ShowMouseCursor;/" project/src/Globals.java $SEDI "s/public static boolean GenerateSubframeTouchEvents = .*;/public static boolean GenerateSubframeTouchEvents = $GenerateSubframeTouchEvents;/" project/src/Globals.java $SEDI "s/public static boolean AppNeedsArrowKeys = .*;/public static boolean AppNeedsArrowKeys = $AppNeedsArrowKeys;/" project/src/Globals.java +$SEDI "s/public static boolean FloatingScreenJoystick = .*;/public static boolean FloatingScreenJoystick = $FloatingScreenJoystick;/" project/src/Globals.java $SEDI "s/public static boolean AppNeedsTextInput = .*;/public static boolean AppNeedsTextInput = $AppNeedsTextInput;/" project/src/Globals.java $SEDI "s/public static boolean AppUsesJoystick = .*;/public static boolean AppUsesJoystick = $AppUsesJoystick;/" project/src/Globals.java $SEDI "s/public static boolean AppUsesSecondJoystick = .*;/public static boolean AppUsesSecondJoystick = $AppUsesSecondJoystick;/" project/src/Globals.java diff --git a/project/java/Accelerometer.java b/project/java/Accelerometer.java index 27b47856c..e99043b76 100644 --- a/project/java/Accelerometer.java +++ b/project/java/Accelerometer.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/Advertisement.java b/project/java/Advertisement.java index 43b007fd7..4cf93b4b6 100644 --- a/project/java/Advertisement.java +++ b/project/java/Advertisement.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/Audio.java b/project/java/Audio.java index 94ae6f427..e975280ca 100644 --- a/project/java/Audio.java +++ b/project/java/Audio.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java index 24d291584..5c908e552 100644 --- a/project/java/DataDownloader.java +++ b/project/java/DataDownloader.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/Globals.java b/project/java/Globals.java index 6fd1b09df..b1f589f71 100644 --- a/project/java/Globals.java +++ b/project/java/Globals.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be @@ -89,6 +89,7 @@ class Globals public static int TouchscreenKeyboardDrawSize = 1; public static int TouchscreenKeyboardTheme = 2; public static int TouchscreenKeyboardTransparency = 2; + public static boolean FloatingScreenJoystick = false; public static int AccelerometerSensitivity = 2; public static int AccelerometerCenterPos = 2; public static int TrackballDampening = 0; @@ -130,7 +131,6 @@ class Globals public static String DataDir = new String(""); public static boolean VideoLinearFilter = true; public static boolean MultiThreadedVideo = false; - public static boolean BrokenLibCMessageShown = false; public static boolean OuyaEmulation = false; // For debugging public static boolean RedirectStdout = false; // For debugging diff --git a/project/java/Keycodes.java b/project/java/Keycodes.java index 15aa6b6e9..ab6f31b23 100644 --- a/project/java/Keycodes.java +++ b/project/java/Keycodes.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 4c5808c77..e00431fd5 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/Settings.java b/project/java/Settings.java index 1bd1cd98e..4086fb5e2 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be @@ -159,7 +159,7 @@ class Settings out.writeInt(Globals.OptionalDataDownload.length); for(int i = 0; i < Globals.OptionalDataDownload.length; i++) out.writeBoolean(Globals.OptionalDataDownload[i]); - out.writeBoolean(Globals.BrokenLibCMessageShown); + out.writeBoolean(false); // Unused out.writeInt(Globals.TouchscreenKeyboardDrawSize); out.writeInt(p.getApplicationVersion()); out.writeFloat(AccelerometerReader.gyro.x1); @@ -177,6 +177,7 @@ class Settings out.writeBoolean(Globals.MoveMouseWithGyroscope); out.writeInt(Globals.MoveMouseWithGyroscopeSpeed); out.writeBoolean(Globals.FingerHover); + out.writeBoolean(Globals.FloatingScreenJoystick); out.close(); settingsLoaded = true; @@ -346,7 +347,7 @@ class Settings Globals.OptionalDataDownload = new boolean[settingsFile.readInt()]; for(int i = 0; i < Globals.OptionalDataDownload.length; i++) Globals.OptionalDataDownload[i] = settingsFile.readBoolean(); - Globals.BrokenLibCMessageShown = settingsFile.readBoolean(); + settingsFile.readBoolean(); // Unused Globals.TouchscreenKeyboardDrawSize = settingsFile.readInt(); int cfgVersion = settingsFile.readInt(); AccelerometerReader.gyro.x1 = settingsFile.readFloat(); @@ -364,6 +365,7 @@ class Settings Globals.MoveMouseWithGyroscope = settingsFile.readBoolean(); Globals.MoveMouseWithGyroscopeSpeed = settingsFile.readInt(); Globals.FingerHover = settingsFile.readBoolean(); + Globals.FloatingScreenJoystick = settingsFile.readBoolean(); settingsLoaded = true; @@ -560,7 +562,8 @@ class Settings nativeSetupScreenKeyboard( Globals.TouchscreenKeyboardSize, Globals.TouchscreenKeyboardDrawSize, Globals.TouchscreenKeyboardTheme, - Globals.TouchscreenKeyboardTransparency ); + Globals.TouchscreenKeyboardTransparency, + Globals.FloatingScreenJoystick ? 1 : 0 ); SetupTouchscreenKeyboardGraphics(p); for( int i = 0; i < Globals.RemapScreenKbKeycode.length; i++ ) nativeSetKeymapKeyScreenKb(i, SDL_Keys.values[Globals.RemapScreenKbKeycode[i]]); @@ -844,7 +847,7 @@ class Settings private static native void nativeSetCompatibilityHacks(); private static native void nativeSetVideoMultithreaded(); private static native void nativeSetVideoForceSoftwareMode(); - private static native void nativeSetupScreenKeyboard(int size, int drawsize, int theme, int transparency); + private static native void nativeSetupScreenKeyboard(int size, int drawsize, int theme, int transparency, int floatingScreenJoystick); private static native void nativeSetupScreenKeyboardButtons(byte[] img); private static native void nativeInitKeymap(); private static native int nativeGetKeymapKey(int key); @@ -861,4 +864,3 @@ class Settings public static native int nativeChmod(final String name, int mode); public static native void nativeChdir(final String dir); } - diff --git a/project/java/SettingsMenu.java b/project/java/SettingsMenu.java index 544eb0977..12ee38812 100644 --- a/project/java/SettingsMenu.java +++ b/project/java/SettingsMenu.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/SettingsMenuKeyboard.java b/project/java/SettingsMenuKeyboard.java index 469c3a4e6..ae791b448 100644 --- a/project/java/SettingsMenuKeyboard.java +++ b/project/java/SettingsMenuKeyboard.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/SettingsMenuMisc.java b/project/java/SettingsMenuMisc.java index 164038b01..0a3a223ba 100644 --- a/project/java/SettingsMenuMisc.java +++ b/project/java/SettingsMenuMisc.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/SettingsMenuMouse.java b/project/java/SettingsMenuMouse.java index 14d017d8c..acd6b230c 100644 --- a/project/java/SettingsMenuMouse.java +++ b/project/java/SettingsMenuMouse.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/Video.java b/project/java/Video.java index 52f23eafc..8885661a5 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/java/admob/Advertisement.java b/project/java/admob/Advertisement.java index e55cd8ae6..52a10a9e7 100644 --- a/project/java/admob/Advertisement.java +++ b/project/java/admob/Advertisement.java @@ -1,7 +1,7 @@ /* Simple DirectMedia Layer -Java source code (C) 2009-2012 Sergii Pylypenko - +Java source code (C) 2009-2014 Sergii Pylypenko + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -9,7 +9,7 @@ arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be diff --git a/project/jni/application/alienblaster/AndroidAppSettings.cfg b/project/jni/application/alienblaster/AndroidAppSettings.cfg index 2949de9ee..69c52a0b9 100644 --- a/project/jni/application/alienblaster/AndroidAppSettings.cfg +++ b/project/jni/application/alienblaster/AndroidAppSettings.cfg @@ -1,47 +1,259 @@ # The application settings for Android libSDL port -AppSettingVersion=17 -LibSdlVersion=1.3 + +# Specify application name (e.x. My Application) AppName="Alien Blaster" + +# Specify reversed site name of application (e.x. com.mysite.myapp) AppFullName=de.schwardtnet.alienblaster -ScreenOrientation=h -InhibitSuspend=n -AppDataDownloadUrl="!Game data|alienblaster110_data1.zip^!Game data|alienblaster110_data2.zip^!Game data|alienblaster110_data3.zip" -VideoDepthBpp=16 -NeedDepthBuffer=n -NeedStencilBuffer=n -NeedGles2=n -SwVideoMode=n -SdlVideoResize=y -SdlVideoResizeKeepAspect=n -CompatibilityHacks= -CompatibilityHacksStaticInit=n -CompatibilityHacksTextInputEmulatesHwKeyboard=n -AppUsesMouse=n -AppNeedsTwoButtonMouse=n -ShowMouseCursor=n -ForceRelativeMouseMode=n -AppNeedsArrowKeys=y -AppNeedsTextInput=y -AppUsesJoystick=n -AppHandlesJoystickSensitivity=n -AppUsesMultitouch=n -NonBlockingSwapBuffers=n -RedefinedKeys="RETURN LCTRL NO_REMAP NO_REMAP LCTRL" -AppTouchscreenKeyboardKeysAmount=4 -AppTouchscreenKeyboardKeysAmountAutoFire=1 -RedefinedKeysScreenKb="RETURN LCTRL PAGEUP PAGEDOWN LCTRL" -StartupMenuButtonTimeout=3000 -HiddenMenuOptions='OptionalDownloadConfig' -FirstStartMenuOptions='' -MultiABI=n + +# Application version code (integer) AppVersionCode=110014 + +# Application user-visible version name (string) AppVersionName="1.1.0.14" + +# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' +# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu +# If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as binary BLOB to the application dir and not unzipped +# If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - +# these files are put inside .apk package by build system +# Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS +AppDataDownloadUrl="!Game data|alienblaster110_data1.zip^!Game data|alienblaster110_data2.zip^!Game data|alienblaster110_data3.zip" + +# Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n + +# Delete application data files when upgrading (specify file/dir paths separated by spaces) DeleteFilesOnUpgrade="%" -CompiledLibraries="sdl_mixer sdl_image" -CustomBuildScript=n -AppCflags='-O3' -AppLdflags='' -AppSubdirsBuild='' -AppCmdline='' + +# Here you may type readme text, which will be shown during startup. Format is: +# Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ ReadmeText='^You can press "Home" now - the data will be downloaded in background^In game press "Menu" for secondary fire, "Volume Up/Down" to cycle weapons' + +# libSDL version to use (1.2/1.3/2.0) +LibSdlVersion=1.3 + +# Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape +ScreenOrientation=h + +# Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only +# with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) +VideoDepthBpp=16 + +# Enable OpenGL depth buffer (needed only for 3-d applications, small speed decrease) (y) or (n) +NeedDepthBuffer=n + +# Enable OpenGL stencil buffer (needed only for 3-d applications, small speed decrease) (y) or (n) +NeedStencilBuffer=n + +# Try to use GLES 2.x context - will revert to GLES 1.X if unsupported by device +# you need this option only if you're developing 3-d app (y) or (n) +NeedGles2=n + +# Application uses software video buffer - you're calling SDL_SetVideoMode() without SDL_HWSURFACE and without SDL_OPENGL, +# this will allow small speed optimization. Enable this even when you're using SDL_HWSURFACE. (y) or (n) +SwVideoMode=n + +# Application video output will be resized to fit into native device screen (y)/(n) +SdlVideoResize=y + +# Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n) +SdlVideoResizeKeepAspect=n + +# Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer +InhibitSuspend=n + +# Create Android service, so the app is less likely to be killed while in background +CreateService= + +# Application does not call SDL_Flip() or SDL_UpdateRects() appropriately, or draws from non-main thread - +# enabling the compatibility mode will force screen update every 100 milliseconds, which is laggy and inefficient (y) or (n) +CompatibilityHacksForceScreenUpdate= + +# Application does not call SDL_Flip() or SDL_UpdateRects() after mouse click (ScummVM and all Amiga emulators do that) - +# force screen update by moving mouse cursor a little after each click (y) or (n) +CompatibilityHacksForceScreenUpdateMouseClick=y + +# Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) +CompatibilityHacksStaticInit=n + +# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n) +CompatibilityHacksTextInputEmulatesHwKeyboard=n + +# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n) +CompatibilityHacksPreventAudioChopping= + +# Hack for broken apps: application ignores audio buffer size returned by SDL (y)/(n) +CompatibilityHacksAppIgnoresAudioBufferSize= + +# Hack for VCMI: preload additional shared libraries before aplication start +CompatibilityHacksAdditionalPreloadedSharedLibraries="" + +# Hack for Free Heroes 2, which redraws the screen inside SDL_PumpEvents(): slow and compatible SDL event queue - +# do not use it with accelerometer/gyroscope, or your app may freeze at random (y)/(n) +CompatibilityHacksSlowCompatibleEventQueue= + +# Save and restore OpenGL state when drawing on-screen keyboard for apps that use SDL_OPENGL +CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState= + +# Application uses SDL_UpdateRects() properly, and does not draw in any region outside those rects. +# This improves drawing speed, but I know only one application that does that, and it's written by me (y)/(n) +CompatibilityHacksProperUsageOfSDL_UpdateRects= + +# Application uses mouse (y) or (n), this will show mouse emulation dialog to the user +AppUsesMouse=n + +# Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n) +AppNeedsTwoButtonMouse=n + +# Right mouse button can do long-press/drag&drop action, necessary for some games (y) or (n) +# If you disable it, swiping with two fingers will send mouse wheel events +RightMouseButtonLongPress= + +# Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n) +ShowMouseCursor=n + +# Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n) +GenerateSubframeTouchEvents= + +# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n) +ForceRelativeMouseMode=n + +# Show on-screen dpad/joystick, that will act as arrow keys (y) or (n) +AppNeedsArrowKeys=y + +# On-screen dpad/joystick will appear under finger when it touches the screen (y) or (n) +# Joystick always follows finger, so moving mouse requires touching the screen with other finger +FloatingScreenJoystick=y + +# Application needs text input (y) or (n), enables button for text input on screen +AppNeedsTextInput=y + +# Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1 +# This will disable AppNeedsArrowKeys option +AppUsesJoystick=n + +# Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n) +AppUsesSecondJoystick=n + +# Application uses third on-screen joystick, as SDL joystick 0 axes 20-21 (y)/(n) +AppUsesThirdJoystick= + +# Application uses accelerometer (y) or (n), the accelerometer will be used as joystick 1 axes 0-1 and 5-7 +AppUsesAccelerometer= + +# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 +AppUsesGyroscope= + +# Use gyroscope to move mouse cursor (y) or (n), it eats battery, and can be disabled in settings, do not use with AppUsesGyroscope setting +MoveMouseWithGyroscope= + +# Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 +AppUsesMultitouch=n + +# Application records audio (it will use any available source, such a s microphone) +# API is defined in file SDL_android.h: int SDL_ANDROID_OpenAudioRecording(SDL_AudioSpec *spec); void SDL_ANDROID_CloseAudioRecording(void); +# This option will add additional permission to Android manifest (y)/(n) +AppRecordsAudio= + +# Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n) +AccessSdCard= + +# Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) +AccessInternet= + +# Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n) +ImmersiveMode= + +# Application implements Android-specific routines to put to background, and will not draw anything to screen +# between SDL_ACTIVEEVENT lost / gained notifications - you should check for them +# rigth after SDL_Flip(), if (n) then SDL_Flip() will block till app in background (y) or (n) +# This option is reported to be buggy, sometimes failing to restore video state +NonBlockingSwapBuffers=n + +# Redefine common hardware keys to SDL keysyms +# BACK hardware key is available on all devices, MENU is available on pre-ICS devices, other keys may be absent +# SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices +# Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) +# Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA +RedefinedKeys="RETURN LCTRL NO_REMAP NO_REMAP LCTRL" + +# Number of virtual keyboard keys (currently 6 is maximum) +AppTouchscreenKeyboardKeysAmount=4 + +# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) +RedefinedKeysScreenKb="RETURN LCTRL PAGEUP PAGEDOWN LCTRL" + +# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu +RedefinedKeysScreenKbNames="" + +# On-screen keys theme +# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) +# 1 = Simple Theme by Beholder (white, with gamepad joystick) +# 2 = Sun by Sirea (yellow, with round joystick) +# 3 = Keen by Gerstrong (multicolor, with round joystick) +TouchscreenKeysTheme=2 + +# Redefine gamepad keys to SDL keysyms, button order is: +# A B X Y L1 R1 L2 R2 LThumb RThumb +RedefinedKeysGamepad="" + +# How long to show startup menu button, in msec, 0 to disable startup menu +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='OptionalDownloadConfig' + +# 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='' + +# Specify architectures to compile, 'all' or 'y' to compile for all architectures. +# Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips +MultiABI='n' + +# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower +AppMinimumRAM= + +# Optional shared libraries to compile - removing some of them will save space +# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed +# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 +CompiledLibraries="sdl_mixer sdl_image" + +# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) +CustomBuildScript=n + +# Aditional CFLAGS for application +AppCflags='-O3' + +# Additional LDFLAGS for application +AppLdflags='' + +# If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable +AppOverlapsSystemHeaders= + +# Build only following subdirs (empty will build all dirs, ignored with custom script) +AppSubdirsBuild='' + +# Exclude these files from build +AppBuildExclude='' + +# Application command line parameters, including app name as 0-th param +AppCmdline='' + +# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens +# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge +MinimumScreenSize= + +# Your AdMob Publisher ID, (n) if you don't want advertisements +AdmobPublisherId= + +# Your AdMob test device ID, to receive a test ad +AdmobTestDeviceId= + +# Your AdMob banner size (BANNER/FULL_BANNER/LEADERBOARD/MEDIUM_RECTANGLE/SMART_BANNER/WIDE_SKYSCRAPER/FULL_WIDTH:Height/Width:AUTO_HEIGHT/Width:Height) +AdmobBannerSize= + diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 685dd710b..7b1849984 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -119,13 +119,18 @@ GenerateSubframeTouchEvents=n # Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n) ForceRelativeMouseMode=n -# Application needs arrow keys (y) or (n), will show on-screen dpad/joystick (y) or (n) +# Show on-screen dpad/joystick, that will act as arrow keys (y) or (n) AppNeedsArrowKeys=y +# On-screen dpad/joystick will appear under finger when it touches the screen (y) or (n) +# Joystick always follows finger, so moving mouse requires touching the screen with other finger +FloatingScreenJoystick=y + # Application needs text input (y) or (n), enables button for text input on screen AppNeedsTextInput=y # Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1 +# This will disable AppNeedsArrowKeys option AppUsesJoystick=y # Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n) @@ -208,7 +213,7 @@ FirstStartMenuOptions='SettingsMenu.DummyMenu' # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips -MultiABI='armeabi-v7a-hard x86 mips armeabi' +MultiABI='armeabi-v7a' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 diff --git a/project/jni/application/dspaceinvadors/AndroidAppSettings.cfg b/project/jni/application/dspaceinvadors/AndroidAppSettings.cfg index bc1dd07e2..9e8d5f754 100644 --- a/project/jni/application/dspaceinvadors/AndroidAppSettings.cfg +++ b/project/jni/application/dspaceinvadors/AndroidAppSettings.cfg @@ -36,9 +36,6 @@ LibSdlVersion=1.2 # Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape ScreenOrientation=h -# Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer -InhibitSuspend=n - # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) VideoDepthBpp=16 @@ -63,9 +60,19 @@ SdlVideoResize=y # Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n) SdlVideoResizeKeepAspect=n +# Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer +InhibitSuspend=n + +# Create Android service, so the app is less likely to be killed while in background +CreateService= + # Application does not call SDL_Flip() or SDL_UpdateRects() appropriately, or draws from non-main thread - # enabling the compatibility mode will force screen update every 100 milliseconds, which is laggy and inefficient (y) or (n) -CompatibilityHacks=n +CompatibilityHacksForceScreenUpdate=n + +# Application does not call SDL_Flip() or SDL_UpdateRects() after mouse click (ScummVM and all Amiga emulators do that) - +# force screen update by moving mouse cursor a little after each click (y) or (n) +CompatibilityHacksForceScreenUpdateMouseClick=y # Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) CompatibilityHacksStaticInit=n @@ -99,6 +106,10 @@ AppUsesMouse=n # Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n) AppNeedsTwoButtonMouse=n +# Right mouse button can do long-press/drag&drop action, necessary for some games (y) or (n) +# If you disable it, swiping with two fingers will send mouse wheel events +RightMouseButtonLongPress= + # Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n) ShowMouseCursor=n @@ -108,24 +119,35 @@ GenerateSubframeTouchEvents= # Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n) ForceRelativeMouseMode=n -# Application needs arrow keys (y) or (n), will show on-screen dpad/joystick (y) or (n) +# Show on-screen dpad/joystick, that will act as arrow keys (y) or (n) AppNeedsArrowKeys=y +# On-screen dpad/joystick will appear under finger when it touches the screen (y) or (n) +# Joystick always follows finger, so moving mouse requires touching the screen with other finger +FloatingScreenJoystick=y + # Application needs text input (y) or (n), enables button for text input on screen AppNeedsTextInput=n # Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1 +# This will disable AppNeedsArrowKeys option AppUsesJoystick=n # Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n) AppUsesSecondJoystick=n +# Application uses third on-screen joystick, as SDL joystick 0 axes 20-21 (y)/(n) +AppUsesThirdJoystick= + # Application uses accelerometer (y) or (n), the accelerometer will be used as joystick 1 axes 0-1 and 5-7 AppUsesAccelerometer=n # Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 AppUsesGyroscope=n +# Use gyroscope to move mouse cursor (y) or (n), it eats battery, and can be disabled in settings, do not use with AppUsesGyroscope setting +MoveMouseWithGyroscope= + # Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 AppUsesMultitouch=n @@ -137,6 +159,9 @@ AppRecordsAudio=n # Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n) AccessSdCard= +# Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) +AccessInternet= + # Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n) ImmersiveMode= @@ -156,9 +181,6 @@ RedefinedKeys="SPACE SPACE NO_REMAP NO_REMAP SPACE ESCAPE" # Number of virtual keyboard keys (currently 6 is maximum) AppTouchscreenKeyboardKeysAmount=1 -# Number of virtual keyboard keys that support autofire (currently 2 is maximum) -AppTouchscreenKeyboardKeysAmountAutoFire=0 - # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) RedefinedKeysScreenKb="SPACE" @@ -189,9 +211,9 @@ HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig' # 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, -# but .apk size is 2x bigger (y) / (n) / (x86) / (all) -MultiABI=all +# Specify architectures to compile, 'all' or 'y' to compile for all architectures. +# Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips +MultiABI='armeabi-v7a' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 @@ -205,7 +227,7 @@ CompiledLibraries="sdl_image sdl_mixer" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-O3 -DDSI_DATA_DIR=\\"data\\" -DDSI_DIR=\\".\\" -DDSI_SCORE_DIR=\\".\\" -DDSI_PIXMAP_DIR=\\".\\" -include ../../android_debug.h' +AppCflags='-O3 -DDSI_DATA_DIR=\"data\" -DDSI_DIR=\".\" -DDSI_SCORE_DIR=\".\" -DDSI_PIXMAP_DIR=\".\" -include ../../android_debug.h' # Additional LDFLAGS for application AppLdflags='' @@ -232,6 +254,6 @@ AdmobPublisherId=n # Your AdMob test device ID, to receive a test ad AdmobTestDeviceId= -# Your AdMob banner size (BANNER/IAB_BANNER/IAB_LEADERBOARD/IAB_MRECT/IAB_WIDE_SKYSCRAPER/SMART_BANNER) +# Your AdMob banner size (BANNER/FULL_BANNER/LEADERBOARD/MEDIUM_RECTANGLE/SMART_BANNER/WIDE_SKYSCRAPER/FULL_WIDTH:Height/Width:AUTO_HEIGHT/Width:Height) AdmobBannerSize= diff --git a/project/jni/application/dspaceinvadors/AndroidPreBuild.sh b/project/jni/application/dspaceinvadors/AndroidPreBuild.sh index f77ba2c84..a481f1022 100755 --- a/project/jni/application/dspaceinvadors/AndroidPreBuild.sh +++ b/project/jni/application/dspaceinvadors/AndroidPreBuild.sh @@ -6,8 +6,6 @@ if [ -e dspaceinvadors ] ; then else echo "Downloading sources..." svn checkout svn://svn.code.sf.net/p/dspaceinvadors/code/ dspaceinvadors || exit 1 - echo "Patching..." - patch -p0 -d dspaceinvadors < android.diff || exit 1 fi if [ -e dspaceinvadors/config.h ] ; then diff --git a/project/jni/application/dspaceinvadors/android.diff b/project/jni/application/dspaceinvadors/android.diff deleted file mode 100644 index 8d469e242..000000000 --- a/project/jni/application/dspaceinvadors/android.diff +++ /dev/null @@ -1,49 +0,0 @@ -Index: dsi/hi_score.c -=================================================================== ---- dsi/hi_score.c (revision 218) -+++ dsi/hi_score.c (working copy) -@@ -193,7 +193,7 @@ - key = SDL_GetKeyState(NULL); - if (key[SDLK_b] == SDL_PRESSED) - leave_state = RUN_INTRO; -- else if (key[SDLK_s] == SDL_PRESSED) -+ else if (key[SDLK_SPACE] == SDL_PRESSED) - leave_state = RUN_GAME; - WaitFrame(); - } -Index: dsi/main.c -=================================================================== ---- dsi/main.c (revision 218) -+++ dsi/main.c (working copy) -@@ -186,7 +186,7 @@ - } - - //Open the audio device -- if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 512) < 0 ) -+ if ( Mix_OpenAudio(11025, AUDIO_S16, 1, 1024) < 0 ) - { - fprintf(stderr, - "Warning: Couldn't set 11025 Hz 8-bit audio\n- Reason: %s\n", -Index: dsi/intro.c -=================================================================== ---- dsi/intro.c (revision 218) -+++ dsi/intro.c (working copy) -@@ -75,7 +75,7 @@ - leave_state = RUN_QUIT; - } - key = SDL_GetKeyState(NULL); -- if (key[SDLK_s] == SDL_PRESSED) -+ if (key[SDLK_SPACE] == SDL_PRESSED) - leave_state = RUN_GAME; - else if (key[SDLK_v] == SDL_PRESSED) - leave_state = RUN_SCORE; -Index: dsi/sprite.c -=================================================================== ---- dsi/sprite.c (revision 218) -+++ dsi/sprite.c (working copy) -@@ -119,4 +119,5 @@ - SDL_Delay(next_tick-this_tick); - } - next_tick = this_tick + (1000/FRAMES_PER_SEC); -+ UpdateScreen(); // If we don't update screen on Android, we will not receive any input events - } diff --git a/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.c b/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.c index 8fc9988c2..cbc499193 100644 --- a/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.c +++ b/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.c @@ -1,26 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This file written by Ryan C. Gordon (icculus@icculus.org) + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_version.h" diff --git a/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.h b/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.h index ae1e745d3..ef659d72d 100644 --- a/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.h +++ b/project/jni/sdl-1.2/src/audio/android/SDL_androidaudio.h @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #ifndef _SDL_androidaudio_h diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-compat.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-compat.c index 32045ad3e..be247322d 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-compat.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-compat.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include #include #include diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c index 4a449359a..ca55c003e 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput-queue-fast.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include #include #include diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c index 62ae41798..d19fb4535 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include #include #include diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h index f8b5cb931..89e387f6c 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #ifndef _SDL_ANDROIDINPUT_H_ #define _SDL_ANDROIDINPUT_H_ diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c index bcbb90aaa..7cd7911f6 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_video.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c index dc39713c8..e6700f665 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.3-stub.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_pixels.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c index 2baf3414d..3527e404a 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c @@ -1,23 +1,28 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ #include diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.h b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.h index 29c7e3af7..2d860c6f2 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.h @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #ifndef _SDL_androidvideo_h #define _SDL_androidvideo_h diff --git a/project/jni/sdl-1.2/src/video/android/SDL_blendmode.h b/project/jni/sdl-1.2/src/video/android/SDL_blendmode.h index 33aa719fe..f0d300566 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_blendmode.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_blendmode.h @@ -1,41 +1,32 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ -/** - * \file SDL_blendmode.h - * - * Header file declaring the SDL_BlendMode enumeration - */ - -#ifndef _SDL_blendmode_h -#define _SDL_blendmode_h - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif +#ifndef _SDL_blendmode_h_android_stub +#define _SDL_blendmode_h_android_stub /** * \brief The blend mode used in SDL_RenderCopy() and drawing operations. @@ -51,14 +42,4 @@ typedef enum SDL_BLENDMODE_MOD = 0x00000008 /**< dst = src * dst */ } SDL_BlendMode; -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ #endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/project/jni/sdl-1.2/src/video/android/SDL_opengles.h b/project/jni/sdl-1.2/src/video/android/SDL_opengles.h index d685a8b3b..c42acf521 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_opengles.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_opengles.h @@ -1,24 +1,29 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - */ + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ /** * \file SDL_opengles.h diff --git a/project/jni/sdl-1.2/src/video/android/SDL_pixels.c b/project/jni/sdl-1.2/src/video/android/SDL_pixels.c index 12fbf4eb8..560a3515c 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_pixels.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_pixels.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_version.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_pixels.h b/project/jni/sdl-1.2/src/video/android/SDL_pixels.h index 100b5325b..3b27b7dd8 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_pixels.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_pixels.h @@ -1,23 +1,28 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ /** diff --git a/project/jni/sdl-1.2/src/video/android/SDL_pixels_c.h b/project/jni/sdl-1.2/src/video/android/SDL_pixels_c.h index 0db2f1247..9a87adb38 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_pixels_c.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_pixels_c.h @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_version.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_rect.c b/project/jni/sdl-1.2/src/video/android/SDL_rect.c index cb84e6ee6..c77d4ca17 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_rect.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_rect.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_video.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_rect.h b/project/jni/sdl-1.2/src/video/android/SDL_rect.h index 9b531bff0..17f19163c 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_rect.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_rect.h @@ -1,23 +1,28 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ /** diff --git a/project/jni/sdl-1.2/src/video/android/SDL_rect_c.h b/project/jni/sdl-1.2/src/video/android/SDL_rect_c.h index 8438a231f..40582dd15 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_rect_c.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_rect_c.h @@ -1,23 +1,28 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ #include "SDL_config.h" #include "SDL_rect.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.c b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.c index 9cb471e91..3db4aeb2c 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_version.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.h b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.h index f86328d4e..0e50927c2 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_renderer_gles.h @@ -1,23 +1,28 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ #include "SDL_config.h" diff --git a/project/jni/sdl-1.2/src/video/android/SDL_scalemode.h b/project/jni/sdl-1.2/src/video/android/SDL_scalemode.h index a658c68bb..cc7d2b947 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_scalemode.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_scalemode.h @@ -1,23 +1,28 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ /** diff --git a/project/jni/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h b/project/jni/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h index 8182cb487..e0c27bb99 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_sysvideo-1.3.h @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #ifndef _SDL_sysvideo_1_3_h diff --git a/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c index ebbd23b47..0ae6e77b5 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga +Simple DirectMedia Layer +Copyright (C) 2009-2014 Sergii Pylypenko - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include #include #include @@ -88,6 +94,7 @@ enum { MOUSE_POINTER_W = 32, MOUSE_POINTER_H = 32, MOUSE_POINTER_X = 5, MOUSE_PO static int sunTheme = 0; static int joystickTouchPoints[MAX_JOYSTICKS*2]; +static int floatingScreenJoystick = 0; static void R_DumpOpenGlState(void); @@ -96,6 +103,39 @@ static inline int InsideRect(const SDL_Rect * r, int x, int y) return ( x >= r->x && x <= r->x + r->w ) && ( y >= r->y && y <= r->y + r->h ); } +// Find the intersection of a line and a rectangle, +// where on of the line points and the center of rectangle +// are both at the coordinate [0,0]. +// It returns the remaining line segment outside of the rectangle. +// Do not check for border condition, we check that the line point +// is outside of the rectangle in another function. +static inline void LineAndRectangleIntersection( + int lx, int ly, // Line point, that is outside of rectangle + int rw, int rh, // Rectangle dimensions + int *x, int *y) +{ + if( abs(lx) * rh > abs(ly) * rw ) + { + rw /= 2; + // Intersection at the left side + if( lx < -rw ) + *x = lx + rw; // lx is negative + else //if( lx > rw ) // At the right side + *x = lx - rw; // lx is positive + *y = *x * ly / lx; + } + else + { + rh /= 2; + // At the top + if( ly < -rh ) + *y = ly + rh; // ly is negative + else //if( ly > rh ) // At the right side + *y = ly - rh; // ly is positive + *x = *y * lx / ly; + } +} + static struct ScreenKbGlState_t { GLboolean texture2d; @@ -324,6 +364,11 @@ static inline int ArrowKeysPressed(int x, int y) int ret = 0, dx, dy; dx = x - arrows[0].x - arrows[0].w / 2; dy = y - arrows[0].y - arrows[0].h / 2; + + // Small deadzone at the center + if( abs(dx) < arrows[0].w / 20 && abs(dy) < arrows[0].h / 20 ) + return ret; + // Single arrow key pressed if( abs(dy / 2) >= abs(dx) ) { @@ -360,7 +405,7 @@ unsigned SDL_ANDROID_processTouchscreenKeyboard(int x, int y, int action, int po int i, j; unsigned processed = 0; int joyAmount = SDL_ANDROID_joysticksAmount; - if( joyAmount == 0 && arrows[0].w > 0 ) + if( joyAmount == 0 && (arrows[0].w > 0 || floatingScreenJoystick) ) joyAmount = 1; if( !touchscreenKeyboardShown ) @@ -382,8 +427,8 @@ unsigned SDL_ANDROID_processTouchscreenKeyboard(int x, int y, int action, int po if( SDL_ANDROID_joysticksAmount > 0 ) { int xx = (x - arrows[j].x - arrows[j].w / 2) * 65534 / arrows[j].w; - if( xx == 0 ) // Do not allow (0,0) coordinate, when the user touches the joystick - xx = 1; + if( xx == 0 ) // Do not allow (0,0) coordinate, when the user touches the joystick - this indicates 'finger up' in OpenArena + xx = 1; // Yeah, maybe I should not include app-specific hacks into the library int axis = j < 2 ? j*2 : MAX_MULTITOUCH_POINTERS + 4; SDL_ANDROID_MainThreadPushJoystickAxis( 0, axis, xx ); SDL_ANDROID_MainThreadPushJoystickAxis( 0, axis + 1, (y - arrows[j].y - arrows[j].h / 2) * 65534 / arrows[j].h ); @@ -424,6 +469,24 @@ unsigned SDL_ANDROID_processTouchscreenKeyboard(int x, int y, int action, int po } } } + + if( floatingScreenJoystick && !processed && pointerInButtonRect[BUTTON_ARROWS] == -1 ) + { + // Center joystick under finger + SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_DPAD, 1); + arrows[0].x = x - arrows[0].w / 2; + arrows[0].y = y - arrows[0].h / 2; + arrowsDraw[0] = arrowsExtended[0] = arrows[0]; + processed |= 1< 0 ) + { + SDL_ANDROID_MainThreadPushJoystickAxis( 0, 0, 1 ); // Non-zero joystick coordinate + SDL_ANDROID_MainThreadPushJoystickAxis( 0, 1, 0 ); + } + } } else if( action == MOUSE_UP ) @@ -449,6 +512,8 @@ unsigned SDL_ANDROID_processTouchscreenKeyboard(int x, int y, int action, int po SDL_ANDROID_MainThreadPushKeyboardKey( SDL_RELEASED, SDL_KEY(RIGHT), 0 ); oldArrows = 0; } + if( floatingScreenJoystick && j == 0 ) + SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_DPAD, 0); } } for( i = 0; i < MAX_BUTTONS; i++ ) @@ -489,6 +554,15 @@ unsigned SDL_ANDROID_processTouchscreenKeyboard(int x, int y, int action, int po if( pointerInButtonRect[BUTTON_ARROWS+j] == pointerId ) { processed |= 1<<(BUTTON_ARROWS+j); + if( floatingScreenJoystick && j == 0 && ! InsideRect( &arrows[j], x, y ) ) + { + int xx = 0, yy = 0; + // A finger moved outside the joystick - move the joystick back under the finger + LineAndRectangleIntersection(x - (arrows[0].x + arrows[0].w / 2), y - (arrows[0].y + arrows[0].h / 2), arrows[0].w, arrows[0].h, &xx, &yy); + arrows[0].x += xx; + arrows[0].y += yy; + arrowsDraw[0] = arrowsExtended[0] = arrows[0]; + } if( ! InsideRect( &arrowsExtended[j], x, y ) ) { pointerInButtonRect[BUTTON_ARROWS+j] = -1; @@ -514,7 +588,10 @@ unsigned SDL_ANDROID_processTouchscreenKeyboard(int x, int y, int action, int po if( SDL_ANDROID_joysticksAmount > 0 ) { int axis = j < 2 ? j*2 : MAX_MULTITOUCH_POINTERS + 4; - SDL_ANDROID_MainThreadPushJoystickAxis( 0, axis, (x - arrows[j].x - arrows[j].w / 2) * 65534 / arrows[j].w ); + int xx = (x - arrows[j].x - arrows[j].w / 2) * 65534 / arrows[j].w; + if( xx == 0 ) // Do not allow (0,0) coordinate, when the user touches the joystick - this indicates 'finger up' in OpenArena + xx = 1; // Yeah, maybe I should not include app-specific hacks into the library + SDL_ANDROID_MainThreadPushJoystickAxis( 0, axis, xx ); SDL_ANDROID_MainThreadPushJoystickAxis( 0, axis + 1, (y - arrows[j].y - arrows[j].h / 2) * 65534 / arrows[j].h ); } else @@ -584,7 +661,8 @@ void shrinkButtonRect(SDL_Rect s, SDL_Rect * d) } JNIEXPORT void JNICALL -JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thiz, jint size, jint drawsize, jint theme, jint _transparency ) +JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thiz, + jint size, jint drawsize, jint theme, jint _transparency, jint _floatingScreenJoystick ) { int i, ii; int nbuttons1row, nbuttons2row; @@ -675,6 +753,13 @@ JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thi shrinkButtonRect(buttons[i], &buttonsDraw[i]); for( i = 0; i < SDL_ANDROID_SCREENKEYBOARD_BUTTON_NUM; i++ ) SDL_ANDROID_GetScreenKeyboardButtonPos(i, &hiddenButtons[i]); + + floatingScreenJoystick = _floatingScreenJoystick; + if( floatingScreenJoystick ) + { + arrowsExtended[0] = arrows[0] = arrowsDraw[0]; + SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_DPAD, 0); + } }; JNIEXPORT void JNICALL diff --git a/project/jni/sdl-1.2/src/video/android/SDL_video-1.3.h b/project/jni/sdl-1.2/src/video/android/SDL_video-1.3.h index 28c9af68a..3024138e4 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_video-1.3.h +++ b/project/jni/sdl-1.2/src/video/android/SDL_video-1.3.h @@ -1,30 +1,29 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. */ - -/** - * \file SDL_video.h - * - * Header file for SDL video functions. - */ #ifndef _SDL_video_1_3_h #define _SDL_video_1_3_h diff --git a/project/jni/sdl-1.2/src/video/android/SDL_video.c b/project/jni/sdl-1.2/src/video/android/SDL_video.c index be2e95e5b..51191f091 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_video.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_video.c @@ -1,24 +1,30 @@ /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2010 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. */ +/* +This source code is distibuted under ZLIB license, however when compiling with SDL 1.2, +which is licensed under LGPL, the resulting library, and all it's source code, +falls under "stronger" LGPL terms, so is this file. +If you compile this code with SDL 1.3 or newer, or use in some other way, the license stays ZLIB. +*/ + #include "SDL_config.h" #include "SDL_version.h" diff --git a/project/jni/sdl-1.2/src/video/android/atan2i.h b/project/jni/sdl-1.2/src/video/android/atan2i.h index 59efd9d72..0119c6991 100644 --- a/project/jni/sdl-1.2/src/video/android/atan2i.h +++ b/project/jni/sdl-1.2/src/video/android/atan2i.h @@ -1,3 +1,5 @@ +/* The license of this source code is public domain */ + #ifndef __ATAN2I_H__ #define __ATAN2I_H__ #include diff --git a/project/jni/sdl-1.2/src/video/android/javakeycodes.h b/project/jni/sdl-1.2/src/video/android/javakeycodes.h index 4c07fc397..eb87284b1 100644 --- a/project/jni/sdl-1.2/src/video/android/javakeycodes.h +++ b/project/jni/sdl-1.2/src/video/android/javakeycodes.h @@ -1,3 +1,5 @@ +/* The license of this source code is public domain */ + #ifndef _JAVA_KEY_CODES_H_ #define _JAVA_KEY_CODES_H_ diff --git a/project/jni/sdl-1.2/src/video/android/jniwrapperstuff.h b/project/jni/sdl-1.2/src/video/android/jniwrapperstuff.h index 6a37980aa..7f46e0cb9 100644 --- a/project/jni/sdl-1.2/src/video/android/jniwrapperstuff.h +++ b/project/jni/sdl-1.2/src/video/android/jniwrapperstuff.h @@ -1,3 +1,4 @@ +/* The license of this source code is public domain */ /* JNI-C++ wrapper stuff */ #ifndef _JNI_WRAPPER_STUFF_H_ diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c index 650834450..dd924e6e1 100644 --- a/project/jni/sdl-1.2/src/video/android/keymap.c +++ b/project/jni/sdl-1.2/src/video/android/keymap.c @@ -1,3 +1,5 @@ +/* The license of this source code is public domain */ + #include "SDL_config.h" #include "SDL_version.h" diff --git a/project/jni/sdl-1.2/src/video/android/unicodestuff.h b/project/jni/sdl-1.2/src/video/android/unicodestuff.h index 2c730b829..fe894486c 100644 --- a/project/jni/sdl-1.2/src/video/android/unicodestuff.h +++ b/project/jni/sdl-1.2/src/video/android/unicodestuff.h @@ -1,3 +1,5 @@ +/* The license of this source code is public domain */ + #ifndef _UNICODE_STUFF_H_ #define _UNICODE_STUFF_H_ diff --git a/todo.txt b/todo.txt index 333481746..9da834f85 100644 --- a/todo.txt +++ b/todo.txt @@ -19,7 +19,12 @@ TODO, which will get actually done - SDL: control mouse with right analog gamepad stick. -- SDL: user-configurable option to set screen orientation. +- SDL: user-configurable option to set screen orientation and BPP. + +- SDL: 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. + +- SDL: option to disable immersive mode. - 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.