From 95ca515ee76164c15453269b628a1e02dd63e372 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 4 Nov 2013 22:18:02 +0200 Subject: [PATCH] Xserver: allow all hosts to connect --- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- project/jni/application/teeworlds/src | 2 +- project/jni/application/xserver/main.c | 23 ++++++++++++++++++---- project/jni/application/xserver/readme.txt | 4 +++- project/jni/application/xserver/xserver | 2 +- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 07c011b6c..30e98be35 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 07c011b6ccb275fc2b69dbd6e7ee8dba6223e59a +Subproject commit 30e98be3582cca3009f371ca2f9a7334e24e1582 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 4b83db91a..278f04520 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 4b83db91ab39b9cae27f087fe1a0a8ba9f30d43d +Subproject commit 278f045202ff1bc0c1911b6c3d441909ba93ee87 diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src index 34b64249c..e5489c8c0 160000 --- a/project/jni/application/teeworlds/src +++ b/project/jni/application/teeworlds/src @@ -1 +1 @@ -Subproject commit 34b64249c46a90ce127f32b3ef41a565b8a70a61 +Subproject commit e5489c8c089e57d88bbaa90df0176d5e5d4c6351 diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c index 1fc2fa924..eb88f1962 100644 --- a/project/jni/application/xserver/main.c +++ b/project/jni/application/xserver/main.c @@ -10,17 +10,32 @@ static int unpack_files(); int main( int argc, char* argv[] ) { - char screenres[64] = "640x480x24"; + char screenres[128] = "640x480x24"; + char clientcmd[PATH_MAX*2] = "xhost +"; + char * cmd = ""; char* args[] = { "XSDL", ":1111", "-nolock", + "-noreset", "-screen", - screenres + screenres, + "-exec", + clientcmd }; char * envp[] = { NULL }; - sprintf( screenres, "%sx%sx%d", getenv("DISPLAY_RESOLUTION_WIDTH"), getenv("DISPLAY_RESOLUTION_HEIGHT"), 24 ); + sprintf( screenres, "%s/%sx%s/%sx%d", + getenv("DISPLAY_RESOLUTION_WIDTH"), + getenv("DISPLAY_WIDTH_MM"), + getenv("DISPLAY_RESOLUTION_HEIGHT"), + getenv("DISPLAY_HEIGHT_MM"), + 24 ); + + if( argc >= 2 ) + cmd = argv[2]; + sprintf( clientcmd, "%s/usr/bin/xhost + ; %s", + getenv("SECURE_STORAGE_DIR"), cmd ); if( !unpack_files() ) { @@ -28,7 +43,7 @@ int main( int argc, char* argv[] ) return 1; } - return android_main( 5, args, envp ); + return android_main( 8, args, envp ); } int unpack_files() diff --git a/project/jni/application/xserver/readme.txt b/project/jni/application/xserver/readme.txt index 7799cc51e..298123b66 100644 --- a/project/jni/application/xserver/readme.txt +++ b/project/jni/application/xserver/readme.txt @@ -15,4 +15,6 @@ 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 +x11proto-xf86vidmode-dev x11proto-xinerama-dev \ +libxmuu-dev libxt-dev libsm-dev libice-dev \ +libxrender-dev libxrandr-dev diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 7308fb745..d1da3d5e3 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 7308fb745223126213d12e5f45ef55966c05dafe +Subproject commit d1da3d5e31a7fe9beb380114616c6a4e3de277a8