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

Suppress missing translation warnings if the keymap was "none" or doesn't

Browse Source 
exist (in the latter case the user already receives an error).


git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@204 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Matt Chapman 2002-09-26 14:11:59 +00:00
parent 171e83a2f8
commit f4009305c7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xkeymap.c
View File

@ -36,6 +36,7 @@ extern char keymapname[16];
extern int keylayout; extern int keylayout;
extern BOOL enable_compose; extern BOOL enable_compose;
static BOOL keymap_loaded;
static key_translation keymap[KEYMAP_SIZE]; static key_translation keymap[KEYMAP_SIZE];
static int min_keycode; static int min_keycode;
static uint16 remote_modifier_state = 0; static uint16 remote_modifier_state = 0;
@ -206,7 +207,10 @@ xkeymap_init(void)
unsigned int max_keycode; unsigned int max_keycode;
if (strcmp(keymapname, "none")) if (strcmp(keymapname, "none"))
xkeymap_read(keymapname); {
if (xkeymap_read(keymapname))
keymap_loaded = True;
}
XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode); XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode);
} }
@ -324,7 +328,8 @@ xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state)
return tr; return tr;
} }
DEBUG_KBD(("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym))); if (keymap_loaded)
error("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
/* not in keymap, try to interpret the raw scancode */ /* not in keymap, try to interpret the raw scancode */
if ((keycode >= min_keycode) && (keycode <= 0x60)) if ((keycode >= min_keycode) && (keycode <= 0x60))