Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

project/java/MainActivity.java

@@ -1063,6 +1063,7 @@ public class MainActivity extends Activity
 					//String chmod[] = { "/system/bin/chmod", "0755", path };
 					//Runtime.getRuntime().exec(chmod).waitFor();
 				}
+				break;
 			}
 			catch ( Exception eee )
 			{

project/jni/application/xserver/AndroidBuild.sh

@@ -68,6 +68,8 @@ rm -rf $CURDIR/tmp-$1
 mkdir -p $CURDIR/tmp-$1
 cd $CURDIR/tmp-$1
 cp $CURDIR/xserver/data/busybox-$1 ./busybox
+cp $CURDIR/ssh ./
+cp $CURDIR/sshpass ./
 mkdir -p usr/bin
 for f in xhost xkbcomp xli ; do cp $CURDIR/xserver/android/$1/$f ./usr/bin/ ; done
 rm -f ../AndroidData/binaries-$1.zip

project/jni/application/xserver/gfx.c

@@ -175,7 +175,7 @@ void XSDL_showConfigMenu(int * resolutionW, int * displayW, int * resolutionH, i
 
 	const char * resStr[] = {
 		native, native78, native68, native58,
-		native48, "1280x1024", "1280x960",
+		native48, "1280x1024", "1280x960", "1280x720",
 		"1024x768", "800x600", "800x480", "640x480"
 	};
 	const int resVal[][2] = {
@@ -184,7 +184,7 @@ void XSDL_showConfigMenu(int * resolutionW, int * displayW, int * resolutionH, i
 		{*resolutionW * 6 / 8, *resolutionH * 6 / 8},
 		{*resolutionW * 5 / 8, *resolutionH * 5 / 8},
 		{*resolutionW * 4 / 8, *resolutionH * 4 / 8},
-		{1280,1024}, {1280,960},
+		{1280,1024}, {1280,960}, {1280,720},
 		{1024,768}, {800,600}, {800,480}, {640,480}
 	};
 

todo.txt

@@ -36,6 +36,8 @@ TODO, which will get actually done
 
 - XSDL: 1280x800 video mode, and 1/2, 3/4, 5/8 and 7/8 native resolution video modes.
 
+- SDL: Send right mouse click when releasing two fingers, add mouse wheel event when dragging two fingers.
+
 - GIMP: Ctrl/Alt/Shift toggles in the taskbar.
 
 - GIMP: File open dialog shows error message when loading preview for JPG file.