miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gimp: updated to Jessie, new warning dialog about removing old installation, fixed infinite restart in SDL

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-04-02 21:06:22 +03:00
parent 4fc05b347f
commit b416a6ea17
7 changed files with 146 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
project/jni/application/xserver/main.c
View File

@@ -42,6 +42,7 @@ int main( int argc, char* argv[] )
int printHelp = 1;
int screenResOverride = 0;
int screenButtons = 0;
int warnDiskSpaceMb = 0;
int resolutionW = atoi(getenv("DISPLAY_RESOLUTION_WIDTH"));
int resolutionH = atoi(getenv("DISPLAY_RESOLUTION_HEIGHT"));
@@ -55,10 +56,6 @@ int main( int argc, char* argv[] )
XSDL_initSDL();
XSDL_unpackFiles();
XSDL_showConfigMenu(&resolutionW, &displayW, &resolutionH, &displayH);
for(i = 0; i < 1024; i++)
{
int s = socket(AF_INET, SOCK_STREAM, 0);
@@ -126,6 +123,12 @@ int main( int argc, char* argv[] )
{
screenButtons = 1;
}
else if( strcmp(argv[1], "-warndiskspacemb") == 0 && argc > 2 )
{
warnDiskSpaceMb = atoi(argv[2]);
argc--;
argv++;
}
else
{
args[argnum] = argv[1];
@@ -146,13 +149,18 @@ int main( int argc, char* argv[] )
getenv("SECURE_STORAGE_DIR"),
getenv("SECURE_STORAGE_DIR") );
XSDL_unpackFiles(warnDiskSpaceMb);
if( !screenResOverride )
{
XSDL_showConfigMenu(&resolutionW, &displayW, &resolutionH, &displayH);
sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, SDL_GetVideoInfo()->vfmt->BitsPerPixel );
}
XSDL_generateBackground( port, printHelp, resolutionW, resolutionH );
XSDL_deinitSDL();
if( !screenResOverride )
sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, SDL_GetVideoInfo()->vfmt->BitsPerPixel );
if( printHelp )
{
sprintf( clientcmd, "%s/usr/bin/xhost + ; %s/usr/bin/xli -onroot -center %s/background.bmp",