add keycode for all events

meeuw · meeuw · commit d4e96ac1b30f · 2022-07-15T20:41:35.000+02:00
diff --git a/evdev/events.py b/evdev/events.py
@@ -130,15 +130,23 @@ def __repr__(s):
 class RelEvent(object):
     '''A relative axis event (e.g moving the mouse 5 units to the left).'''
 
-    __slots__ = 'event'
+    __slots__ = 'event', 'keycode'
+
+    def __init__(self, event, allow_unknown=False):
+        try:
+            self.keycode = REL[event.code]
+        except KeyError:
+            if allow_unknown:
+                self.keycode = '0x{:02X}'.format(event.code)
+            else:
+                raise
 
-    def __init__(self, event):
         #: Reference to an :class:`InputEvent` instance.
         self.event = event
 
     def __str__(self):
-        msg = 'relative axis event at {:f}, {} '
-        return msg.format(self.event.timestamp(), REL[self.event.code])
+        msg = 'relative axis event at {:f}, {} {} '
+        return msg.format(self.event.timestamp(), self.keycode, self.event.value)
 
     def __repr__(s):
         return '{}({!r})'.format(s.__class__.__name__, s.event)
@@ -147,15 +155,23 @@ def __repr__(s):
 class AbsEvent(object):
     '''An absolute axis event (e.g the coordinates of a tap on a touchscreen).'''
 
-    __slots__ = 'event'
+    __slots__ = 'event', 'keycode'
+
+    def __init__(self, event, allow_unknown=False):
+        try:
+            self.keycode = ABS[event.code]
+        except KeyError:
+            if allow_unknown:
+                self.keycode = '0x{:02X}'.format(event.code)
+            else:
+                raise
 
-    def __init__(self, event):
         #: Reference to an :class:`InputEvent` instance.
         self.event = event
 
     def __str__(self):
-        msg = 'absolute axis event at {:f}, {} '
-        return msg.format(self.event.timestamp(), ABS[self.event.code])
+        msg = 'absolute axis event at {:f}, {} {} '
+        return msg.format(self.event.timestamp(), self.keycode, self.event.value)
 
     def __repr__(s):
         return '{}({!r})'.format(s.__class__.__name__, s.event)
@@ -169,15 +185,23 @@ class SynEvent(object):
     the multitouch protocol.
     '''
 
-    __slots__ = 'event'
+    __slots__ = 'event', 'keycode'
+
+    def __init__(self, event, allow_known):
+        try:
+            self.keycode = SYN[event.code]
+        except KeyError:
+            if allow_unknown:
+                self.keycode = '0x{:02X}'.format(event.code)
+            else:
+                raise
 
-    def __init__(self, event):
         #: Reference to an :class:`InputEvent` instance.
         self.event = event
 
     def __str__(self):
         msg = 'synchronization event at {:f}, {} '
-        return msg.format(self.event.timestamp(), SYN[self.event.code])
+        return msg.format(self.event.timestamp(), self.keycode)
 
     def __repr__(s):
         return '{}({!r})'.format(s.__class__.__name__, s.event)
