From e21f9933c76a9c311cf450ffe59823e3855452a6 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Sun, 23 Nov 2008 13:04:10 +0100 Subject: [PATCH] Warning message beautifying --- klc2xkb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/klc2xkb b/klc2xkb index 0516a07..aaefcdd 100755 --- a/klc2xkb +++ b/klc2xkb @@ -86,7 +86,7 @@ class KeyMapping(object): def to_xkb_def_str(self): xkbname = self.scancode_to_xkbname(self.scancode) if not xkbname: - warn("unknown scan code %(v)u/0x%(v)02x" % {'v': self.scancode}) + warn("unknown scancode %(v)u/0x%(v)02x" % {'v': self.scancode}) return ("key <%s> { [ %s, %s, %s, %s ] };" % tuple([xkbname] @@ -205,11 +205,17 @@ class MSKLCFile(object): if good: valid[shift % 4] = pieces[i] elif pieces[i] != '-1': + xkbname = KeyMapping.scancode_to_xkbname(scancode) + if xkbname: + key = "%(xkb)s (%(v)u/0x%(v)02x)" + else: + key = "(%(v)u/0x%(v)02x)" + key = key % { 'xkb': xkbname, 'v': scancode } warn("skipping %(pc)s at position %(pos)u (shiftstate %(ss)u) for %(key)s" % { 'pc': pieces[i], 'pos': i, 'ss': shift, - 'key': pieces[0] + 'key': key }) mapping = KeyMapping(scancode, *valid) self.mappings.append(mapping) -- 2.32.0.93.g670b81a890