diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index c5166473f..8bd470dba 100644 --- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Debian" AppFullName=com.cuntubuntu # Application version code (integer) -AppVersionCode=200107 +AppVersionCode=200109 # Application user-visible version name (string) -AppVersionName="20.01.07" +AppVersionName="20.01.09" # 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, '!!' will also hide the entry from the menu, so it cannot be disabled @@ -23,7 +23,7 @@ AppVersionName="20.01.07" AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:logo.png:logo.png^!!Sloppy symlinks patch|:symlinks.tar.xz:symlinks-.tar.xz^!!System overlay|:overlay.tar.xz:overlay-.tar.xz" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n +ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" @@ -208,13 +208,13 @@ NonBlockingSwapBuffers=n RedefinedKeys="LALT UNDO NO_REMAP NO_REMAP UNDO HELP" # Number of virtual keyboard keys (currently 6 is maximum) -AppTouchscreenKeyboardKeysAmount=3 +AppTouchscreenKeyboardKeysAmount=4 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2" +RedefinedKeysScreenKb="LCTRL LALT LSHIFT HELP SPACE DELETE KP_PLUS KP_MINUS 1 2" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu -RedefinedKeysScreenKbNames="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2" +RedefinedKeysScreenKbNames="LCTRL LALT LSHIFT Keyboard SPACE DELETE KP_PLUS KP_MINUS 1 2" # On-screen keys theme # 0 = Ultimate Droid by Sean Stieber (green, with cross joystick) diff --git a/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz b/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz index 4d591e857..d5f9eae62 100644 Binary files a/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz and b/project/jni/application/xserver-debian/AndroidData/overlay-arm64-v8a.tar.xz differ diff --git a/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz b/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz index faa50ef96..cc6defa6f 100644 Binary files a/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz and b/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz differ diff --git a/project/jni/application/xserver-debian/debian-image b/project/jni/application/xserver-debian/debian-image index f8817d16f..f45e51983 160000 --- a/project/jni/application/xserver-debian/debian-image +++ b/project/jni/application/xserver-debian/debian-image @@ -1 +1 @@ -Subproject commit f8817d16f610ee1b61fb7efb07b09e5d7c4d1a9e +Subproject commit f45e51983e365bec6727652af1fef2945f30222e diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png index 85c5654df..2e25b6fb6 100644 Binary files a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png differ diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png index b76f78f41..db32ce335 100644 Binary files a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png differ diff --git a/project/jni/application/xserver-gimp/keyboard/key.xcf b/project/jni/application/xserver-gimp/keyboard/key.xcf index dd434730d..67cf9e846 100644 Binary files a/project/jni/application/xserver-gimp/keyboard/key.xcf and b/project/jni/application/xserver-gimp/keyboard/key.xcf differ diff --git a/project/jni/application/xserver-gimp/ultimatedroid.raw b/project/jni/application/xserver-gimp/ultimatedroid.raw index c86a54055..a50387388 100644 Binary files a/project/jni/application/xserver-gimp/ultimatedroid.raw and b/project/jni/application/xserver-gimp/ultimatedroid.raw differ diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c index 746db4793..cdc03d999 100644 --- a/project/jni/application/xserver/main.c +++ b/project/jni/application/xserver/main.c @@ -155,6 +155,7 @@ int main( int argc, char* argv[] ) SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_0, 0); SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_1, 0); SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_2, 0); + SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_3, 0); } { diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 5e4d43e90..d183a88a7 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 5e4d43e903522e5ba1d24cc96ff20deb7cddab14 +Subproject commit d183a88a75a27df18abebf8fbab8a518139babec