CVS: rdesktop rdesktop.c,1.135,1.136 xkeymap.c,1.84,1.85

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

Modified Files:
	rdesktop.c xkeymap.c 
Log Message:
keymapname -> g_keymapname

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** rdesktop.c	4 Aug 2005 12:50:15 -0000	1.135
--- rdesktop.c	4 Aug 2005 12:51:44 -0000	1.136
***************
*** 52,56 ****
  char g_username[64];
  char g_hostname[16];
! char keymapname[PATH_MAX] = "";
  int g_keylayout = 0x409;	/* Defaults to US keyboard layout */
  int g_keyboard_type = 0x4;	/* Defaults to US keyboard layout */
--- 52,56 ----
  char g_username[64];
  char g_hostname[16];
! char g_keymapname[PATH_MAX] = "";
  int g_keylayout = 0x409;	/* Defaults to US keyboard layout */
  int g_keyboard_type = 0x4;	/* Defaults to US keyboard layout */
***************
*** 465,469 ****
  
  			case 'k':
! 				STRNCPY(keymapname, optarg, sizeof(keymapname));
  				break;
  
--- 465,469 ----
  
  			case 'k':
! 				STRNCPY(g_keymapname, optarg, sizeof(g_keymapname));
  				break;
  
***************
*** 753,765 ****
  	}
  
! 	if (keymapname[0] == 0)
  	{
  		if (locale && xkeymap_from_locale(locale))
  		{
! 			fprintf(stderr, "Autoselected keyboard map %s\n", keymapname);
  		}
  		else
  		{
! 			STRNCPY(keymapname, "en-us", sizeof(keymapname));
  		}
  	}
--- 753,765 ----
  	}
  
! 	if (g_keymapname[0] == 0)
  	{
  		if (locale && xkeymap_from_locale(locale))
  		{
! 			fprintf(stderr, "Autoselected keyboard map %s\n", g_keymapname);
  		}
  		else
  		{
! 			STRNCPY(g_keymapname, "en-us", sizeof(g_keymapname));
  		}
  	}

Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** xkeymap.c	4 Aug 2005 12:50:15 -0000	1.84
--- xkeymap.c	4 Aug 2005 12:51:44 -0000	1.85
***************
*** 41,45 ****
  extern Display *g_display;
  extern Window g_wnd;
! extern char keymapname[16];
  extern int g_keylayout;
  extern int g_keyboard_type;
--- 41,45 ----
  extern Display *g_display;
  extern Window g_wnd;
! extern char g_keymapname[16];
  extern int g_keylayout;
  extern int g_keyboard_type;
***************
*** 206,210 ****
  	{
  		fclose(fp);
! 		STRNCPY(keymapname, str, sizeof(keymapname));
  		return True;
  	}
--- 206,210 ----
  	{
  		fclose(fp);
! 		STRNCPY(g_keymapname, str, sizeof(g_keymapname));
  		return True;
  	}
***************
*** 445,451 ****
  	unsigned int max_keycode;
  
! 	if (strcmp(keymapname, "none"))
  	{
! 		if (xkeymap_read(keymapname))
  			keymap_loaded = True;
  	}
--- 445,451 ----
  	unsigned int max_keycode;
  
! 	if (strcmp(g_keymapname, "none"))
  	{
! 		if (xkeymap_read(g_keymapname))
  			keymap_loaded = True;
  	}



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf