Add count for actions. Zero key treat as command.

qutebrowser/browser/commands.py

@@ -1153,127 +1153,137 @@ class CommandDispatcher:
             view.search(view.search_text, flags)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_next_line(self):
+    def move_to_next_line(self, count=1):
         """Move the cursor or select to the next line."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToNextLine
         else:
             act = QWebPage.SelectNextLine
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_prev_line(self):
+    def move_to_prev_line(self, count=1):
         """Move the cursor or select to the prev line."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToPreviousLine
         else:
             act = QWebPage.SelectPreviousLine
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_next_char(self):
+    def move_to_next_char(self, count=1):
         """Move the cursor or select to the next char."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToNextChar
         else:
             act = QWebPage.SelectNextChar
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_prev_char(self):
+    def move_to_prev_char(self, count=1):
         """Move the cursor or select to the prev char."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToPreviousChar
         else:
             act = QWebPage.SelectPreviousChar
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_end_of_word(self):
+    def move_to_end_of_word(self, count=1):
         """Move the cursor or select to the next word."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToNextWord
         else:
             act = QWebPage.SelectNextWord
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret],
+                       modes=[KeyMode.caret], scope='window', count='count')
-                       scope='window')
+    def move_to_next_word(self, count=1):
-    def move_to_next_word(self):
         """Move the cursor or select to the next word."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = [QWebPage.MoveToNextWord, QWebPage.MoveToNextChar]
         else:
             act = [QWebPage.SelectNextWord, QWebPage.SelectNextChar]
-        for a in act:
+        for _ in range(count):
-            webview.triggerPageAction(a)
+            for a in act:
+                webview.triggerPageAction(a)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_prev_word(self):
+    def move_to_prev_word(self, count=1):
         """Move the cursor or select to the prev word."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToPreviousWord
         else:
             act = QWebPage.SelectPreviousWord
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_start_of_line(self):
+    def move_to_start_of_line(self, count=1):
         """Move the cursor or select to the start of line."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToStartOfLine
         else:
             act = QWebPage.SelectStartOfLine
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_end_of_line(self):
+    def move_to_end_of_line(self, count=1):
         """Move the cursor or select to the end of line."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToEndOfLine
         else:
             act = QWebPage.SelectEndOfLine
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_start_of_block(self):
+    def move_to_start_of_block(self, count=1):
         """Move the cursor or select to the start of block."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToStartOfBlock
         else:
             act = QWebPage.SelectStartOfBlock
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
-                       modes=[KeyMode.caret], scope='window')
+                       modes=[KeyMode.caret], scope='window', count='count')
-    def move_to_end_of_block(self):
+    def move_to_end_of_block(self, count=1):
         """Move the cursor or select to the end of block."""
         webview = self._current_widget()
         if not webview.selection_enabled:
             act = QWebPage.MoveToEndOfBlock
         else:
             act = QWebPage.SelectEndOfBlock
-        webview.triggerPageAction(act)
+        for _ in range(count):
+            webview.triggerPageAction(act)
 
     @cmdutils.register(instance='command-dispatcher', hide=True,
                        modes=[KeyMode.caret], scope='window')

qutebrowser/keyinput/basekeyparser.py

@@ -137,6 +137,9 @@ class BaseKeyParser(QObject):
             (countstr, cmd_input) = re.match(r'^(\d*)(.*)',
                                              self._keystring).groups()
             count = int(countstr) if countstr else None
+            if count == 0 and not cmd_input:
+                cmd_input = self._keystring
+                count = None
         else:
             cmd_input = self._keystring
             count = None
@@ -180,7 +183,6 @@ class BaseKeyParser(QObject):
 
         count, cmd_input = self._split_count()
 
-        print(count, cmd_input)
         if not cmd_input:
             # Only a count, no command yet, but we handled it
             return self.Match.other

qutebrowser/keyinput/modeparsers.py

@@ -228,7 +228,6 @@ class CaretKeyParser(keyparser.CommandKeyParser):
         super().__init__(win_id, parent, supports_count=True,
                          supports_chains=True)
         self.read_config('caret')
-        self._supports_count = False
 
     def __repr__(self):
         return utils.get_repr(self)