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

save input_mode when entering/leaving mode

Browse Source 
instead of when changing tab
This commit is contained in:
Marc Jauvin 2018-02-12 18:10:22 -05:00
parent c736cdf87f
commit d04fc29163
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/keyinput/modeman.py
View File

@ -267,6 +267,11 @@ class ModeManager(QObject):
raise cmdexc.CommandError( raise cmdexc.CommandError(
"Mode {} can't be entered manually!".format(mode)) "Mode {} can't be entered manually!".format(mode))
if (config.val.tabs.mode_on_change == 'restore' and
m.name in ['insert', 'passthrough']):
window = objreg.get('main-window', scope='window',
window=self._win_id)
window.tabbed_browser.currentWidget().data.input_mode = m
self.enter(m, 'command') self.enter(m, 'command')
@pyqtSlot(usertypes.KeyMode, str, bool) @pyqtSlot(usertypes.KeyMode, str, bool)
@ -301,6 +306,11 @@ class ModeManager(QObject):
"""Leave the mode we're currently in.""" """Leave the mode we're currently in."""
if self.mode == usertypes.KeyMode.normal: if self.mode == usertypes.KeyMode.normal:
raise ValueError("Can't leave normal mode!") raise ValueError("Can't leave normal mode!")
if config.val.tabs.mode_on_change == 'restore':
window = objreg.get('main-window', scope='window',
window=self._win_id)
tab = window.tabbed_browser.currentWidget()
tab.data.input_mode = usertypes.KeyMode.normal
self.leave(self.mode, 'leave current') self.leave(self.mode, 'leave current')
def eventFilter(self, event): def eventFilter(self, event):

15
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -647,8 +647,6 @@ class TabbedBrowser(tabwidget.TabWidget):
def on_current_changed(self, idx): def on_current_changed(self, idx):
"""Set last-focused-tab and leave hinting mode when focus changed.""" """Set last-focused-tab and leave hinting mode when focus changed."""
mode_on_change = config.val.tabs.mode_on_change mode_on_change = config.val.tabs.mode_on_change
modes_to_save = [usertypes.KeyMode.insert,
usertypes.KeyMode.passthrough]
if idx == -1 or self.shutting_down: if idx == -1 or self.shutting_down:
# closing the last tab (before quitting) or shutting down # closing the last tab (before quitting) or shutting down
return return
@ -657,23 +655,18 @@ class TabbedBrowser(tabwidget.TabWidget):
log.webview.debug("on_current_changed got called with invalid " log.webview.debug("on_current_changed got called with invalid "
"index {}".format(idx)) "index {}".format(idx))
return return
if self._now_focused is not None and mode_on_change == 'restore':
current_mode = modeman.instance(self._win_id).mode
if current_mode not in modes_to_save:
current_mode = usertypes.KeyMode.normal
self._now_focused.data.input_mode = current_mode
log.modes.debug("Current tab changed, focusing {!r}".format(tab)) log.modes.debug("Current tab changed, focusing {!r}".format(tab))
tab.setFocus() tab.setFocus()
modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret] modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
if mode_on_change != 'persist': if mode_on_change == 'normal':
modes_to_leave += modes_to_save modes_to_leave += [usertypes.KeyMode.insert,
usertypes.KeyMode.passthrough]
for mode in modes_to_leave: for mode in modes_to_leave:
modeman.leave(self._win_id, mode, 'tab changed', maybe=True) modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
if mode_on_change == 'restore': if mode_on_change == 'restore':
modeman.enter(self._win_id, tab.data.input_mode, modeman.enter(self._win_id, tab.data.input_mode, 'restore')
'restore input mode for tab')
if self._now_focused is not None: if self._now_focused is not None:
objreg.register('last-focused-tab', self._now_focused, update=True, objreg.register('last-focused-tab', self._now_focused, update=True,
scope='window', window=self._win_id) scope='window', window=self._win_id)