From 8648d88b510456d50d1c34bf17b1dd0a03bcf085 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 24 Apr 2014 17:43:19 +0200
Subject: [PATCH] Handle special keys instead of only modifiers

---
 qutebrowser/browser/hints.py   |  6 ++++--
 qutebrowser/commands/keys.py   |  6 +++---
 qutebrowser/utils/keyparser.py | 21 +++++++++------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 4dbdc4862..04c872a93 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -53,8 +53,10 @@ class HintKeyParser(KeyParser):
     fire_hint = pyqtSignal(str)
     abort_hinting = pyqtSignal()
 
-    def _handle_modifier_key(self, e):
-        """We don't support modifiers here, but we'll handle escape in here.
+    def _handle_special_key(self, e):
+        """Handle the escape key.
+
+        FIXME make this more generic
 
         Emit:
             abort_hinting: Emitted if hinting was aborted.
diff --git a/qutebrowser/commands/keys.py b/qutebrowser/commands/keys.py
index 512d60f0b..8f8d897d8 100644
--- a/qutebrowser/commands/keys.py
+++ b/qutebrowser/commands/keys.py
@@ -118,9 +118,9 @@ class CommandKeyParser(KeyParser):
             if key.startswith('@') and key.endswith('@'):
                 # normalize keystring
                 keystr = self._normalize_keystr(key.strip('@'))
-                logging.debug('registered mod key: {} -> {}'.format(keystr,
-                                                                    cmd))
-                self.modifier_bindings[keystr] = cmd
+                logging.debug('registered special key: {} -> {}'.format(keystr,
+                                                                        cmd))
+                self.special_bindings[keystr] = cmd
             else:
                 logging.debug('registered key: {} -> {}'.format(key, cmd))
                 self.bindings[key] = cmd
diff --git a/qutebrowser/utils/keyparser.py b/qutebrowser/utils/keyparser.py
index a5b76cf60..bd16cf75e 100644
--- a/qutebrowser/utils/keyparser.py
+++ b/qutebrowser/utils/keyparser.py
@@ -46,7 +46,7 @@ class KeyParser(QObject):
         _keystring: The currently entered key sequence
         _timer: QTimer for delayed execution.
         bindings: Bound keybindings
-        modifier_bindings: Bound modifier bindings.
+        special_bindings: Bound special bindings (@Foo@).
 
     Signals:
         keystring_updated: Emitted when the keystring is updated.
@@ -62,16 +62,16 @@ class KeyParser(QObject):
 
     supports_count = False
 
-    def __init__(self, parent=None, bindings=None, modifier_bindings=None):
+    def __init__(self, parent=None, bindings=None, special_bindings=None):
         super().__init__(parent)
         self._timer = None
         self._keystring = ''
         self.bindings = {} if bindings is None else bindings
-        self.modifier_bindings = ({} if modifier_bindings is None
-                                  else modifier_bindings)
+        self.special_bindings = ({} if special_bindings is None
+                                 else special_bindings)
 
-    def _handle_modifier_key(self, e):
-        """Handle a new keypress with modifiers.
+    def _handle_special_key(self, e):
+        """Handle a new keypress with special keys (@Foo@).
 
         Return True if the keypress has been handled, and False if not.
 
@@ -92,18 +92,15 @@ class KeyParser(QObject):
             return False
         mod = e.modifiers()
         modstr = ''
-        if not mod & (Qt.ControlModifier | Qt.AltModifier | Qt.MetaModifier):
-            # won't be a shortcut with modifiers
-            return False
         for (mask, s) in modmask2str.items():
             if mod & mask:
                 modstr += s + '+'
         keystr = QKeySequence(e.key()).toString()
         try:
-            cmdstr = self.modifier_bindings[modstr + keystr]
+            cmdstr = self.special_bindings[modstr + keystr]
         except KeyError:
             logging.debug('No binding found for {}.'.format(modstr + keystr))
-            return True
+            return False
         self.execute(cmdstr)
         return True
 
@@ -281,7 +278,7 @@ class KeyParser(QObject):
         Emit:
             keystring_updated: If a new keystring should be set.
         """
-        handled = self._handle_modifier_key(e)
+        handled = self._handle_special_key(e)
         if not handled:
             self._handle_single_key(e)
             self.keystring_updated.emit(self._keystring)