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

Set the ' mark on a jump.

Browse Source 
Automatically set the special "'" mark when jumping.
jump-mark "'" will jump to the last position before the previous jump.
A jump could be navigating via a link, jumping to another mark, or
scrolling by percentage (e.g. gg or G).
This commit is contained in:
Ryan Roden-Corrent 2016-04-11 22:36:37 -04:00
parent ddcae14ba4
commit 9062f5925e
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qutebrowser/browser/commands.py
View File

@ -476,6 +476,9 @@ class CommandDispatcher:
bg: Open in a background tab.
window: Open in a new window.
"""
# save the pre-jump position in the special ' mark
self.set_mark("'")
cmdutils.check_exclusive((tab, bg, window), 'tbw')
widget = self._current_widget()
frame = widget.page().currentFrame()
@ -586,6 +589,9 @@ class CommandDispatcher:
horizontal: Scroll horizontally instead of vertically.
count: Percentage to scroll.
"""
# save the pre-jump position in the special ' mark
self.set_mark("'")
if perc is None and count is None:
perc = 100
elif perc is None:
@ -1889,7 +1895,7 @@ class CommandDispatcher:
Args:
key: mark identifier; capital indicates a global mark
"""
y = self._current_widget().page().currentFrame().scrollPosition().y()
y = self._current_y_px()
if key.isupper():
# this is a global mark, so store the position and url
@ -1919,14 +1925,28 @@ class CommandDispatcher:
def callback(ok):
if ok:
self._tabbed_browser.cur_load_finished.disconnect(callback)
self.scroll('top')
self.scroll_px(0, y)
self._scroll_px_absolute(y)
self.openurl(url.toString())
self._tabbed_browser.cur_load_finished.connect(callback)
elif idx in self._local_marks and key in self._local_marks[idx]:
self.scroll('top')
self.scroll_px(0, self._local_marks[idx][key])
y = self._local_marks[idx][key]
# save the pre-jump position in the special ' mark
# this has to happen after we read the mark, otherwise jump_mark "'"
# would just jump to the current position every time
self.set_mark("'")
self._scroll_px_absolute(y)
else:
message.error(self._win_id, "Mark {} is not set".format(key))
def _current_y_px(self):
"""Return the current y scroll position in pixels from the top"""
return self._current_widget().page().currentFrame().scrollPosition().y()
def _scroll_px_absolute(self, y):
"""Scroll to the position y pixels from the top of the page"""
self.scroll('top')
self.scroll_px(0, y)