commit 259b5e3803c261ead1e633fc4fc5235e46127081
author Oleg Bulatov <oleg@bulatov.me> Sun Nov 13 22:10:13 2016 +0300
committer Oleg Bulatov <oleg@bulatov.me> Sun Nov 13 23:15:30 2016 +0300
tree 76f9a2b4f80610618f515a14292817634986a09c
parent f5bbb63f76573d39aa862b05c54b78f06d164093

Use keysyms in diacs dump

Signed-off-by: Oleg Bulatov <oleg@bulatov.me>

src/libkeymap/dump.c

diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
index 44b5620..2cdc9f7 100644
--- a/src/libkeymap/dump.c
+++ b/src/libkeymap/dump.c
@@ -270,6 +270,7 @@
 {
 	unsigned int i;
 	struct lk_kbdiacr *ptr;
+	const char *ksym;
 
 	for (i = 0; i < ctx->accent_table->count; i++) {
 		ptr = lk_array_get_ptr(ctx->accent_table, i);
@@ -281,12 +282,28 @@
 		fprintf(fd, " ");
 		dumpchar(fd, ptr->base, 0);
 #ifdef KDGKBDIACRUC
-		fprintf(fd, " to U+%04x\n", ptr->result);
-#else
-		fprintf(fd, " to ");
-		dumpchar(fd, ptr->result, 0);
-		fprintf(fd, "\n");
+		if (ctx->flags & LK_FLAG_PREFER_UNICODE) {
+			ksym = codetoksym(ctx, ptr->result ^ 0xf000);
+			if (ksym) {
+				fprintf(fd, " to %s\n", ksym);
+			} else {
+				fprintf(fd, " to U+%04x\n", ptr->result);
+			}
+		} else
 #endif
+		if (ptr->result > 0xff) {
+			// impossible case?
+			fprintf(fd, " to 0x%x\n", ptr->result);
+		} else {
+			ksym = codetoksym(ctx, ptr->result);
+			if (ksym) {
+				fprintf(fd, " to %s\n", ksym);
+			} else {
+				fprintf(fd, " to ");
+				dumpchar(fd, ptr->result, 0);
+				fprintf(fd, "\n");
+			}
+		}
 	}
 }