CVS: rdesktop proto.h,1.92,1.93 seamless.c,1.3,1.4 xwin.c,1.209,1.210

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

Modified Files:
	proto.h seamless.c xwin.c 
Log Message:
Add a destroy group command to SeamlessRDP for when entire groups of windows
get killed off in one go.


Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** proto.h	8 Apr 2006 03:59:24 -0000	1.92
--- proto.h	28 Apr 2006 07:55:36 -0000	1.93
***************
*** 102,107 ****
  void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
  BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
! BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width,
! 			  uint8 height, uint16 length, uint8 * data);
  int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
  BOOL pstcache_init(uint8 cache_id);
--- 102,107 ----
  void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
  BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
! BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height,
! 			  uint16 length, uint8 * data);
  int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
  BOOL pstcache_init(uint8 cache_id);
***************
*** 284,287 ****
--- 284,288 ----
  			       unsigned long flags);
  void ui_seamless_destroy_window(unsigned long id, unsigned long flags);
+ void ui_seamless_destroy_group(unsigned long id, unsigned long flags);
  void ui_seamless_move_window(unsigned long id, int x, int y, int width, int height,
  			     unsigned long flags);

Index: seamless.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/seamless.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** seamless.c	20 Apr 2006 13:01:45 -0000	1.3
--- seamless.c	28 Apr 2006 07:55:36 -0000	1.4
***************
*** 121,124 ****
--- 121,139 ----
  
  	}
+ 	else if (!strcmp("DESTROYGRP", tok1))
+ 	{
+ 		if (!tok4)
+ 			return False;
+ 
+ 		id = strtoul(tok3, &endptr, 0);
+ 		if (*endptr)
+ 			return False;
+ 
+ 		flags = strtoul(tok4, &endptr, 0);
+ 		if (*endptr)
+ 			return False;
+ 
+ 		ui_seamless_destroy_group(id, flags);
+ 	}
  	else if (!strcmp("SETICON", tok1))
  	{

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** xwin.c	12 Apr 2006 06:47:24 -0000	1.209
--- xwin.c	28 Apr 2006 07:55:36 -0000	1.210
***************
*** 3475,3478 ****
--- 3475,3499 ----
  
  void
+ ui_seamless_destroy_group(unsigned long id, unsigned long flags)
+ {
+ 	seamless_window *sw, *sw_next;
+ 
+ 	if (!g_seamless_active)
+ 		return;
+ 
+ 	for (sw = g_seamless_windows; sw; sw = sw_next)
+ 	{
+ 		sw_next = sw->next;
+ 
+ 		if (sw->group->id == id)
+ 		{
+ 			XDestroyWindow(g_display, sw->wnd);
+ 			sw_remove_window(sw);
+ 		}
+ 	}
+ }
+ 
+ 
+ void
  ui_seamless_move_window(unsigned long id, int x, int y, int width, int height, unsigned long flags)
  {



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642