kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When mixing -f and -g, the last option should take precedence.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@546 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2003-11-10 15:09:49 +00:00
parent 9c9a020b8f
commit 58c2cbd12a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rdesktop.c
View File

@ -289,6 +289,7 @@ main(int argc, char *argv[])
break;
case 'g':
g_fullscreen = False;
if (!strcmp(optarg, "workarea"))
{
g_width = g_height = 0;

12
xwin.c
View File

@ -775,7 +775,12 @@ ui_init(void)
/*
* Determine desktop size
*/
if (g_width < 0)
if (g_fullscreen)
{
g_width = WidthOfScreen(g_screen);
g_height = HeightOfScreen(g_screen);
}
else if (g_width < 0)
{
/* Percent of screen */
g_height = HeightOfScreen(g_screen) * (-g_width) / 100;
@ -798,11 +803,6 @@ ui_init(void)
g_height = 600;
}
}
else if (g_fullscreen)
{
g_width = WidthOfScreen(g_screen);
g_height = HeightOfScreen(g_screen);
}
/* make sure width is a multiple of 4 */
g_width = (g_width + 3) & ~3;