diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 444be3fa5..118008120 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 444be3fa5523e4aeb4376b8b1c6f1e1c261c80a3 +Subproject commit 1180081202e77335cd0dea8d2148b080acfa3269 diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index 2f7672c98..c0a12cb31 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit 2f7672c98042b2a8c7e1fa72effe6c318aca7268 +Subproject commit c0a12cb31dcc181baef4f53d63d532ae6c50ca7b diff --git a/project/jni/application/xserver-debian/xserver b/project/jni/application/xserver-debian/xserver index 58c205cd1..ce2611df1 160000 --- a/project/jni/application/xserver-debian/xserver +++ b/project/jni/application/xserver-debian/xserver @@ -1 +1 @@ -Subproject commit 58c205cd11d9b14ee48fb613bff7a3cd71519dc5 +Subproject commit ce2611df1142b98a00ed261be30791f98e716d5b diff --git a/project/jni/application/xserver-gimp/xserver b/project/jni/application/xserver-gimp/xserver index 58c205cd1..ce2611df1 160000 --- a/project/jni/application/xserver-gimp/xserver +++ b/project/jni/application/xserver-gimp/xserver @@ -1 +1 @@ -Subproject commit 58c205cd11d9b14ee48fb613bff7a3cd71519dc5 +Subproject commit ce2611df1142b98a00ed261be30791f98e716d5b diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg index e32503e11..96199d220 100644 --- a/project/jni/application/xserver/AndroidAppSettings.cfg +++ b/project/jni/application/xserver/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="XServer XSDL" AppFullName=x.org.server # Application version code (integer) -AppVersionCode=11118 +AppVersionCode=11119 # Application user-visible version name (string) -AppVersionName="1.11.18" +AppVersionName="1.11.19" # 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 diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh index 465227c37..29d6c480e 100755 --- a/project/jni/application/xserver/AndroidBuild.sh +++ b/project/jni/application/xserver/AndroidBuild.sh @@ -26,11 +26,12 @@ cd android } || exit 1 cd $1 [ -e libfontenc-*/Makefile ] && { - grep "/data/data/$PACKAGE_NAME" libfontenc-*/Makefile || \ + grep "/proc/self/cwd" libfontenc-*/Makefile || \ git clean -f -d -x . } -env TARGET_DIR=/data/data/$PACKAGE_NAME/files \ +# Megahack: set /proc/self/cwd as the X.org data dir, and chdir() to the correct directory when runngin X.org +env TARGET_DIR=/proc/self/cwd \ ./build.sh || exit 1 env CURDIR=$CURDIR \ diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c index 98160d621..cc8a6f125 100644 --- a/project/jni/application/xserver/gfx.c +++ b/project/jni/application/xserver/gfx.c @@ -699,6 +699,7 @@ void showErrorMessage(const char *msg) void XSDL_initSDL() { + char fontpath[PATH_MAX]; SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); __android_log_print(ANDROID_LOG_INFO, "XSDL", "Current video mode: %d %d", SDL_ListModes(NULL, 0)[0]->w, SDL_ListModes(NULL, 0)[0]->h); @@ -708,7 +709,9 @@ void XSDL_initSDL() else SDL_SetVideoMode(VID_Y, VID_X, 0, SDL_SWSURFACE); TTF_Init(); - sFont = TTF_OpenFont("DroidSansMono.ttf", 14); + strcpy( fontpath, getenv("UNSECURE_STORAGE_DIR") ); + strcat( fontpath, "/DroidSansMono.ttf" ); + sFont = TTF_OpenFont(fontpath, 14); if (!sFont) { __android_log_print(ANDROID_LOG_INFO, "XSDL", "Error: cannot open font file, please reinstall the app"); diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c index 29b6d82dd..266d7e991 100644 --- a/project/jni/application/xserver/main.c +++ b/project/jni/application/xserver/main.c @@ -146,7 +146,7 @@ int main( int argc, char* argv[] ) getenv("SECURE_STORAGE_DIR"), getenv("SECURE_STORAGE_DIR") ); - XSDL_generateBackground(port, printHelp, resolutionW, resolutionH); + XSDL_generateBackground( port, printHelp, resolutionW, resolutionH ); XSDL_deinitSDL(); @@ -155,14 +155,14 @@ int main( int argc, char* argv[] ) if( printHelp ) { - sprintf( clientcmd, "%s/usr/bin/xhost + ; %s/usr/bin/xli -onroot -center background.bmp", - getenv("SECURE_STORAGE_DIR"), getenv("SECURE_STORAGE_DIR") ); + sprintf( clientcmd, "%s/usr/bin/xhost + ; %s/usr/bin/xli -onroot -center %s/background.bmp", + getenv("SECURE_STORAGE_DIR"), getenv("SECURE_STORAGE_DIR"), getenv("UNSECURE_STORAGE_DIR") ); args[argnum] = "-exec"; args[argnum+1] = clientcmd; argnum += 2; } - SDL_ANDROID_SetScreenKeyboardShown(1); + SDL_ANDROID_SetScreenKeyboardShown( 1 ); if( screenButtons && !SDL_ANDROID_GetScreenKeyboardRedefinedByUser() ) { @@ -193,7 +193,9 @@ int main( int argc, char* argv[] ) __android_log_print(ANDROID_LOG_INFO, "XSDL", "> %s", args[i]); // We should never quit. If that happens, then the server did not start - show error. - atexit(&showError); + atexit( &showError ); + __android_log_print(ANDROID_LOG_INFO, "XSDL", "XSDL chdir to: %s", getenv("SECURE_STORAGE_DIR")); + chdir( getenv("SECURE_STORAGE_DIR") ); // Megahack: change /proc/self/cwd to the X.org data dir, and use /proc/self/cwd path in libX11 return android_main( argnum, args, envp ); } diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 58c205cd1..4524f07e0 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 58c205cd11d9b14ee48fb613bff7a3cd71519dc5 +Subproject commit 4524f07e096eecec4d1bfd3dce627563d9534eb0 diff --git a/project/jni/boost/src b/project/jni/boost/src index 5824acb45..bc9ea9d30 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd +Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767 diff --git a/project/jni/shmem b/project/jni/shmem index c2a28f528..89c7cb8d0 160000 --- a/project/jni/shmem +++ b/project/jni/shmem @@ -1 +1 @@ -Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a +Subproject commit 89c7cb8d033412be4fdca551ec39432d5d2d06a6