notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow any sane window size, such as 1234x666, and many insane sizes too

Browse source
This commit is contained in:
Albert Cahalan 2004-11-24 04:19:06 +00:00
parent 34cd0b93cb
commit 35d0dae6c1
2 changed files with 37 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/CHANGES.txt
View file

@ -8,6 +8,9 @@ http://www.newbreedsoftware.com/tuxpaint/
2004.November.23 (0.9.15) 2004.November.23 (0.9.15)
* Can now use pretty much any window size, like 1234x666.
Albert Cahalan <albert@users.sf.net>
* abstracted stamp scaling (prep for large sizes) * abstracted stamp scaling (prep for large sizes)
Per-stamp sane scaling range enforced. (generally bigger) Per-stamp sane scaling range enforced. (generally bigger)
Albert Cahalan <albert@users.sf.net> Albert Cahalan <albert@users.sf.net>

80
src/tuxpaint.c
View file

@ -4301,35 +4301,21 @@ static void setup(int argc, char * argv[])
{ {
noshortcuts = 0; noshortcuts = 0;
} }
else if (strcmp(argv[i], "--1600x1200") == 0) else if ( argv[i][0]=='-' && argv[i][1]=='-' && argv[i][2]>='1' && argv[i][2]<='9' )
{ {
WINDOW_WIDTH = 1600; char *endp1;
WINDOW_HEIGHT = 1200; char *endp2;
} int w,h;
else if (strcmp(argv[i], "--1400x1050") == 0) w = strtoul(argv[i]+2, &endp1, 10);
{ h = strtoul(endp1+1, &endp2, 10);
WINDOW_WIDTH = 1400; // sanity check it
WINDOW_HEIGHT = 1050; if(argv[i]+2==endp1 || endp1+1==endp2 || *endp1!='x' || *endp2 || w<500 || h<480 || h>w*3 || w>h*4)
} {
else if (strcmp(argv[i], "--1280x1024") == 0) show_usage(stderr, (char *) getfilename(argv[0]));
{ exit(1);
WINDOW_WIDTH = 1280; }
WINDOW_HEIGHT = 1024; WINDOW_WIDTH = w;
} WINDOW_HEIGHT = h;
else if (strcmp(argv[i], "--1024x768") == 0)
{
WINDOW_WIDTH = 1024;
WINDOW_HEIGHT = 768;
}
else if (strcmp(argv[i], "--800x600") == 0)
{
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 600;
}
else if (strcmp(argv[i], "--640x480") == 0)
{
WINDOW_WIDTH = 640;
WINDOW_HEIGHT = 480;
} }
else if (strcmp(argv[i], "--nooutlines") == 0) else if (strcmp(argv[i], "--nooutlines") == 0)
{ {
@ -12515,32 +12501,34 @@ static void parse_options(FILE * fi)
{ {
noshortcuts = 0; noshortcuts = 0;
} }
else if (strcmp(str, "windowsize=1600x1200") == 0) else if (!memcmp("windowsize=",str,11))
{ {
WINDOW_WIDTH = 1600; char *endp1;
WINDOW_HEIGHT = 1200; char *endp2;
} int w,h;
else if (strcmp(str, "windowsize=1400x1050") == 0) w = strtoul(str+11, &endp1, 10);
{ h = strtoul(endp1+1, &endp2, 10);
WINDOW_WIDTH = 1400; // sanity check it
WINDOW_HEIGHT = 1050; if(str+11==endp1 || endp1+1==endp2 || *endp1!='x' || *endp2 || w<500 || h<480 || h>w*3 || w>h*4)
} {
else if (strcmp(str, "windowsize=1280x1024") == 0) // Oddly, config files have no error checking.
{ //show_usage(stderr, (char *) getfilename(argv[0]));
WINDOW_WIDTH = 1280; //exit(1);
WINDOW_HEIGHT = 1024; }
} else
else if (strcmp(str, "windowsize=1024x768") == 0) {
{ WINDOW_WIDTH = w;
WINDOW_WIDTH = 1024; WINDOW_HEIGHT = h;
WINDOW_HEIGHT = 768; }
} }
// to handle old config files
else if (strcmp(str, "800x600=yes") == 0 || else if (strcmp(str, "800x600=yes") == 0 ||
strcmp(str, "windowsize=800x600") == 0) strcmp(str, "windowsize=800x600") == 0)
{ {
WINDOW_WIDTH = 800; WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 600; WINDOW_HEIGHT = 600;
} }
// also for old config files
else if (strcmp(str, "800x600=no") == 0 || else if (strcmp(str, "800x600=no") == 0 ||
strcmp(str, "640x480=yes") == 0 || strcmp(str, "640x480=yes") == 0 ||
strcmp(str, "windowsize=640x480") == 0) strcmp(str, "windowsize=640x480") == 0)