CVS: rdesktop proto.h,1.87.2.1,1.87.2.2 rdesktop.h,1.32,1.32.2.1 seamless.c,1.1.2.2,1.1.2.3 xwin.c,1.205.2.1,1.205.2.2

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

Modified Files:
      Tag: seamlessrdp-branch
	proto.h rdesktop.h seamless.c xwin.c 
Log Message:
SETSTATE is not two ops: TITLE and STATE

Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.87.2.1
retrieving revision 1.87.2.2
diff -C2 -d -r1.87.2.1 -r1.87.2.2
*** proto.h	10 Mar 2006 08:50:43 -0000	1.87.2.1
--- proto.h	10 Mar 2006 10:40:50 -0000	1.87.2.2
***************
*** 277,281 ****
  void ui_seamless_move_window(unsigned long id, int x, int y, int width, int height,
  			     unsigned long flags);
! void ui_seamless_settitle(unsigned long id, const char *title);
  void ui_seamless_setstate(unsigned long id, unsigned int state, unsigned long flags);
  /* lspci.c */
--- 277,281 ----
  void ui_seamless_move_window(unsigned long id, int x, int y, int width, int height,
  			     unsigned long flags);
! void ui_seamless_settitle(unsigned long id, const char *title, unsigned long flags);
  void ui_seamless_setstate(unsigned long id, unsigned int state, unsigned long flags);
  /* lspci.c */

Index: rdesktop.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.h,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -d -r1.32 -r1.32.2.1
*** rdesktop.h	15 Aug 2005 12:06:58 -0000	1.32
--- rdesktop.h	10 Mar 2006 10:40:50 -0000	1.32.2.1
***************
*** 96,97 ****
--- 96,99 ----
  #include "proto.h"
  #endif
+ 
+ #define WITH_DEBUG_SEAMLESS 1

Index: seamless.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/Attic/seamless.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** seamless.c	10 Mar 2006 09:01:51 -0000	1.1.2.2
--- seamless.c	10 Mar 2006 10:40:50 -0000	1.1.2.3
***************
*** 151,159 ****
  		unimpl("SeamlessRDP ZCHANGE1\n");
  	}
! 	else if (!strcmp("SETSTATE", tok1))
  	{
  		unsigned int state;
  
! 		if (!tok5)
  			return False;
  
--- 151,174 ----
  		unimpl("SeamlessRDP ZCHANGE1\n");
  	}
! 	else if (!strcmp("TITLE", tok1))
! 	{
! 		if (!tok4)
! 			return False;
! 
! 		id = strtol(tok2, &endptr, 16);
! 		if (*endptr)
! 			return False;
! 
! 		flags = strtol(tok4, &endptr, 16);
! 		if (*endptr)
! 			return False;
! 
! 		ui_seamless_settitle(id, tok3, flags);
! 	}
! 	else if (!strcmp("STATE", tok1))
  	{
  		unsigned int state;
  
! 		if (!tok4)
  			return False;
  
***************
*** 162,175 ****
  			return False;
  
! 		state = strtol(tok4, &endptr, 16);	// XXX
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok5, &endptr, 16);
  		if (*endptr)
  			return False;
  
- 		/* FIXME */
- 		ui_seamless_settitle(id, tok3);
  		ui_seamless_setstate(id, state, flags);
  	}
--- 177,188 ----
  			return False;
  
! 		state = strtol(tok3, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 16);
  		if (*endptr)
  			return False;
  
  		ui_seamless_setstate(id, state, flags);
  	}

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.205.2.1
retrieving revision 1.205.2.2
diff -C2 -d -r1.205.2.1 -r1.205.2.2
*** xwin.c	10 Mar 2006 08:50:43 -0000	1.205.2.1
--- xwin.c	10 Mar 2006 10:40:50 -0000	1.205.2.2
***************
*** 1732,1735 ****
--- 1732,1736 ----
  	Status status;
  	int events = 0;
+ 	seamless_window *sw;
  
  	while ((XPending(g_display) > 0) && events++ < 20)
***************
*** 1894,1898 ****
  				else
  				{
- 					seamless_window *sw;
  					sw = seamless_get_window_by_wnd(xevent.xexpose.window);
  					if (sw)
--- 1895,1898 ----
***************
*** 3096,3100 ****
  
  void
! ui_seamless_settitle(unsigned long id, const char *title)
  {
  	seamless_window *sw;
--- 3096,3100 ----
  
  void
! ui_seamless_settitle(unsigned long id, const char *title, unsigned long flags)
  {
  	seamless_window *sw;



-------------------------------------------------------
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