Added project for Xserver-Debian (formerly Ubuntu Noroot)

.gitmodules

@@ -56,3 +56,6 @@
 	path = project/jni/application/openttd/src
 	url = git@github.com:pelya/openttd-android.git
 	branch = master
+[submodule "project/jni/application/xserver-debian/xserver"]
+	path = project/jni/application/xserver-debian/xserver
+	url = git@github.com:pelya/xserver.git

project/jni/application/xserver-debian/.gitignore

@@ -0,0 +1 @@
+../xserver/.gitignore

project/jni/application/xserver-debian/AndroidAppSettings.cfg

@@ -0,0 +1,243 @@
+# The application settings for Android libSDL port
+
+# Specify application name (e.x. My Application)
+AppName="Debian"
+
+# Specify reversed site name of application (e.x. com.mysite.myapp)
+AppFullName=com.cuntubuntu
+
+# Application version code (integer)
+AppVersionCode=140331
+
+# Application user-visible version name (string)
+AppVersionName="14-03-31"
+
+# 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="!!System image|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/dist-debug-wheezy-proot-<ARCH>.tar.gz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh"
+
+# Reset SDL config when updating application to the new version (y) / (n)
+ResetSdlConfigForThisVersion=y
+
+# Delete application data files when upgrading (specify file/dir paths separated by spaces)
+DeleteFilesOnUpgrade="%"
+
+# 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='This update will remove your old Ubuntu installation^button:Install old version:https://github.com/pelya/cuntubuntu/raw/7b7421e933b718d64d963ce681be553850e62c10/Ubuntu.apk'
+
+# libSDL version to use (1.2/1.3/2.0)
+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
+
+# Create Android service, so the app is less likely to be killed while in background
+CreateService=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
+
+# 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=y
+
+# 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
+
+# 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
+
+# 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=y
+
+# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n)
+CompatibilityHacksPreventAudioChopping=n
+
+# Hack for broken apps: application ignores audio buffer size returned by SDL (y)/(n)
+CompatibilityHacksAppIgnoresAudioBufferSize=n
+
+# 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=n
+
+# 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=y
+
+# Application uses mouse (y) or (n), this will show mouse emulation dialog to the user
+AppUsesMouse=y
+
+# Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n)
+AppNeedsTwoButtonMouse=y
+
+# 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=y
+
+# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
+ForceRelativeMouseMode=y
+
+# Application needs arrow keys (y) or (n), will show on-screen dpad/joystick (y) or (n)
+AppNeedsArrowKeys=n
+
+# 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
+AppUsesJoystick=n
+
+# Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n)
+AppUsesSecondJoystick=n
+
+# 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
+
+# Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0
+AppUsesMultitouch=y
+
+# 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=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=y
+
+# 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="LALT UNDO NO_REMAP NO_REMAP UNDO HELP"
+
+# Number of virtual keyboard keys (currently 6 is maximum)
+AppTouchscreenKeyboardKeysAmount=3
+
+# 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"
+
+# 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"
+
+# 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=0
+
+# Redefine gamepad keys to SDL keysyms, button order is:
+# A B X Y L1 R1 L2 R2 LThumb RThumb
+RedefinedKeysGamepad="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2"
+
+# 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=''
+
+# 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='SettingsMenu.DummyMenu'
+
+# 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='armeabi-v7a'
+
+# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
+AppMinimumRAM=0
+
+# 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="jpeg png freetype sdl_ttf"
+
+# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
+CustomBuildScript=y
+
+# Aditional CFLAGS for application
+AppCflags=''
+
+# 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='XSDL -nohelp -exec $SECURE_STORAGE_DIR/img/proot.sh	-c	./startx.sh'
+
+# 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=m
+
+# Your AdMob Publisher ID, (n) if you don't want advertisements
+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)
+AdmobBannerSize=
+
+# 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=n

project/jni/application/xserver-debian/AndroidBuild.sh

