diff options
| author | Pierre Ossman <ossman@cendio.se> | 2017-05-08 15:27:00 +0200 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2017-07-13 17:13:31 +0100 |
| commit | 8370ba868ef76f816842ba934a2e57d43c882a00 (patch) | |
| tree | a56019cc9cd2e9a31ec379be30260420675d5ad6 | |
| parent | e9592077371ddf64b8bfe6e7454a28078707c3ad (diff) | |
| download | keycodemapdb-8370ba868ef76f816842ba934a2e57d43c882a00.zip keycodemapdb-8370ba868ef76f816842ba934a2e57d43c882a00.tar.gz keycodemapdb-8370ba868ef76f816842ba934a2e57d43c882a00.tar.bz2 | |
Correct lookup of name in comment
The maps are indexed by Linux keycode, not by the keycode type
corresponding to the names.
| -rwxr-xr-x | tools/keymap-gen | 16 |
1 files 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) |