Updated XServer

This commit is contained in:
Sergii Pylypenko
2013-11-07 21:29:06 +02:00
parent 185def5931
commit ec06dd747b
3 changed files with 8 additions and 7 deletions

View File

@@ -174,10 +174,10 @@ MultiABI=armeabi-v7a
AppMinimumRAM=0
# Application version code (integer)
AppVersionCode=11101
AppVersionCode=11102
# Application user-visible version name (string)
AppVersionName="1.11.01"
AppVersionName="1.11.02"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=n

View File

@@ -253,21 +253,22 @@ void XSDL_generateBackground(const char * port, int showHelp)
struct ifconf ifc;
struct ifreq ifr[20];
SDL_Surface * surf;
int y = 40;
int y = VID_Y / 3;
if( !showHelp )
{
surf = SDL_CreateRGBSurface(SDL_SWSURFACE, 16, 16, 24, 0x0000ff, 0x00ff00, 0xff0000, 0);
SDL_FillRect(surf, NULL, 0x00003f);
SDL_FillRect(surf, NULL, 0x00002f);
SDL_SaveBMP(surf, "background.bmp");
SDL_FreeSurface(surf);
return;
}
surf = SDL_CreateRGBSurface(SDL_SWSURFACE, VID_X, VID_Y, 24, 0x0000ff, 0x00ff00, 0xff0000, 0);
SDL_FillRect(surf, NULL, 0x00003f);
SDL_FillRect(surf, NULL, 0x00002f);
renderStringColor("Launch these commands on your Linux PC:", VID_X/2, 15, 255, 255, 255, surf);
renderStringColor("Launch these commands on your Linux PC:", VID_X/2, y, 255, 255, 255, surf);
y += 30;
sd = socket(PF_INET, SOCK_DGRAM, 0);
if (sd > 0)

View File

@@ -75,7 +75,7 @@ int main( int argc, char* argv[] )
sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, 24 );
sprintf( clientcmd, "%s/usr/bin/xhost + ; %s/usr/bin/xli -onroot -fullscreen background.bmp ;",
sprintf( clientcmd, "%s/usr/bin/xhost + ; %s/usr/bin/xli -onroot -fillscreen background.bmp ;",
getenv("SECURE_STORAGE_DIR"), getenv("SECURE_STORAGE_DIR") );
for( ; argc > 1; argc--, argv++ )
{