CVS: rdesktop rdesktop.c,1.131,1.132 secure.c,1.50,1.51 xkeymap.c,1.80,1.81

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

Modified Files:
	rdesktop.c secure.c xkeymap.c 
Log Message:
It is now possible to specify keyboard type, subtype and number of functionskeys. From patch #974509, by Dekaino.

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** rdesktop.c	3 Aug 2005 09:56:17 -0000	1.131
--- rdesktop.c	3 Aug 2005 11:30:52 -0000	1.132
***************
*** 53,56 ****
--- 53,59 ----
  char keymapname[PATH_MAX] = "en-us";
  int g_keylayout = 0x409;	/* Defaults to US keyboard layout */
+ int g_keyboard_type = 0x4;	/* Defaults to US keyboard layout */
+ int g_keyboard_subtype = 0x0;	/* Defaults to US keyboard layout */
+ int g_keyboard_functionkeys = 0xc;	/* Defaults to US keyboard layout */
  
  int g_width = 800;		/* width is special: If 0, the

Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** secure.c	6 Mar 2005 21:11:17 -0000	1.50
--- secure.c	3 Aug 2005 11:30:53 -0000	1.51
***************
*** 31,34 ****
--- 31,37 ----
  extern int g_height;
  extern int g_keylayout;
+ extern int g_keyboard_type;
+ extern int g_keyboard_subtype;
+ extern int g_keyboard_functionkeys;
  extern BOOL g_encryption;
  extern BOOL g_licence_issued;
***************
*** 447,453 ****
  	out_uint8s(s, 30 - hostlen);
  
! 	out_uint32_le(s, 4);
! 	out_uint32(s, 0);
! 	out_uint32_le(s, 12);
  	out_uint8s(s, 64);	/* reserved? 4 + 12 doublewords */
  	out_uint16_le(s, 0xca01);	/* colour depth? */
--- 450,456 ----
  	out_uint8s(s, 30 - hostlen);
  
! 	out_uint32_le(s, g_keyboard_type);
! 	out_uint32_le(s, g_keyboard_subtype);
! 	out_uint32_le(s, g_keyboard_functionkeys);
  	out_uint8s(s, 64);	/* reserved? 4 + 12 doublewords */
  	out_uint16_le(s, 0xca01);	/* colour depth? */

Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** xkeymap.c	3 Aug 2005 10:56:16 -0000	1.80
--- xkeymap.c	3 Aug 2005 11:30:53 -0000	1.81
***************
*** 43,46 ****
--- 43,49 ----
  extern char keymapname[16];
  extern int g_keylayout;
+ extern int g_keyboard_type;
+ extern int g_keyboard_subtype;
+ extern int g_keyboard_functionkeys;
  extern int g_win_button_size;
  extern BOOL g_enable_compose;
***************
*** 342,345 ****
--- 345,373 ----
  		}
  
+ 		/* keyboard_type */
+ 		if (strncmp(line, "keyboard_type ", sizeof("keyboard_type ")) == 0)
+ 		{
+ 			g_keyboard_type = strtol(line + sizeof("keyboard_type "), NULL, 16);
+ 			DEBUG_KBD(("keyboard_type 0x%x\n", g_keyboard_type));
+ 			continue;
+ 		}
+ 
+ 		/* keyboard_subtype */
+ 		if (strncmp(line, "keyboard_subtype ", sizeof("keyboard_subtype ")) == 0)
+ 		{
+ 			g_keyboard_subtype = strtol(line + sizeof("keyboard_subtype "), NULL, 16);
+ 			DEBUG_KBD(("keyboard_subtype 0x%x\n", g_keyboard_subtype));
+ 			continue;
+ 		}
+ 
+ 		/* keyboard_functionkeys */
+ 		if (strncmp(line, "keyboard_functionkeys ", sizeof("keyboard_functionkeys ")) == 0)
+ 		{
+ 			g_keyboard_functionkeys =
+ 				strtol(line + sizeof("keyboard_functionkeys "), NULL, 16);
+ 			DEBUG_KBD(("keyboard_functionkeys 0x%x\n", g_keyboard_functionkeys));
+ 			continue;
+ 		}
+ 
  		/* Comment */
  		if (line[0] == '#')



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click