Add input -> partial-timeout option to clear partial keystrings.
This commit is contained in:
parent
42e2438efb
commit
e696898c4a
@ -335,6 +335,10 @@ DATA = collections.OrderedDict([
|
|||||||
SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '500'),
|
SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '500'),
|
||||||
"Timeout for ambiguous keybindings."),
|
"Timeout for ambiguous keybindings."),
|
||||||
|
|
||||||
|
('partial-timeout',
|
||||||
|
SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '1000'),
|
||||||
|
"Timeout for partially typed keybindings."),
|
||||||
|
|
||||||
('insert-mode-on-plugins',
|
('insert-mode-on-plugins',
|
||||||
SettingValue(typ.Bool(), 'false'),
|
SettingValue(typ.Bool(), 'false'),
|
||||||
"Whether to switch to insert mode when clicking flash and other "
|
"Whether to switch to insert mode when clicking flash and other "
|
||||||
|
@ -175,7 +175,7 @@ class BaseKeyParser(QObject):
|
|||||||
self._debug_log("Ignoring, no text char")
|
self._debug_log("Ignoring, no text char")
|
||||||
return self.Match.none
|
return self.Match.none
|
||||||
|
|
||||||
self._stop_delayed_exec()
|
self._stop_timers()
|
||||||
self._keystring += txt
|
self._keystring += txt
|
||||||
|
|
||||||
count, cmd_input = self._split_count()
|
count, cmd_input = self._split_count()
|
||||||
@ -246,7 +246,7 @@ class BaseKeyParser(QObject):
|
|||||||
else:
|
else:
|
||||||
return (self.Match.none, None)
|
return (self.Match.none, None)
|
||||||
|
|
||||||
def _stop_delayed_exec(self):
|
def _stop_timers(self):
|
||||||
"""Stop a delayed execution if any is running."""
|
"""Stop a delayed execution if any is running."""
|
||||||
if self._ambigious_timer.isActive() and self.do_log:
|
if self._ambigious_timer.isActive() and self.do_log:
|
||||||
log.keyboard.debug("Stopping delayed execution.")
|
log.keyboard.debug("Stopping delayed execution.")
|
||||||
|
@ -37,12 +37,18 @@ LastPress = usertypes.enum('LastPress', ['none', 'filtertext', 'keystring'])
|
|||||||
|
|
||||||
class NormalKeyParser(keyparser.CommandKeyParser):
|
class NormalKeyParser(keyparser.CommandKeyParser):
|
||||||
|
|
||||||
"""KeyParser for normalmode with added STARTCHARS detection."""
|
"""KeyParser for normalmode with added STARTCHARS detection and more.
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
_partial_timer: Timer to clear partial keypresses.
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, win_id, parent=None):
|
def __init__(self, win_id, parent=None):
|
||||||
super().__init__(win_id, parent, supports_count=True,
|
super().__init__(win_id, parent, supports_count=True,
|
||||||
supports_chains=True)
|
supports_chains=True)
|
||||||
self.read_config('normal')
|
self.read_config('normal')
|
||||||
|
self._partial_timer = usertypes.Timer(self, 'partial-match')
|
||||||
|
self._partial_timer.setSingleShot(True)
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return utils.get_repr(self)
|
return utils.get_repr(self)
|
||||||
@ -60,7 +66,32 @@ class NormalKeyParser(keyparser.CommandKeyParser):
|
|||||||
if not self._keystring and any(txt == c for c in STARTCHARS):
|
if not self._keystring and any(txt == c for c in STARTCHARS):
|
||||||
message.set_cmd_text(self._win_id, txt)
|
message.set_cmd_text(self._win_id, txt)
|
||||||
return self.Match.definitive
|
return self.Match.definitive
|
||||||
return super()._handle_single_key(e)
|
match = super()._handle_single_key(e)
|
||||||
|
if match == self.Match.partial:
|
||||||
|
timeout = config.get('input', 'partial-timeout')
|
||||||
|
if timeout != 0:
|
||||||
|
self._partial_timer.setInterval(timeout)
|
||||||
|
self._partial_timer.timeout.connect(self._clear_partial_match)
|
||||||
|
self._partial_timer.start()
|
||||||
|
return match
|
||||||
|
|
||||||
|
@pyqtSlot()
|
||||||
|
def _clear_partial_match(self):
|
||||||
|
"""Clear a partial keystring after a timeout."""
|
||||||
|
self._debug_log("Clearing partial keystring {}".format(
|
||||||
|
self._keystring))
|
||||||
|
self._keystring = ''
|
||||||
|
self.keystring_updated.emit(self._keystring)
|
||||||
|
|
||||||
|
@pyqtSlot()
|
||||||
|
def _stop_timers(self):
|
||||||
|
super()._stop_timers()
|
||||||
|
self._partial_timer.stop()
|
||||||
|
try:
|
||||||
|
self._partial_timer.timeout.disconnect(self._clear_partial_match)
|
||||||
|
except TypeError:
|
||||||
|
# no connections
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class PromptKeyParser(keyparser.CommandKeyParser):
|
class PromptKeyParser(keyparser.CommandKeyParser):
|
||||||
|
Loading…
Reference in New Issue
Block a user