diff options
Diffstat (limited to 'x11vnc/keyboard.c')
| -rw-r--r-- | x11vnc/keyboard.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/x11vnc/keyboard.c b/x11vnc/keyboard.c index 0f05106..240c4bc 100644 --- a/x11vnc/keyboard.c +++ b/x11vnc/keyboard.c @@ -996,27 +996,31 @@ void switch_to_xkb_if_better(void) { XFree(keymap); if (missing_noxkb == 0 && syms_gt_4 >= 8) { - rfbLog("XKEYBOARD: number of keysyms per keycode %d " - "is greater\n", syms_per_keycode); - rfbLog(" than 4 and %d keysyms are mapped above 4.\n", - syms_gt_4); - rfbLog(" Automatically switching to -xkb mode.\n"); - rfbLog(" If this makes the key mapping worse you can\n"); - rfbLog(" disable it with the \"-noxkb\" option.\n"); - rfbLog(" Also, remember \"-remap DEAD\" for accenting" - " characters.\n"); + if (! raw_fb_str) { + rfbLog("XKEYBOARD: number of keysyms per keycode %d " + "is greater\n", syms_per_keycode); + rfbLog(" than 4 and %d keysyms are mapped above 4.\n", + syms_gt_4); + rfbLog(" Automatically switching to -xkb mode.\n"); + rfbLog(" If this makes the key mapping worse you can\n"); + rfbLog(" disable it with the \"-noxkb\" option.\n"); + rfbLog(" Also, remember \"-remap DEAD\" for accenting" + " characters.\n"); + } use_xkb_modtweak = 1; return; } else if (missing_noxkb == 0) { - rfbLog("XKEYBOARD: all %d \"must have\" keysyms accounted" - " for.\n", n); - rfbLog(" Not automatically switching to -xkb mode.\n"); - rfbLog(" If some keys still cannot be typed, try using" - " -xkb.\n"); - rfbLog(" Also, remember \"-remap DEAD\" for accenting" - " characters.\n"); + if (! raw_fb_str) { + rfbLog("XKEYBOARD: all %d \"must have\" keysyms accounted" + " for.\n", n); + rfbLog(" Not automatically switching to -xkb mode.\n"); + rfbLog(" If some keys still cannot be typed, try using" + " -xkb.\n"); + rfbLog(" Also, remember \"-remap DEAD\" for accenting" + " characters.\n"); + } return; } |