dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available

This makes dumpkeys | loadkeys idempotent even if no “-c charset” option
is used with dumpkeys.

Signed-off-by: Michael Schutte <michi@uiae.at>

diff --git a/src/dumpkeys.c b/src/dumpkeys.c
index 30900a5bf6f70d9960fc0aceefbf01f1e07e9ad3..326ec37c3613a1472e548f197566f85d4fbc7248 100644 (file)
--- a/src/dumpkeys.c
+++ b/src/dumpkeys.c
@@ -249,9 +249,7 @@ dump_diacs(void) {
                outchar(kd.kbdiacruc[i].diacr & 0xff);
                printf(" ");
                outchar(kd.kbdiacruc[i].base & 0xff);
-               printf(" to ");
-               outchar(convert_code(kd.kbdiacruc[i].result ^ 0xf000, TO_8BIT));
-               printf("\n");
+               printf(" to U+%04x\n", kd.kbdiacruc[i].result);
        }
 #else
        for (i = 0; i < kd.kb_cnt; i++) {