tuikit/driver/cursesw.py
changeset 111 b055add74b18
parent 110 cf3d49cdd6e2
child 113 6796adfdc7eb
--- a/tuikit/driver/cursesw.py	Wed Sep 03 19:13:37 2014 +0200
+++ b/tuikit/driver/cursesw.py	Wed Sep 03 19:14:43 2014 +0200
@@ -3,6 +3,7 @@
 import logging
 
 from tuikit.driver.driver import Driver
+from tuikit.core.events import ResizeEvent, KeypressEvent
 
 
 class CursesWDriver(Driver):
@@ -187,13 +188,13 @@
             res += self._process_mouse()
         elif c == curses.KEY_RESIZE:
             self.size.h, self.size.w = self.stdscr.getmaxyx()
-            res += [('resize', self.size.w, self.size.h)]
+            res.append(ResizeEvent(self.size.w, self.size.h))
         elif isinstance(c, int):
-            keyname, mod = self._split_keyname_mod(self.key_map[c])
-            res += [('keypress', keyname, None, mod)]
+            keyname, mods = self._split_keyname_mods(self.key_map[c])
+            res.append(KeypressEvent(keyname, None, mods))
         else:
             keyname = self.key_names.get(c)
-            res += [('keypress', keyname, c, set())]
+            res.append(KeypressEvent(keyname, c, set()))
 
         return res
 
@@ -240,7 +241,7 @@
 
         return out
 
-    def _split_keyname_mod(self, keyname):
+    def _split_keyname_mods(self, keyname):
         """Parse keynames in form "shift+tab", return (keyname, mod)."""
         mod_set = set()
         if '+' in keyname: