[gnue] r9522 - in trunk/gnue-forms/src/uidrivers: _base/widgets curses/widgets

Author: reinhard
Date: 2007-04-25 15:26:25 -0500 (Wed, 25 Apr 2007)
New Revision: 9522

Modified:
   trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py
Log:
Moved some functions only used in curses from base driver to curses driver.


Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py	2007-04-25 20:21:04 UTC (rev 9521)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py	2007-04-25 20:26:25 UTC (rev 9522)
@@ -30,7 +30,6 @@
 from gnue.common.definitions import GParser
 from gnue.common.definitions.GObjects import GObj
 from gnue.forms.GFObjects import GFTabStop, GFBox, GFScrollBar, GFLabel
-from gnue.forms.input.GFKeyMapper import KeyMapper
 
 __all__ = ['UIWidget', 'InvalidBoundingBoxError']
 
@@ -283,56 +282,6 @@
 
 
     # -------------------------------------------------------------------------
-    # Handle a keyboard request for a character key
-    # -------------------------------------------------------------------------
-
-    def _keypress(self, character):
-        """
-        Handle a keyboard request for a given character key. The Keymapper
-        get's queried for the given key. If the query returned a command it's
-        event will be fired, otherwise a requestKEYPRESS event get's fired.
-
-        @param character: the charachter key to be handled
-        @type character: string
-        """
-
-        ord_c = ord(character)
-        # Tab and Enter shouldn't be control keys
-        if ord_c in [9, 10]:
-            (evt, arg) = KeyMapper.getEvent(ord_c, False, False, False)
-            self._request(evt, triggerName=arg)
-
-        # control key
-        elif ord_c < 32:
-            (evt, arg) = KeyMapper.getEvent(ord_c + 96, False, True, False)
-            self._request(evt, triggerName=arg)
-
-        else:
-            self._request('KEYPRESS', text=character)
-
-
-    # -------------------------------------------------------------------------
-    # Handle a keyboard request for a function key
-    # -------------------------------------------------------------------------
-
-    def _fkeypress(self, key, shift, ctrl, meta):
-        """
-        Handle a keyboard request for a given function key. The Keymapper is
-        asked for transforming the function key press into a command which will
-        be fired afterwards.
-
-        @param key: function key to be handled
-        @type key: integer
-        @param shift: state of the shift key (True is pressed, False released)
-        @param ctrl: state of the control key (True is pressed, False released)
-        @param meta: state of the meta key (True is pressed, False released)
-        """
-
-        (evt, args) = KeyMapper.getEvent(key, shift, ctrl, meta)
-        self._request(evt, triggerName = args)
-
-
-    # -------------------------------------------------------------------------
     # Virtual methods // Descendants should override these functions
     # -------------------------------------------------------------------------
     # TODO: add docstrings to these methods and pep8-ify them

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py	2007-04-25 20:21:04 UTC (rev 9521)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/_base.py	2007-04-25 20:26:25 UTC (rev 9522)
@@ -23,6 +23,8 @@
 
 import curses
 
+from gnue.forms.input.GFKeyMapper import KeyMapper
+
 from gnue.forms.uidrivers._base.widgets._base import UIWidget
 
 __all__ = ['UIHelper', 'box', 'ManagedBox']
@@ -168,9 +170,21 @@
             if func and func(key):
                 return
 
-        UIWidget._keypress(self, key)
+        ord_c = ord(key)
+        # Tab and Enter shouldn't be control keys
+        if ord_c in [9, 10]:
+            (evt, arg) = KeyMapper.getEvent(ord_c, False, False, False)
+            self._request(evt, triggerName=arg)
 
+        # control key
+        elif ord_c < 32:
+            (evt, arg) = KeyMapper.getEvent(ord_c + 96, False, True, False)
+            self._request(evt, triggerName=arg)
 
+        else:
+            self._request('KEYPRESS', text=key)
+
+
     # -------------------------------------------------------------------------
     # Function keypress
     # -------------------------------------------------------------------------
@@ -186,7 +200,8 @@
             if func and func(key, shift, ctrl, meta):
                 return
 
-        UIWidget._fkeypress(self, key, shift, ctrl, meta)
+        (evt, args) = KeyMapper.getEvent(key, shift, ctrl, meta)
+        self._request(evt, triggerName = args)
 
 
     # -------------------------------------------------------------------------