CVS: rdesktop proto.h,1.87.2.9,1.87.2.10 seamless.c,1.1.2.17,1.1.2.18 xwin.c,1.205.2.25,1.205.2.26

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

Modified Files:
      Tag: seamlessrdp-branch
	proto.h seamless.c xwin.c 
Log Message:
Basic infrastructure for receiving seamless ACK:s.


Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.87.2.9
retrieving revision 1.87.2.10
diff -C2 -d -r1.87.2.9 -r1.87.2.10
*** proto.h	17 Mar 2006 12:39:09 -0000	1.87.2.9
--- proto.h	20 Mar 2006 12:36:14 -0000	1.87.2.10
***************
*** 283,297 ****
  void ui_seamless_setstate(unsigned long id, unsigned int state, unsigned long flags);
  void ui_seamless_syncbegin(unsigned long flags);
  /* lspci.c */
  BOOL lspci_init(void);
  /* seamless.c */
  BOOL seamless_init(void);
! void seamless_send_sync(void);
! void seamless_send_state(unsigned long id, unsigned int state, unsigned long flags);
! void seamless_send_position(unsigned long id, int x, int y, int width, int height,
! 			    unsigned long flags);
  void seamless_select_timeout(struct timeval *tv);
! void seamless_send_zchange(unsigned long id, unsigned long below, unsigned long flags);
! void seamless_send_focus(unsigned long id, unsigned long flags);
  
  /* *INDENT-OFF* */
--- 283,298 ----
  void ui_seamless_setstate(unsigned long id, unsigned int state, unsigned long flags);
  void ui_seamless_syncbegin(unsigned long flags);
+ void ui_seamless_ack(unsigned int serial);
  /* lspci.c */
  BOOL lspci_init(void);
  /* seamless.c */
  BOOL seamless_init(void);
! unsigned int seamless_send_sync(void);
! unsigned int seamless_send_state(unsigned long id, unsigned int state, unsigned long flags);
! unsigned int seamless_send_position(unsigned long id, int x, int y, int width, int height,
! 				    unsigned long flags);
  void seamless_select_timeout(struct timeval *tv);
! unsigned int seamless_send_zchange(unsigned long id, unsigned long below, unsigned long flags);
! unsigned int seamless_send_focus(unsigned long id, unsigned long flags);
  
  /* *INDENT-OFF* */

Index: seamless.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/Attic/seamless.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -d -r1.1.2.17 -r1.1.2.18
*** seamless.c	20 Mar 2006 12:00:09 -0000	1.1.2.17
--- seamless.c	20 Mar 2006 12:36:14 -0000	1.1.2.18
***************
*** 243,246 ****
--- 243,256 ----
  		ui_seamless_begin();
  	}
+ 	else if (!strcmp("ACK", tok1))
+ 	{
+ 		unsigned int serial;
+ 
+ 		serial = strtoul(tok3, &endptr, 0);
+ 		if (*endptr)
+ 			return False;
+ 
+ 		ui_seamless_ack(serial);
+ 	}
  
  
***************
*** 298,302 ****
  
  
! static void
  seamless_send(const char *command, const char *format, ...)
  {
--- 308,312 ----
  
  
! static unsigned int
  seamless_send(const char *command, const char *format, ...)
  {
***************
*** 324,329 ****
  	out_uint8p(s, buf, len) s_mark_end(s);
  
- 	seamless_serial++;
- 
  	DEBUG_SEAMLESS(("SeamlessRDP sending:%s", buf));
  
--- 334,337 ----
***************
*** 334,364 ****
  
  	channel_send(s, seamless_channel);
  }
  
  
! void
  seamless_send_sync()
  {
  	if (!g_seamless_rdp)
! 		return;
  
! 	seamless_send("SYNC", "");
  }
  
  
! void
  seamless_send_state(unsigned long id, unsigned int state, unsigned long flags)
  {
  	if (!g_seamless_rdp)
! 		return;
  
! 	seamless_send("STATE", "0x%08lx,0x%x,0x%lx", id, state, flags);
  }
  
  
! void
  seamless_send_position(unsigned long id, int x, int y, int width, int height, unsigned long flags)
  {
! 	seamless_send("POSITION", "0x%08lx,%d,%d,%d,%d,0x%lx", id, x, y, width, height, flags);
  }
  
--- 342,375 ----
  
  	channel_send(s, seamless_channel);
+ 
+ 	return seamless_serial++;
  }
  
  
! unsigned int
  seamless_send_sync()
  {
  	if (!g_seamless_rdp)
! 		return (unsigned int) -1;
  
! 	return seamless_send("SYNC", "");
  }
  
  
! unsigned int
  seamless_send_state(unsigned long id, unsigned int state, unsigned long flags)
  {
  	if (!g_seamless_rdp)
! 		return (unsigned int) -1;
  
! 	return seamless_send("STATE", "0x%08lx,0x%x,0x%lx", id, state, flags);
  }
  
  
! unsigned int
  seamless_send_position(unsigned long id, int x, int y, int width, int height, unsigned long flags)
  {
! 	return seamless_send("POSITION", "0x%08lx,%d,%d,%d,%d,0x%lx", id, x, y, width, height,
! 			     flags);
  }
  
***************
*** 380,399 ****
  }
  
! void
  seamless_send_zchange(unsigned long id, unsigned long below, unsigned long flags)
  {
  	if (!g_seamless_rdp)
! 		return;
  
! 	seamless_send("ZCHANGE", "0x%08lx,0x%08lx,0x%lx", id, below, flags);
  }
  
  
! void
  seamless_send_focus(unsigned long id, unsigned long flags)
  {
  	if (!g_seamless_rdp)
! 		return;
  
! 	seamless_send("FOCUS", "0x%08lx,0x%lx", id, flags);
  }
--- 391,410 ----
  }
  
! unsigned int
  seamless_send_zchange(unsigned long id, unsigned long below, unsigned long flags)
  {
  	if (!g_seamless_rdp)
! 		return (unsigned int) -1;
  
! 	return seamless_send("ZCHANGE", "0x%08lx,0x%08lx,0x%lx", id, below, flags);
  }
  
  
! unsigned int
  seamless_send_focus(unsigned long id, unsigned long flags)
  {
  	if (!g_seamless_rdp)
! 		return (unsigned int) -1;
  
! 	return seamless_send("FOCUS", "0x%08lx,0x%lx", id, flags);
  }

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.205.2.25
retrieving revision 1.205.2.26
diff -C2 -d -r1.205.2.25 -r1.205.2.26
*** xwin.c	17 Mar 2006 15:16:52 -0000	1.205.2.25
--- xwin.c	20 Mar 2006 12:36:14 -0000	1.205.2.26
***************
*** 3481,3482 ****
--- 3481,3487 ----
  	}
  }
+ 
+ void
+ ui_seamless_ack(unsigned int serial)
+ {
+ }



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