kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keymapname -> g_keymapname

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@974 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2005-08-04 12:51:44 +00:00
parent 72055744b9
commit 36858922d6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rdesktop.c
View File

@ -51,7 +51,7 @@
char g_title[64] = "";
char g_username[64];
char g_hostname[16];
char keymapname[PATH_MAX] = "";
char g_keymapname[PATH_MAX] = "";
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 */
@ -464,7 +464,7 @@ main(int argc, char *argv[])
break;
case 'k':
STRNCPY(keymapname, optarg, sizeof(keymapname));
STRNCPY(g_keymapname, optarg, sizeof(g_keymapname));
break;
case 'g':
@ -752,15 +752,15 @@ main(int argc, char *argv[])
STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));
}
if (keymapname[0] == 0)
if (g_keymapname[0] == 0)
{
if (locale && xkeymap_from_locale(locale))
{
fprintf(stderr, "Autoselected keyboard map %s\n", keymapname);
fprintf(stderr, "Autoselected keyboard map %s\n", g_keymapname);
}
else
{
STRNCPY(keymapname, "en-us", sizeof(keymapname));
STRNCPY(g_keymapname, "en-us", sizeof(g_keymapname));
}
}
if (locale)

8
xkeymap.c
View File

@ -40,7 +40,7 @@
extern Display *g_display;
extern Window g_wnd;
extern char keymapname[16];
extern char g_keymapname[16];
extern int g_keylayout;
extern int g_keyboard_type;
extern int g_keyboard_subtype;
@ -205,7 +205,7 @@ xkeymap_from_locale(const char *locale)
if (fp)
{
fclose(fp);
STRNCPY(keymapname, str, sizeof(keymapname));
STRNCPY(g_keymapname, str, sizeof(g_keymapname));
return True;
}
@ -444,9 +444,9 @@ xkeymap_init(void)
{
unsigned int max_keycode;
if (strcmp(keymapname, "none"))
if (strcmp(g_keymapname, "none"))
{
if (xkeymap_read(keymapname))
if (xkeymap_read(g_keymapname))
keymap_loaded = True;
}