@@ -0,0 +1 @@
+../xserver/AndroidBuild.sh

project/jni/application/xserver-debian/AndroidData/DroidSansMono.ttf

@@ -0,0 +1 @@
+../../xserver/AndroidData/DroidSansMono.ttf

project/jni/application/xserver-debian/AndroidData/data-1.tgz

@@ -0,0 +1 @@
+../xserver/data/data-1.tgz

project/jni/application/xserver-debian/AndroidData/postinstall.sh

@@ -0,0 +1,10 @@
+#!/system/bin/sh
+
+rm -rf $SDCARD/ubuntu
+
+cd $SECURE_STORAGE_DIR
+./busybox tar xzf $UNSECURE_STORAGE_DIR/data-1.tar.gz
+rm -f $UNSECURE_STORAGE_DIR/data-1.tar.gz
+export SECURE_STORAGE_DIR=$SECURE_STORAGE_DIR/img
+cd $SECURE_STORAGE_DIR
+./postinstall.sh

project/jni/application/xserver-debian/gfx.c

@@ -0,0 +1 @@
+../xserver/gfx.c

project/jni/application/xserver-debian/gfx.h

@@ -0,0 +1 @@
+../xserver/gfx.h

project/jni/application/xserver-debian/main.c

@@ -0,0 +1 @@
+../xserver/main.c

project/jni/application/xserver-debian/readme.txt

@@ -0,0 +1,64 @@
+You will need to install some packages to your Debian/Ubuntu first:
+
+sudo apt-get install bison libpixman-1-dev \
+libxfont-dev libxkbfile-dev libpciaccess-dev \
+xutils-dev xcb-proto python-xcbgen xsltproc \
+x11proto-bigreqs-dev x11proto-composite-dev \
+x11proto-core-dev x11proto-damage-dev \
+x11proto-dmx-dev x11proto-dri2-dev x11proto-fixes-dev \
+x11proto-fonts-dev x11proto-gl-dev \
+x11proto-input-dev x11proto-kb-dev \
+x11proto-print-dev x11proto-randr-dev \
+x11proto-record-dev x11proto-render-dev \
+x11proto-resource-dev x11proto-scrnsaver-dev \
+x11proto-video-dev x11proto-xcmisc-dev \
+x11proto-xext-dev x11proto-xf86bigfont-dev \
+x11proto-xf86dga-dev x11proto-xf86dri-dev \
+x11proto-xf86vidmode-dev x11proto-xinerama-dev \
+libxmuu-dev libxt-dev libsm-dev libice-dev \
+libxrender-dev libxrandr-dev curl
+
+You will need both xcb-proto and python-xcbgen packages
+to have version 1.10-1, you may download newer packages
+from http://packages.ubuntu.com/ or https://www.debian.org/distrib/packages
+
+Copy images from directory project/jni/application/xserver-gimp/keyboard
+to project/themes/UltimateDroid, go to directory project/themes,
+and run script ./convert.sh
+
+Then run commands:
+
+git clone git@github.com:pelya/commandergenius.git sdl-android
+cd sdl-android
+git submodule update --init project/jni/application/xserver/xserver
+rm project/jni/application/src
+ln -s xserver-gimp project/jni/application/src
+./changeAppSettings.sh -a
+android update project -p project
+./build.sh
+
+To build system image, download repo:
+
+https://github.com/pelya/cuntubuntu
+
+install dependencies described in it's readme,
+then launch script
+
+img-gimp-wheezy.sh
+
+from directory img.
+This will create Debian system image under directory
+dist-gimp-wheezy. Execute commands (<SDL> is path to this repo):
+
+sudo cp -a <SDL>/project/jni/application/src/xserver/data/usr/ dist-gimp-wheezy/
+sudo cp -a <SDL>/project/jni/application/src/xserver/android/xhost dist-gimp-wheezy/usr/bin/
+sudo cp -a <SDL>/project/jni/application/src/xserver/android/xkbcomp dist-gimp-wheezy/usr/bin/
+sudo cp -a <SDL>/project/jni/application/src/xserver/android/xli dist-gimp-wheezy/usr/bin/
+
+Update system image archive
+
+cd dist-gimp-wheezy
+sudo tar cvzf ../dist-gimp-wheezy.tar.gz *
+
+Upload resulting system image somewhere, and change download URL inside
+AndroidAppSettings.cfg, then recompile .apk file.

project/jni/application/xserver/gfx.c

@@ -19,6 +19,7 @@
 static TTF_Font* sFont;
 static int unpackProgressMb;
 static int unpackProgressMbTotal = 1;
+static int unpackProgressRunningScript = 0;
 static int unpackFinished = 0;
 
 static void renderString(const char *c, int x, int y);
@@ -31,6 +32,7 @@ static void showErrorMessage(const char *msg);
 void * unpackFilesThread(void * unused)
 {
 	char fname[PATH_MAX*2];
+	char fname2[PATH_MAX*2];
 	char buf[1024 * 4];
 	strcpy( fname, getenv("SECURE_STORAGE_DIR") );
 	strcat( fname, "/usr/lib/xorg/protocol.txt" );
@@ -67,9 +69,9 @@ void * unpackFilesThread(void * unused)
 	int unpackProgressKb = 0;
 	for(;;)
 	{
-		__android_log_print(ANDROID_LOG_INFO, "XSDL", "FREAD %d", unpackProgressKb);
+		//__android_log_print(ANDROID_LOG_INFO, "XSDL", "FREAD %d", unpackProgressKb);
 		int cnt = fread( buf, 1, sizeof(buf), ff );
-		__android_log_print(ANDROID_LOG_INFO, "XSDL", "FREAD %d READ %d", unpackProgressKb, cnt);
+		//__android_log_print(ANDROID_LOG_INFO, "XSDL", "FREAD %d READ %d", unpackProgressKb, cnt);
 		if( cnt < 0 )
 		{
 			__android_log_print(ANDROID_LOG_INFO, "XSDL", "Error extracting data");
@@ -86,7 +88,7 @@ void * unpackFilesThread(void * unused)
 			unpackProgressMb++;
 		}
 	}
-	__android_log_print(ANDROID_LOG_INFO, "XSDL", "FREAD %d DONE", unpackProgressKb);
+	__android_log_print(ANDROID_LOG_INFO, "XSDL", "FREAD %dKb DONE", unpackProgressKb);
 
 	fclose(ff);
 	if( pclose(fo) != 0 ) // Returns error on Android 2.3 emulator!
@@ -109,6 +111,13 @@ void * unpackFilesThread(void * unused)
 		return (void *)1;
 	}
 
+	unpackProgressRunningScript = 1;
+	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Setting executable permissions on postinstall scipt");
+
+	strcpy( fname2, "chmod 755 " );
+	strcat( fname2, fname );
+	system( fname2 );
+
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Running postinstall scipt");
 
 	fo = popen(fname, "r");
@@ -144,7 +153,7 @@ void XSDL_unpackFiles()
 		SDL_FillRect(SDL_GetVideoSurface(), NULL, 0);
 		char s[128];
 		sprintf(s, "Unpacking data: %d/%d Mb, %d%%", unpackProgressMb, unpackProgressMbTotal, unpackProgressMb * 100 / (unpackProgressMbTotal > 0 ? unpackProgressMbTotal : 1));
-		renderString(s, VID_X/2, VID_Y/3);
+		renderString(unpackProgressRunningScript ? "Running postinstall script..." : s, VID_X/2, VID_Y/3);
 		renderString("You may put this app to background while it's unpacking", VID_X/2, VID_Y*2/3);
 		SDL_Flip(SDL_GetVideoSurface());
 	}