CVS: rdesktop xwin.c,1.204,1.205

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17271

Modified Files:
	xwin.c 
Log Message:
* If fullscreen mode, set g_using_full_workarea = True;

* When using -g workarea, if workarea fetch fails, do not set
  g_using_full_workarea. Fall back to size of entire screen, instead
  of 800x600.


Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** xwin.c	1 Mar 2006 13:54:19 -0000	1.204
--- xwin.c	7 Mar 2006 08:17:40 -0000	1.205
***************
*** 1260,1263 ****
--- 1260,1264 ----
  		g_width = WidthOfScreen(g_screen);
  		g_height = HeightOfScreen(g_screen);
+ 		g_using_full_workarea = True;
  	}
  	else if (g_width < 0)
***************
*** 1273,1288 ****
  		/* Fetch geometry from _NET_WORKAREA */
  		uint32 x, y, cx, cy;
- 		g_using_full_workarea = True;
- 
  		if (get_current_workarea(&x, &y, &cx, &cy) == 0)
  		{
  			g_width = cx;
  			g_height = cy;
  		}
  		else
  		{
  			warning("Failed to get workarea: probably your window manager does not support extended hints\n");
! 			g_width = 800;
! 			g_height = 600;
  		}
  	}
--- 1274,1288 ----
  		/* Fetch geometry from _NET_WORKAREA */
  		uint32 x, y, cx, cy;
  		if (get_current_workarea(&x, &y, &cx, &cy) == 0)
  		{
  			g_width = cx;
  			g_height = cy;
+ 			g_using_full_workarea = True;
  		}
  		else
  		{
  			warning("Failed to get workarea: probably your window manager does not support extended hints\n");
! 			g_width = WidthOfScreen(g_screen);
! 			g_height = HeightOfScreen(g_screen);
  		}
  	}



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642