From 8370ba868ef76f816842ba934a2e57d43c882a00 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 8 May 2017 15:27:00 +0200 Subject: Correct lookup of name in comment The maps are indexed by Linux keycode, not by the keycode type corresponding to the names. --- tools/keymap-gen | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/keymap-gen b/tools/keymap-gen index 914b40c..cfa595d 100755 --- a/tools/keymap-gen +++ b/tools/keymap-gen @@ -311,9 +311,9 @@ class LanguageSrcGenerator(LanguageGenerator): else: dst = fromlinux.get(linux, None) - comment = "%s -> %s -> %s" % (self._label(database, frommapname, src), - self._label(database, Database.MAP_LINUX, linux), - self._label(database, tomapname, dst)) + comment = "%s -> %s -> %s" % (self._label(database, frommapname, src, linux), + self._label(database, Database.MAP_LINUX, linux, linux), + self._label(database, tomapname, dst, linux)) self._array_entry_code(src, dst, comment) self._array_end() @@ -366,9 +366,9 @@ class LanguageSrcGenerator(LanguageGenerator): else: dst = fromlinux.get(linux, None) - comment = "%s -> %s -> %s" % (self._label(database, frommapname, src), - self._label(database, Database.MAP_LINUX, linux), - self._label(database, tomapname, dst)) + comment = "%s -> %s -> %s" % (self._label(database, frommapname, src, linux), + self._label(database, Database.MAP_LINUX, linux, linux), + self._label(database, tomapname, dst, linux)) self._array_entry_name(src, dst, comment) self._array_end() @@ -393,9 +393,9 @@ class LanguageSrcGenerator(LanguageGenerator): self._array_end() - def _label(self, database, mapname, val): + def _label(self, database, mapname, val, linux): if mapname in database.mapname: - return "%s:%s (%s)" % (mapname, val, database.mapname[mapname].get(val, "unnamed")) + return "%s:%s (%s)" % (mapname, val, database.mapname[mapname].get(linux, "unnamed")) else: return "%s:%s" % (mapname, val) -- cgit v1.1