CVS: rdesktop rdesktop.c,1.98,1.99 xwin.c,1.155,1.156

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

Modified Files:
	rdesktop.c xwin.c 
Log Message:
XEmbed-patch by Arend van Beelen jr. <[email protected]>


Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** rdesktop.c	5 Mar 2004 06:39:00 -0000	1.98
--- rdesktop.c	13 Mar 2004 12:08:18 -0000	1.99
***************
*** 71,74 ****
--- 71,75 ----
  extern BOOL g_owncolmap;
  extern BOOL g_ownbackstore;
+ extern uint32 g_embed_wnd;
  
  #ifdef WITH_RDPSND
***************
*** 119,122 ****
--- 120,124 ----
  	fprintf(stderr, "   -T: window title\n");
  	fprintf(stderr, "   -N: enable numlock syncronization\n");
+ 	fprintf(stderr, "   -X: embed into another window with a given id.\n");
  	fprintf(stderr, "   -a: connection colour depth\n");
  	fprintf(stderr, "   -r: enable specified device redirection (this flag can be repeated)\n");
***************
*** 246,249 ****
--- 248,252 ----
  	domain[0] = password[0] = shell[0] = directory[0] = 0;
  	strcpy(keymapname, "en-us");
+ 	g_embed_wnd = 0;
  
  	g_num_devices = 0;
***************
*** 255,259 ****
  #endif
  
! 	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:Na:r:045h?")) != -1)
  	{
  		switch (c)
--- 258,262 ----
  #endif
  
! 	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:NX:a:r:045h?")) != -1)
  	{
  		switch (c)
***************
*** 402,405 ****
--- 405,412 ----
  				break;
  
+ 			case 'X':
+ 				g_embed_wnd = strtol(optarg, NULL, 10);
+ 				break;
+ 				
  			case 'a':
  				g_server_bpp = strtol(optarg, NULL, 10);

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** xwin.c	3 Mar 2004 10:46:35 -0000	1.155
--- xwin.c	13 Mar 2004 12:08:18 -0000	1.156
***************
*** 44,47 ****
--- 44,48 ----
  static Screen *g_screen;
  Window g_wnd;
+ uint32 g_embed_wnd;
  BOOL g_enable_compose = False;
  static GC g_gc = NULL;
***************
*** 926,929 ****
--- 927,935 ----
  	}
  
+         if ( g_embed_wnd )
+         {
+                 XReparentWindow(g_display, g_wnd, (Window)g_embed_wnd, 0, 0);
+         }
+ 
  	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
  		VisibilityChangeMask | FocusChangeMask;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click