CVS: rdesktop xwin.c,1.179,1.180 rdesktop.c,1.115,1.116

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

Modified Files:
	xwin.c rdesktop.c 
Log Message:
add support for specifying the window-position with the -g parameter


Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** xwin.c	3 Nov 2004 13:56:52 -0000	1.179
--- xwin.c	18 Nov 2004 11:18:48 -0000	1.180
***************
*** 31,34 ****
--- 31,36 ----
  extern int g_width;
  extern int g_height;
+ extern int g_xpos;
+ extern int g_ypos;
  extern BOOL g_sendmotion;
  extern BOOL g_fullscreen;
***************
*** 965,969 ****
  	attribs.colormap = g_xcolmap;
  
! 	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), 0, 0, wndwidth, wndheight,
  			      0, g_depth, InputOutput, g_visual,
  			      CWBackPixel | CWBackingStore | CWOverrideRedirect |
--- 967,971 ----
  	attribs.colormap = g_xcolmap;
  
! 	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth, wndheight,
  			      0, g_depth, InputOutput, g_visual,
  			      CWBackPixel | CWBackingStore | CWOverrideRedirect |

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** rdesktop.c	7 Oct 2004 13:00:28 -0000	1.115
--- rdesktop.c	18 Nov 2004 11:18:49 -0000	1.116
***************
*** 50,53 ****
--- 50,55 ----
  				   percent of the whole screen. */
  int g_height = 600;
+ int g_xpos = 0;
+ int g_ypos = 0;
  extern int g_tcp_port_rdp;
  int g_server_bpp = 8;
***************
*** 440,444 ****
  
  				if (*p == 'x')
! 					g_height = strtol(p + 1, NULL, 10);
  
  				if (g_height <= 0)
--- 442,446 ----
  
  				if (*p == 'x')
! 					g_height = strtol(p + 1, &p, 10);
  
  				if (g_height <= 0)
***************
*** 449,453 ****
--- 451,464 ----
  
  				if (*p == '%')
+ 				{
  					g_width = -g_width;
+ 					p++;
+ 				}
+ 
+ 				if (*p == '+' || *p == '-')
+ 					g_xpos = strtol(p, &p, 10);
+ 				
+ 				if (*p == '+' || *p == '-')
+ 					g_ypos = strtol(p, NULL, 10);
  
  				break;



-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8