r6009 - in trunk/gnue-forms/src: . uidrivers/curses

[reinhard]

Author: reinhard
Date: 2004-07-21 08:41:49 -0500 (Wed, 21 Jul 2004)
New Revision: 6009

Modified:
   trunk/gnue-forms/src/GFKeyMapper.py
   trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
Log:
Make keymapper control key feature usable for other UI's.


Modified: trunk/gnue-forms/src/GFKeyMapper.py
===================================================================
--- trunk/gnue-forms/src/GFKeyMapper.py 2004-07-21 11:33:38 UTC (rev 6008)
+++ trunk/gnue-forms/src/GFKeyMapper.py 2004-07-21 13:41:49 UTC (rev 6009)
@@ -289,11 +289,11 @@
       (vk.C,        False, True,  False) : 'COPY',
       (vk.V,        False, True,  False) : 'PASTE',
       (vk.X,        False, True,  False) : 'CUT',
-      (1,           False, False, False) : 'SELECTALL',  # Ctrl-A
-      (3,           False, False, False) : 'COPY',       # Ctrl-C
-      (17,          False, False, False) : 'EXIT',       # Ctrl-Q
-      (22,          False, False, False) : 'PASTE',      # Ctrl-V
-      (24,          False, False, False) : 'CUT',        # Ctrl-X
+      (ord ('a'),   False, True,  False) : 'SELECTALL',
+      (ord ('c'),   False, True,  False) : 'COPY',
+      (ord ('q'),   False, True,  False) : 'EXIT',
+      (ord ('v'),   False, True,  False) : 'PASTE',
+      (ord ('x'),   False, True,  False) : 'CUT',
       (vk.PAGEUP,   True,  False, False) : 'JUMPROWSUP',
       (vk.PAGEDOWN, True,  False, False) : 'JUMPROWSDOWN',
       (vk.PAGEUP,   False, True,  False) : 'PREVPAGE',

Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2004-07-21 11:33:38 UTC 
(rev 6008)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2004-07-21 13:41:49 UTC 
(rev 6009)
@@ -148,7 +148,8 @@
 
     # This could be in the base UI driver
     if character < ' ':                 # control key
-      self.__action (KeyMapper.getEvent (ord (character), False, True, False))
+      self.__action (KeyMapper.getEvent (ord (character) + 96,
+                                         False, True, False))
     else:
       self.__action ('KEYPRESS', text = character)
 
@@ -170,7 +171,7 @@
     while not self.__exiting:
       key = self.__currentForm.wait ()
 
-      if key >= 32 and key <= 255:
+      if key >= 0 and key <= 255:
         self.__keypress (unicode (chr (key), i18n.encoding))
       else:
         if self.__shiftkeys.has_key (key):      # translate shifted f-key