CVS: rdesktop constants.h,1.30,1.31 rdesktop.c,1.99,1.100 rdp.c,1.51,1.52

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

Modified Files:
	constants.h rdesktop.c rdp.c 
Log Message:
RDP5 Experience patch by Jeroen Meijer <[email protected]>


Index: constants.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/constants.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** constants.h	4 Mar 2004 12:43:10 -0000	1.30
--- constants.h	15 Mar 2004 14:49:12 -0000	1.31
***************
*** 244,247 ****
--- 244,255 ----
  #define RDP_LOGON_LEAVE_AUDIO	0x2000
  
+ #define RDP5_DISABLE_NOTHING	0x00
+ #define RDP5_NO_WALLPAPER	0x01
+ #define RDP5_NO_FULLWINDOWDRAG	0x02
+ #define RDP5_NO_MENUANIMATIONS	0x04
+ #define RDP5_NO_THEMING		0x08
+ #define RDP5_NO_CURSOR_SHADOW	0x20
+ #define RDP5_NO_CURSORSETTINGS	0x40 /* disables cursor blinking */
+ 
  /* Keymap flags */
  #define MapRightShiftMask   (1<<0)

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** rdesktop.c	13 Mar 2004 12:08:18 -0000	1.99
--- rdesktop.c	15 Mar 2004 14:49:12 -0000	1.100
***************
*** 72,75 ****
--- 72,76 ----
  extern BOOL g_ownbackstore;
  extern uint32 g_embed_wnd;
+ uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
  
  #ifdef WITH_RDPSND
***************
*** 122,125 ****
--- 123,127 ----
  	fprintf(stderr, "   -X: embed into another window with a given id.\n");
  	fprintf(stderr, "   -a: connection colour depth\n");
+ 	fprintf(stderr, "   -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex number)\n");
  	fprintf(stderr, "   -r: enable specified device redirection (this flag can be repeated)\n");
  	fprintf(stderr,
***************
*** 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)
--- 260,264 ----
  #endif
  
! 	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:NX:a:x:r:045h?")) != -1)
  	{
  		switch (c)
***************
*** 419,422 ****
--- 421,444 ----
  				break;
  
+ 			case 'x':
+ 				
+ 				if (strncmp("modem", optarg, 1) == 0)
+ 				{
+ 					g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING;
+ 				}
+ 				else if (strncmp("broadband", optarg, 1) == 0)
+ 				{
+ 					g_rdp5_performanceflags = RDP5_NO_WALLPAPER;
+ 				}
+ 				else if (strncmp("lan", optarg, 1) == 0)
+ 				{
+ 					g_rdp5_performanceflags = RDP5_DISABLE_NOTHING;
+ 				}
+ 				else
+ 				{
+ 					g_rdp5_performanceflags = strtol(optarg, NULL, 16);
+ 				}
+ 				break;
+ 				
  			case 'r':
  

Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** rdp.c	4 Mar 2004 08:11:40 -0000	1.51
--- rdp.c	15 Mar 2004 14:49:12 -0000	1.52
***************
*** 30,33 ****
--- 30,34 ----
  extern BOOL g_use_rdp5;
  extern uint16 g_server_rdp_version;
+ extern uint32 g_rdp5_performanceflags;
  extern int g_server_bpp;
  
***************
*** 298,302 ****
  		out_uint32_le(s, 0xffffffc4);
  		out_uint32_le(s, 0xfffffffe);
! 		out_uint32_le(s, 0x0f);
  		out_uint32(s, 0);
  
--- 299,303 ----
  		out_uint32_le(s, 0xffffffc4);
  		out_uint32_le(s, 0xfffffffe);
! 		out_uint32_le(s, g_rdp5_performanceflags);
  		out_uint32(s, 0);
  



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