From 10e3a2a20a8ed70953a2f2c470bfeb0e9d89be6f Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Mon, 17 Feb 2014 20:22:58 +0200
Subject: [PATCH] Fixed XServer videomodes dialog

---
 project/jni/application/xserver/AndroidBuild.sh | 2 ++
 project/jni/application/xserver/gfx.c           | 4 ++--
 project/jni/application/xserver/xserver         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index 34f03a5c7..8d49520a9 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/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
diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index 621da44dc..f188b5dc8 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/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}
 	};
 
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index 7be4caffc..005d8db89 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit 7be4caffcee7483ce90629e61371245cda9bc321
+Subproject commit 005d8db89afb3c3a40adb7bedcc5b11f3d77a909