More osx tweaks

matplotlib · efiring · Jul 1, 2012 · Apr 23, 2012 · Apr 23, 2012 · Apr 23, 2012
commit 9dfd95318bd15434ab91f8c64c0b355d4163053a
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -189,6 +189,10 @@ class FigureCanvasGTK (gtk.DrawingArea, FigureCanvasBase):
               65455 : '/',
               65439 : 'dec',
               65421 : 'enter',
+               65511 : 'super',
+               65512 : 'super',
+               65406 : 'alt',
+               65289 : 'tab',
               }

    # Setting this as a static constant prevents
@@ -326,7 +330,7 @@ def _get_key(self, event):
            key = chr(event.keyval)
        else:
            key = None
-
+            
        for key_mask, prefix in (
                                 [gdk.MOD4_MASK, 'super'],
                                 [gdk.MOD1_MASK, 'alt'], 
@@ -336,7 +340,6 @@ def _get_key(self, event):

        return key

-
    def configure_event(self, widget, event):
        if _debug: print('FigureCanvasGTK.%s' % fn_name())
        if widget.window is None:

diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -156,6 +156,8 @@ class FigureCanvasQT( QtGui.QWidget, FigureCanvasBase ):
                      (QtCore.Qt.ControlModifier, 'ctrl', QtCore.Qt.Key_Control) 
                      ]

+    _ctrl_modifier = QtCore.Qt.ControlModifier
+
    if sys.platform == 'darwin':
        # in OSX, the control and super (aka cmd/apple) keys are switched, so 
        # switch them back.
@@ -169,15 +171,17 @@ class FigureCanvasQT( QtGui.QWidget, FigureCanvasBase ):
                          (QtCore.Qt.AltModifier, 'alt', QtCore.Qt.Key_Alt),
                          (QtCore.Qt.MetaModifier, 'ctrl', QtCore.Qt.Key_Meta),
                         ]
-
+
+        _ctrl_modifier = QtCore.Qt.MetaModifier
+
    # map Qt button codes to MouseEvent's ones:
    buttond = {QtCore.Qt.LeftButton  : 1,
               QtCore.Qt.MidButton   : 2,
               QtCore.Qt.RightButton : 3,
               # QtCore.Qt.XButton1 : None,
               # QtCore.Qt.XButton2 : None,
               }
-  
+
    def __init__( self, figure ):
        if DEBUG: print('FigureCanvasQt: ', figure)
        _create_qApp()
@@ -299,16 +303,15 @@ def _get_key( self, event ):

        if event.key() < 256:
            key = unicode(event.text())
-
            # if the control key is being pressed, we don't get the correct
            # characters, so interpret them directly from the event.key(). 
            # Unfortunately, this means that we cannot handle key's case 
-            # since event.key() is not case sensitve, whereas event.text() is,
+            # since event.key() is not case sensitive, whereas event.text() is,
            # Finally, since it is not possible to get the CapsLock state
            # we cannot accurately compute the case of a pressed key when 
            # ctrl+shift+p is pressed.
-            if int(event.modifiers()) & QtCore.Qt.ControlModifier:
-                # we always get an uppercase charater
+            if int(event.modifiers()) & self._ctrl_modifier:
+                # we always get an uppercase character
                key = chr(event.key())
                # if shift is not being pressed, lowercase it (as mentioned, 
                # this does not take into account the CapsLock state)
@@ -322,7 +325,7 @@ def _get_key( self, event ):
            # prepend the ctrl, alt, super keys if appropriate (sorted in that order) 
            for modifier, prefix, Qt_key in self._modifier_keys:
                if event.key() != Qt_key and int(event.modifiers()) & modifier == modifier: 
-                    key = '{}+{}'.format(prefix, key)
+                    key = u'{}+{}'.format(prefix, key)

        return key


diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -574,15 +574,15 @@ def __call__(self, s):
    'agg.path.chunksize' : [0, validate_int],       # 0 to disable chunking;
                                                    # recommend about 20000 to
                                                    # enable. Experimental.
-    # key-mappings
+    # key-mappings (multi-character mappings should be a list/tuple)
    'keymap.fullscreen' : [('f', 'ctrl+f'), validate_stringlist],
    'keymap.home' : [['h', 'r', 'home'], validate_stringlist],
    'keymap.back' : [['left', 'c', 'backspace'], validate_stringlist],
    'keymap.forward' : [['right', 'v'], validate_stringlist],
    'keymap.pan' : ['p', validate_stringlist],
    'keymap.zoom' : ['o', validate_stringlist],
    'keymap.save' : [('s', 'ctrl+s'), validate_stringlist],
-    'keymap.quit' : ['ctrl+w', validate_stringlist],
+    'keymap.quit' : [('ctrl+w', ), validate_stringlist],
    'keymap.grid' : ['g', validate_stringlist],
    'keymap.yscale' : ['l', validate_stringlist],
    'keymap.xscale' : [['k', 'L'], validate_stringlist],