diff --git a/project/jni/application/xserver-gimp/AndroidData/update1.tgz b/project/jni/application/xserver-gimp/AndroidData/update1.tgz index 46556a001..f58e10b87 100644 Binary files a/project/jni/application/xserver-gimp/AndroidData/update1.tgz and b/project/jni/application/xserver-gimp/AndroidData/update1.tgz differ diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c index ce3703197..b2b511b7d 100644 --- a/project/jni/application/xserver/gfx.c +++ b/project/jni/application/xserver/gfx.c @@ -48,7 +48,6 @@ static int unpackFiles(const char *archive, const char *script, const char *dele return 1; unpackProgressMb = 0; - strcpy( fname, getenv("SECURE_STORAGE_DIR") ); strcat( fname, "/" ); @@ -197,7 +196,7 @@ static int unpackFiles(const char *archive, const char *script, const char *dele strcat( fname2, script ); strcat( fname2, " > " ); strcat( fname2, fname ); - __android_log_print(ANDROID_LOG_INFO, "XSDL", "Copying postinstall scipt from SD card: %s", fname2); + __android_log_print(ANDROID_LOG_INFO, "XSDL", "Copying postinstall script from SD card: %s", fname2); system( fname2 ); } } @@ -220,6 +219,8 @@ static int unpackFiles(const char *archive, const char *script, const char *dele { if( !fgets(buf, sizeof(buf), fo) ) break; + if( strchr(buf, '\n') != NULL ) + strchr(buf, '\n')[0] = 0; __android_log_print(ANDROID_LOG_INFO, "XSDL", "> %s", buf); strncpy(unpackLog[3], unpackLog[2], sizeof(unpackLog[1]) - 4); strncpy(unpackLog[2], unpackLog[1], sizeof(unpackLog[1]) - 4); @@ -228,7 +229,7 @@ static int unpackFiles(const char *archive, const char *script, const char *dele __android_log_print(ANDROID_LOG_INFO, "XSDL", "Postinstall script exited with status %d", pclose(fo)); sprintf(unpackLog[0], "Running postinstall script finished"); - + return 1; } diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c index dfe3ac791..d21a97be8 100644 --- a/project/jni/application/xserver/main.c +++ b/project/jni/application/xserver/main.c @@ -168,7 +168,7 @@ int main( int argc, char* argv[] ) { SDL_Rect pos; pos.x = 0; - pos.h = SDL_ListModes(NULL, 0)[0]->h / 10; + pos.h = SDL_ListModes(NULL, 0)[0]->h / 20; pos.y = SDL_ListModes(NULL, 0)[0]->h - pos.h; pos.w = 40 * SDL_ListModes(NULL, 0)[0]->w / resolutionW; SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_0, 1);