rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hints: refactor auto-follow handling in the fire method

Browse Source
This commit is contained in:
Jakub Klinkovský 2016-08-10 14:58:21 +02:00
parent 605e90a222
commit 24f8ed8ac1
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/browser/hints.py
View File

@ -812,6 +812,9 @@ class HintManager(QObject):
follow = (keystr in visible) or filter_match follow = (keystr in visible) or filter_match
else: else:
follow = False follow = False
# save the keystr of the only one visible hint to be picked up
# later by self.follow_hint
self._context.to_follow = list(visible.keys())[0]
if follow: if follow:
# apply auto-follow-timeout # apply auto-follow-timeout
@ -901,18 +904,12 @@ class HintManager(QObject):
self._handle_auto_follow(filterstr=filterstr, self._handle_auto_follow(filterstr=filterstr,
visible=self._context.elems) visible=self._context.elems)
def fire(self, keystr, force=False): def fire(self, keystr):
"""Fire a completed hint. """Fire a completed hint.
Args: Args:
keystr: The keychain string to follow. keystr: The keychain string to follow.
force: When True, follow even when auto-follow is not 'never'.
""" """
if not (force or config.get('hints', 'auto-follow') != 'never'):
self.handle_partial_key(keystr)
self._context.to_follow = keystr
return
# Handlers which take a QWebElement # Handlers which take a QWebElement
elem_handlers = { elem_handlers = {
Target.normal: self._actions.click, Target.normal: self._actions.click,
@ -985,7 +982,7 @@ class HintManager(QObject):
keystring = self._context.to_follow keystring = self._context.to_follow
elif keystring not in self._context.elems: elif keystring not in self._context.elems:
raise cmdexc.CommandError("No hint {}!".format(keystring)) raise cmdexc.CommandError("No hint {}!".format(keystring))
self.fire(keystring, force=True) self.fire(keystring)
@pyqtSlot() @pyqtSlot()
def on_contents_size_changed(self): def on_contents_size_changed(self):

2
qutebrowser/keyinput/modeparsers.py
View File

@ -231,7 +231,7 @@ class HintKeyParser(keyparser.CommandKeyParser):
if keytype == self.Type.chain: if keytype == self.Type.chain:
hintmanager = objreg.get('hintmanager', scope='tab', hintmanager = objreg.get('hintmanager', scope='tab',
window=self._win_id, tab='current') window=self._win_id, tab='current')
hintmanager.fire(cmdstr) hintmanager.handle_partial_key(cmdstr)
else: else:
# execute as command # execute as command
super().execute(cmdstr, keytype, count) super().execute(cmdstr, keytype, count)