From 317082448687024df53709332b9e8e9ff36fccc6 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 29 Jun 2014 00:14:48 +0300
Subject: [PATCH] Gimp: fixes to the update, decreased Alt/Ctrl/Shift button
 size

---
 .../xserver-gimp/AndroidData/update1.tgz      | Bin 1147 -> 1461 bytes
 project/jni/application/xserver/gfx.c         |   7 ++++---
 project/jni/application/xserver/main.c        |   2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/project/jni/application/xserver-gimp/AndroidData/update1.tgz b/project/jni/application/xserver-gimp/AndroidData/update1.tgz
index 46556a0017acdb1504b2d04fc0414c28b66c0bbe..f58e10b873244fe1b031708314ec7f8dbbc15831 100644
GIT binary patch
literal 1461
zcmb2|=3qFXvObuB`EAtgqT6NyUyb)OrQRu-HLb~`Yl-{BDZ4h#TJl&$?&iGA-$~9Y
zDhJg#`5az-`W_pw=xKM#>C7d5Y8L!Tdb_(%M>26c=}11>tGk$w!^YqC?Sa+z>%wkq
zmc3qVd%p0`vADbIe)lHuSKfX%!%4ANN#NG$3>)SC6SkrMdz%>l&wOCB{^Z4Nw<?<I
zcR$=!{IB*n-zx=n$)okP(XzXG-_Q9kZl7Q|+0wUQ{?dp(9%YqDi(dZA{QkCbeRW~g
zx1Hrb)>RjNS=b)Ywd_T@%V9zHv~Ui+SsG6>T2*|HC(pRr!587B{P}D47cP;*9BU1_
z53)KocnRrA+gDZJu-=tfFspFl;>yJ8{lBkAZvX!B!w#dO#d`#Hta(_cm|kn=+BC^R
z`6q|2PMp;9`EuV9wjR?u>3uk&<k{cn{ddjeKDIpi`}uO-dM*3f`?hv@(<k3lH<;V~
z=<(w2$Nc-h^HtZ!&ykt8H(y%+!u%AUfFmn?>Q7y4>CQI2Gg)p=SBB9d&7iuOmpOP@
z`~~!uX!OQu>RNgyO^f^ArQ$B!<(A?TcrGyPNymas-zR9RI<|I5Mzk?qEx0;=lkn1u
zGul;-39-!H{^_*N>&L4Ln;N}>j_h2z=8?AJ{0Tc&#!Bf4f7baEB5RnK=2vz1@%eW5
z+*GZkNnet+G<i16xR%hcYRZy{4|Fy?(OAeSGRrM@UzVcxg3~!du}axZ2Ah6y{4&&=
zA0R)C^TYdBoOSCaO|4(~L~GW>o&RTN{<**YncsqI^`;YV^Dvp+`(JyTKW6K{+xuR>
z{#!4;<Kcd>PbCMo3Gvu<|7V+WdmZniS^s4pF#f;n=ph|{o!jj3{lexp_J#2bf6R04
zU;Oi)Df>rz{E0eM^BZ&ix8+-B{r!GG*yR821CRf#?wJ}W*yl0p(v4YaAH{zh*?g^@
z|J;AR9EPg@_c`aC|6gL@DP`)Bd#6q5M!w0lPw#IY<o&<zIm7>TvERS^tQXJN%cyp7
z2G_}oTV`*g?zUX6KA}8~@Ak8wH|4K2{#=$Uv9^_a!4#D(xzqd-?p=K?!Ljwh71n=~
z&WjZ}&kAx(5`MawXOqdvPm!8G0!$vU%KXtgG^6#pxTSZ-QkM4cjLsvhOL7auh4T{_
z&P}xRJUrD+CVwtxDbI9C&VyX~Q;v1Xohgmp5%g9<ch8JD=eC!p#q9h4x%t1@ts8%S
z=N~SY5&duNxZv^sxex6A7rC(fJr(z%=AZOehx-5bIm15dXLww;nHSl*Brx~Z^4a;{
zv_BmA_nxKnzubQT)?HQq@3WfS`5%3X{ax2oX$_|Z^G>DB|NOe8<MlSnQ=iv#eoQf1
z$;+}-aO!o-^I0)G8*fciR#NH|UmCVl?R}K@j9WeCn?inNr)ctaFJ;b?dipL#(oNZs
zJ-7Hk64$b4@k_k<(*^E()wo?!JigAjR5sOE|3JdTWt*d>@%g$e>Tna#J5ZH!we~dU
zxi<@5vih3;IPSvfbFpFVdU@lMpSE7@{^0y|$7YEt?S+<|9)1Gz9WIm@|Eo?m*REX3
zxL8m9bWov}=o*z2kBw3c`&6TRJ&H9dCZ0?^+q~<Xwc{p1?o{skt0STgXP?#Wov737
z(evbiLH4ZOsvA4@->bE9mk;@W(S6dUH672VsyFeodLA%dZjv)w-}Bhh*NWaor&r1@
zkngTMczMngN7;~jGbR6I^hfVll<FwC&LUdN?*3yHovp8CJzjVD<j1Jx))}|@t?oKr
z{w!CxYv-?PbNSdlaPK*I>*Kr6n@o>qCvG(;-&gZj-zcN$R`i~~^;Z9iW0&vxU!LP}
zJ=glf*MIwkZT9^Czux@G$<iY%n~Yc%KJ^kj9N?Iqs&{6B>jYB=^NBB3r*1Oy*I$3r
zu*gb3_wbDW><?Q`&spk_AfqhFHSKA}fgm+^lV5)8@=Z;M1pAEtaBs7D_?RJpfdK&c
C%F=!S

literal 1147
zcmb2|=3uyTbzLw6^V^8r;KybH&x-4gUUOf6Ia}7!PsUjBWNg(Ehj!~3492<p8<Mm)
z9++k`Y3}s;`&)(84+vV^YCGrqw`RlFO}nFBMtWy|%<w7O#>4&4%J18{oqeU>V-uFA
zU7x$_@r|<08<VfDNjrR(G5vO5sz<4l=mEbohb(KI-tGLCFCz1^f9e#^Q1;tWk0t+Q
zm!6LMbU)*k*|y}RiEkUW>bAdoRDbUO?Drk>UbncWoM64^xb#ur*@SJ?_x@K{zKEY2
zKZmcX{qO4L$BYGx#y<pSh<h0P^76dOr1((KQ%y}cCUk!9j)Z+1_w&CGxcK>@;AR$Q
z0oEDI?p1wg?%#XxVAg?1olvIkW9RbzfA9YHp!od~gH1tkTruG%4X%D(IHxhmq$gA8
zz@<l}OE;O6mHb+HU$L=A;^tnP_xxSoJ}>@v(o;RYNAc*>2($SzF>_`98@=HDx5Mgn
ztW2p^{sVKXg%7-!9p&frS-R`&9b4%K%ULcraGrRim1x&9rKe#@)Kj;7BVF5mC%wFS
zHr>Qi3JZkUI$JD!8=T(hUn}wqS(w!~ZKI;}jt}bPO6F2t{cSFb6JGn(#y)i}GVbIE
za=dI{XuSG~+s1U2u)W!bD-#2cx<Bk_)GjuAF@MfCKC79U^RumZW~NyjED1ZxnYK3M
zhgZ@4D~?B$a!j<Y9$m-0tm$>dtN3P1R;FhH7y3Q_9jnvVPpA>g@437t;z;|(-v?Lx
zxgLLEdvDJF^Bp(Rggz|#d_VKizxeEHub=+>FBS1IJ~l_@w#4JtKjY{AU-x>-pZ#od
zpVl*XwIAMZeeCql{D{1n|MzprJ&!l+?^KyHdu3W(saeWHdr4*G9XB&_9^Efn`;7Tt
z?D9bU&;PGG{Qj%Mm3U~%v!IfmsH;W>)!&z#Ke{71ChkwxJIVLEr<RE^e?O`<f%$4{
z9`DjUy(@OTm2jMNMAvEA<;>D05}#-8^G%7Fn&nflwAFv=`jeZk>RkC!n=ROXBRuNV
z<E!Szypy{H)279mT-D=oUT|YYa!<vH3s;mDpH-ey9h6bzcr;?tF5A_&XP#AYZC)wx
zIZNjlTfqJFy5k!P?Tywh%iJw)y8Y>nwYz>VXB5=C*pdHke!<zvy?5`{?0b9W@w=i|
zZ#z`4Eazmk6!lsA?0>>LH^upx57vA>YBagBXTQLY7ZNs$lHE3OPOx5dv}wyRuVowK
zzSms5ZX064w`2M3CyvK&N!`rI%k4Q<c*1s8!hsx#cYQ1zvjXdW{1oal{{K)|)W+|y
z>+_kDl3kU1&PaZ?Iu<SEz1RL(V9u?pwm<A*O>EA0ss~R@c)oY4qJPyLHCA2kQyvFz
zMtyuLxV&)n*}BQ^*yqm6;n}q}?Cr?~x3ewJ2|I2NxL<YQAxqsM{T)1e+V|w>ez>J_
zd&chi`v3mPGEG;vRs8;5^DjKxYW4s9YHI&x{Ewa%Jn#SdM*a8yuWe6{<56QRW?8NB
z@$RmO*eTb|Gg#idyB)Q3(+)YC$yN`UuAA{VR(Boe?Ah_aDxt12HF%Lrr;w`G6pcU#
RV~^24CYCQ@3mG&R7y$LvO$Gn}

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);