Release v0.5.1.

This logged an error on Windows:

ERROR    misc       networkmanager:on_authentication_required:269 Unable to read the netrc file
Traceback (most recent call last):
  File "c:\python34\Lib\netrc.py", line 27, in __init__
    file = os.path.join(os.environ['HOME'], ".netrc")
  File "C:\Users\florian\buildbot\slave\win8\build\.tox\py34\lib\os.py", line 633, in __getitem__
    raise KeyError(key) from None
KeyError: 'HOME'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "C:\Users\florian\buildbot\slave\win8\build\qutebrowser\browser\network\networkmanager.py", line 262, in on_authentication_required
    net = netrc.netrc()
  File "c:\python34\Lib\netrc.py", line 29, in __init__
    raise OSError("Could not find .netrc: $HOME is not set")

Since this case is pretty common, we don't want to log it - and checking the
variable beforehand is easier than parsing the exception message.

This should fix the failing tests on Windows.

.appveyor.yml

@@ -0,0 +1,17 @@
+shallow_clone: true
+version: '{branch}-{build}'
+cache:
+  - C:\projects\qutebrowser\.cache
+build: off
+environment:
+    PYTHONUNBUFFERED: 1
+    matrix:
+    - TESTENV: py34
+    - TESTENV: unittests-frozen
+    - TESTENV: pylint
+
+install:
+  - C:\Python27\python -u scripts\dev\ci_install.py
+
+test_script:
+  - C:\Python34\Scripts\tox -e %TESTENV% -- -p "no:sugar" -v --junitxml=junit.xml

.coveragerc

@@ -1,8 +1,10 @@
 [run]
+source = qutebrowser
 branch = true
 omit =
     qutebrowser/__main__.py
     */__init__.py
+    qutebrowser/resources.py
 
 [report]
 exclude_lines =
@@ -11,3 +13,6 @@ exclude_lines =
     raise AssertionError
     raise NotImplementedError
     if __name__ == ["']__main__["']:
+
+[xml]
+output=coverage.xml

.eslintignore

@@ -0,0 +1 @@
+qutebrowser/3rdparty/pdfjs/*

.eslintrc

@@ -0,0 +1,49 @@
+# vim: ft=yaml
+
+env:
+   browser: true
+
+rules:
+    block-scoped-var: 2
+    dot-location: 2
+    default-case: 2
+    guard-for-in: 2
+    no-div-regex: 2
+    no-param-reassign: 2
+    no-eq-null: 2
+    no-floating-decimal: 2
+    no-self-compare: 2
+    no-throw-literal: 2
+    no-void: 2
+    radix: 2
+    wrap-iife: [2, "inside"]
+    brace-style: [2, "1tbs", {"allowSingleLine": true}]
+    comma-style: [2, "last"]
+    consistent-this: [2, "self"]
+    func-style: [2, "declaration"]
+    indent: [2, 4, {"SwitchCase": 1}]
+    linebreak-style: [2, "unix"]
+    max-nested-callbacks: [2, 3]
+    no-lonely-if: 2
+    no-multiple-empty-lines: [2, {"max": 2}]
+    no-nested-ternary: 2
+    no-unneeded-ternary: 2
+    operator-assignment: [2, "always"]
+    operator-linebreak: [2, "after"]
+    space-after-keywords: [2, "always"]
+    space-before-blocks: [2, "always"]
+    space-before-function-paren: [2, {"anonymous": "never", "named": "never"}]
+    object-curly-spacing: [2, "never"]
+    array-bracket-spacing: [2, "never"]
+    computed-property-spacing: [2, "never"]
+    space-in-parens: [2, "never"]
+    space-unary-ops: [2, {"words": true, "nonwords": false}]
+    spaced-comment: [2, "always"]
+    max-depth: [2, 5]
+    max-len: [2, 79, 4]
+    max-params: [2, 5]
+    max-statements: [2, 30]
+    no-bitwise: 2
+    quote-props: [2, "always"]
+    global-strict: 0
+    quotes: 0

.flake8

@@ -1,13 +0,0 @@
-# vim: ft=dosini fileencoding=utf-8:
-
-[flake8]
-# E265: Block comment should start with '#'
-# E501: Line too long
-# F841: unused variable
-# F401: Unused import
-# E402: module level import not at top of file
-# E266: too many leading '#' for block comment
-# W503: line break before binary operator
-ignore=E265,E501,F841,F401,E402,E266,W503
-max_complexity = 12
-exclude=resources.py

.gitignore

@@ -1,5 +1,6 @@
 __pycache__
 *.pyc
+*.swp
 /build
 /dist
 /qutebrowser.egg-info
@@ -20,4 +21,11 @@ __pycache__
 /.venv
 /.coverage
 /htmlcov
+/coverage.xml
+/.coverage.*
 /.tox
+/testresults.html
+/.cache
+/.testmondata
+/.hypothesis
+TODO

.pylintrc

@@ -4,14 +4,13 @@
 ignore=resources.py
 extension-pkg-whitelist=PyQt5,sip
 load-plugins=pylint_checkers.config,
-             pylint_checkers.crlf,
              pylint_checkers.modeline,
              pylint_checkers.openencoding,
              pylint_checkers.settrace
 
 [MESSAGES CONTROL]
+enable=all
 disable=no-self-use,
-        bad-builtin,
         fixme,
         global-statement,
         locally-disabled,
@@ -24,27 +23,29 @@ disable=no-self-use,
         blacklisted-name,
         too-many-lines,
         logging-format-interpolation,
-        interface-not-implemented,
         broad-except,
         bare-except,
         eval-used,
-        exec-used
+        exec-used,
+        file-ignored,
+        wrong-import-order,
+        ungrouped-imports,
+        redefined-variable-type,
+        suppressed-message
 
 [BASIC]
-module-rgx=(__)?[a-z][a-z0-9_]*(__)?$
-function-rgx=([a-z_][a-z0-9_]{2,30}|setUpModule|tearDownModule)$
+function-rgx=[a-z_][a-z0-9_]{2,50}$
 const-rgx=[A-Za-z_][A-Za-z0-9_]{0,30}$
-method-rgx=[a-z_][A-Za-z0-9_]{2,40}$
+method-rgx=[a-z_][A-Za-z0-9_]{2,50}$
 attr-rgx=[a-z_][a-z0-9_]{0,30}$
 argument-rgx=[a-z_][a-z0-9_]{0,30}$
 variable-rgx=[a-z_][a-z0-9_]{0,30}$
-class-attribute-rgx=[A-Za-z_][A-Za-z0-9_]{1,30}$
-inlinevar-rgx=[a-z_][a-z0-9_]*$
-docstring-min-length=2
+docstring-min-length=3
 
 [FORMAT]
 max-line-length=79
-ignore-long-lines=<?https?://
+ignore-long-lines=(<?https?://|^# Copyright 201\d)
+expected-line-ending-format=LF
 
 [SIMILARITIES]
 min-similarity-lines=8
@@ -52,11 +53,13 @@ min-similarity-lines=8
 [VARIABLES]
 dummy-variables-rgx=_.*
 
-[CLASSES]
-defining-attr-methods=__init__,__new__,setUp
-
 [DESIGN]
 max-args=10
 
 [TYPECHECK]
-ignored-classes=WebElementWrapper,AnsiCodes,UnsetObject
+# MsgType added as WORKAROUND for
+# https://bitbucket.org/logilab/pylint/issues/690/
+# UnsetObject because pylint infers any objreg.get(...) as UnsetObject.
+ignored-classes=qutebrowser.utils.objreg.UnsetObject,
+                qutebrowser.browser.webelem.WebElementWrapper,
+                scripts.dev.check_coverage.MsgType

.travis.yml

@@ -0,0 +1,76 @@
+# So we get Ubuntu Trusty - using "dist: trusty" breaks OS X.
+sudo: required
+dist: trusty
+
+os:
+  - linux
+  - osx
+
+
+env:
+  global:
+    - PATH=/home/travis/bin:/home/travis/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+  matrix:
+    - TESTENV=py35
+    - TESTENV=py34
+    - TESTENV=unittests-nodisp
+    - TESTENV=misc
+    - TESTENV=vulture
+    - TESTENV=pep257
+    - TESTENV=pyflakes
+    - TESTENV=pep8
+    - TESTENV=mccabe
+    - TESTENV=pyroma
+    - TESTENV=check-manifest
+    - TESTENV=pylint
+    - TESTENV=eslint
+
+# Not really, but this is here so we can do stuff by hand.
+language: c
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/build/The-Compiler/qutebrowser/.cache
+
+install:
+  - python scripts/dev/ci_install.py
+
+script:
+  - tox -e $TESTENV -- -p no:sugar -v --cov-report term tests
+
+after_success:
+  - '[[ ($TESTENV == py34 || $TESTENV == py35) && $TRAVIS_OX == linux ]] && codecov -e TESTENV -X gcov'
+
+matrix:
+  exclude:
+    - os: linux
+      env: TESTENV=py35
+    - os: osx
+      env: TESTENV=py34
+    - os: osx
+      env: TESTENV=unittests-nodisp
+    - os: osx
+      env: TESTENV=misc
+    - os: osx
+      env: TESTENV=vulture
+    - os: osx
+      env: TESTENV=pep257
+    - os: osx
+      env: TESTENV=pyflakes
+    - os: osx
+      env: TESTENV=pep8
+    - os: osx
+      env: TESTENV=mccabe
+    - os: osx
+      env: TESTENV=pyroma
+    - os: osx
+      env: TESTENV=check-manifest
+    - os: osx
+      env: TESTENV=pylint
+    - os: osx
+      env: TESTENV=eslint
+
+notifications:
+  webhooks:
+    - https://buildtimetrend.herokuapp.com/travis

CHANGELOG.asciidoc

@@ -14,6 +14,326 @@ This project adheres to http://semver.org/[Semantic Versioning].
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v0.5.1
+------
+
+Fixed
+~~~~~
+
+- Fixed completion for various config values when using `:set`.
+- Fixed config validation for various config values.
+- Prevented an error being logged when a website with HTTP authentication was
+  opened on Windows.
+
+v0.5.0
+------
+
+Added
+~~~~~
+
+- Ability to preview PDFs using pdf.js in the browser if it's installed. This
+  is disabled by default and can be enabled using the
+  `content -> pdfjs-enabled` setting.
+- New setting `ui -> hide-wayland-decoration` to hide the window decoration
+  when using wayland.
+- New userscripts in `misc/userscripts`:
+    - `open_download` to easily open a file in your downloads folder.
+    - `view_in_mpv` to open a video in mpv and remove it from the page.
+    - `qutedmenu` and `dmenu_qutebrowser` to select URLs via dmenu
+- New setting `content -> host-blocking-whitelist` to whitelist certain domains
+  from the adblocker.
+- `{scroll_pos}` can now be used in `ui -> window-title-format` and
+  `tabs -> title-format`.
+- New setting `general -> url-incdec-segments` to configure which segments of
+  the URL should be affected by `:navigate increment/decrement`.
+- New `--target` argument to specify how URLs should be opened in an existing
+  instance.
+- New setting `statusbar.url.fg.success.https` to set the foreground color for
+  the URL when a page was loaded via HTTPS.
+- The scrollbar in the completion is now styled, and the following new options
+  got added:
+    * `completion -> scrollbar-width`
+    * `completion -> scrollbar-padding`
+    * `colors -> completion.scrollbar.fg`
+    * `colors -> completion.scrollbar.bg`
+- New value `none` for options taking a color system so they don't display a
+  gradient:
+    * `colors -> tabs.indicator.system`
+    * `colors -> downloads.fg.system`
+    * `colors -> downloads.bg.system`
+- New command `:download-retry` to retry a failed download.
+- New command `:download-clear` which replaces `:download-remove --all`.
+- `:set-cmd-text` has a new `--append` argument to append to the current
+  statusbar text.
+- qutebrowser now uses `~/.netrc` if available to authenticate via HTTP.
+- New `:fake-key` command to send a fake keypress to a website or to
+  qutebrowser.
+- New `--mhtml` argument for `:download` to download a page including all
+  ressources as MHTML file.
+- New option `tabs -> title-alignment` to change the alignment of tab titles.
+
+Changed
+~~~~~~~
+
+- The `colors -> tabs.bg/fg.selected` option got split into
+  `tabs.bg/fg.selected.odd/even`.
+- `:spawn --userscript` and `:hint` with the `userscript` target now look up
+  relative paths in `~/.local/share/qutebrowser/userscripts` or
+  `$XDG_DATA_DIR`. Using a binary in `$PATH` won't work anymore with
+  `--userscript`.
+- New design for error pages
+- Link filtering for hints now checks if the text is contained anywhere in
+  the link, and matches case-insensitively.
+- The `ui -> remove-finished-downloads` option got changed to an integer and
+  now takes a time (in milliseconds) to keep the download around after it's
+  finished. When set to `-1`, downloads are never removed.
+- The `:follow-hint` command now optionally takes the keystring of a hint to
+  follow.
+- `:scroll-px` now doesn't take floats anymore, which made little sense.
+- Updated the user agent list for the `:set network user-agent` completion.
+- Starting with `--debug` doesn't log `VDEBUG` messages anymore (add
+  `--loglevel VDEBUG` to get them).
+- `:debug-console` now hides the console if it's already shown.
+- `:yank-selected` now doesn't log the selected text anymore.
+- `general -> log-javascript-console` got changed from a boolean to an option
+  taking a loglevel (`none`, `info`, `debug`).
+- `:tab-move +/-` now wraps around if `tabs -> wrap` is `true`.
+- When a subprocess (like launched by `:spawn`) fails, its stdout/stderr is now
+  logged to the console.
+- A search engine name can now contain any non-space character, like dashes.
+
+Deprecated
+~~~~~~~~~~
+
+- `:download-remove --all` is now deprecated and `:download-clear` should be
+  used instead.
+- `:download <url> <destination>` is now deprecated and
+  `:download --dest <destination> <url>` should be used instead.
+
+Removed
+~~~~~~~
+
+- `:scroll` with two pixel-arguments (deprecated in v0.3.0)
+- The `:run-userscript` command (deprecated in v0.2.0)
+- The `rapid` and `rapid-win` targets for `:hint` (deprecated in v0.2.0)
+- The `:cancel-download` command (deprecated in v0.2.0)
+- The `:download-page` command (deprecated in v0.2.0)
+
+Fixed
+~~~~~
+
+- Fixed retrying of downloads which were started in a now closed tab.
+- Fixed displaying of web history if `web-history-max-items` is set to -1.
+- Cloned tabs now don't display favicons anymore if show-favicons is False.
+- Fixed a crash when clicking a bookmark name and pressing `Ctrl-D`.
+- Fixed a crash when a website presents a very small favicon.
+- Fixed prompting for download directory when
+  `storage -> prompt-download-directory` was unset.
+- Fixed crash when using `:follow-hint` outside of hint mode.
+- Fixed crash when using `:set foo bar?` with invalid section/option.
+- Fixed scrolling to the very left/right with `:scroll-perc`.
+- Using an external editor should now work correctly with some funny chars
+  (U+2028/U+2029/BOM).
+- Movements in caret mode now should work correctly on OS X and Windows.
+- Fixed upgrade from earlier config versions.
+- Fixed crash when killing a running userscript.
+- Fixed characters being passed through when shifted with
+  `forward-unbound-keys` set to `auto`.
+- Fixed restarting after a crash is reported.
+- Removed `.pyc` files accidentally contained in source releases.
+
+v0.4.1
+------
+
+Fixed
+~~~~~
+
+- Adjusted AppArmor config for the IPC changes in v0.4.0.
+- Fixed atime update frequency for IPC file.
+- Worked around a Qt issue where middle-clicking caused scrolling with a
+  touchpad to restart at the beginning of the page.
+- The `completion -> web-history-max-items` setting is now also respected for
+  items added after starting qutebrowser.
+- Search terms are now shared between different tabs again
+- Tests (a reduced subset of them) now run correctly again when DISPLAY is not
+  set.
+- Fixed an issue causing qutebrowser to crash with Python 3.5 as soon as an ad
+  was blocked.
+- Fixed an issue causing qutebrowser to not start with more recent Python 3.4
+  versions (e.g. on Debian experimental).
+- Fixed various `PendingDeprecationWarnings` shown with Python 3.5.
+
+v0.4.0
+------
+
+Added
+~~~~~
+
+- New bookmark functionality (similar to quickmarks without a name).
+    * New command `:bookmark-add` to bookmark the current page (bound to `M`).
+    * New command `:bookmark-load` to load a bookmark (bound to `gb`/`gB`/`wB`).
+- New (hidden) command `:completion-item-del` (bound to `<Ctrl-D>`) to delete
+  the current item in the completion (for quickmarks/bookmarks).
+- New settings `tabs -> padding` and `tabs -> indicator-tabbing` to control the
+  size/padding of the tabbar.
+- New setting `ui -> statusbar-padding` to control the size/padding of the
+  status bar.
+- New setting `network -> referer-header` to configure when the referer should
+  be sent (by default it's only sent while on the same domain).
+- New setting `tabs -> show` which supersedes the old `tabs -> hide-*` options
+  and has an additional `switching` option which shows tab while switching
+  them. There's also a new `show-switching` option to configure the timeout.
+- New setting `storage -> remember-download-directory` to remember the last
+  used download directory.
+- New setting `storage -> prompt-download-directory` to download all downloads
+  without asking.
+- Rapid hinting is now also possible for downloads.
+- Directory browsing via `file://` is now supported.
+
+Changed
+~~~~~~~
+
+- Some developer scripts got moved to `scripts/dev/`
+- When downloading to a FIFO or special file, a confirmation is displayed as
+  this might cause qutebrowser to hang.
+- The `:yank-selected` command now works in all modes instead of just caret
+  mode and is not hidden anymore.
+- `minimal_webkit_testbrowser.py` now has a `--webengine` switch to test
+  QtWebEngine if it's installed.
+- The column width percentages for the completion view now depend on the
+  completion model.
+- The values for `tabs -> position` and `ui -> downloads-position` got changed
+  from `north`/`south`/`west/`east` to `top`/`bottom`/`left`/`right`. Existing
+  configs should be adjusted automatically.
+- `:tab-focus`/`gt` now behaves like `:tab-next` if no count/index is given.
+- The completion widget doesn't show a border anymore.
+- The tabbar doesn't display ugly arrows anymore if there isn't enough space
+  for all tabs.
+- Some insignificant Qt warnings which were printed on OS X are now hidden.
+- Better support for Qt 5.5 and Python 3.5.
+
+Fixed
+~~~~~
+
+- Fixed a bug where cookies were saved despite qutebrowser being started in
+  private browsing mode.
+- The local socket used for inter-process communication (opening new instances)
+  is now ensured to only be accessible by the user on all operating systems.
+- Various corner cases for inter-process communication issues got fixed.
+- `link_pyqt.py` now should work better on untested distributions.
+- Fixed various corner-cases with crashes when reading invalid config values
+  and the history file.
+- Fixed various corner-cases when setting text via an external editor.
+- Fixed potential crash when hinting a text field.
+- Fixed entering of insert mode when certain disabled text fields were clicked.
+- Fixed a crash when using `:set` with `-p` and `!` (invert value)
+- Downloads with unknown size are now handled correctly.
+- `:navigate increment/decrement` (`<Ctrl-A>`/`<Ctrl-X>`) now handles some
+  corner-cases better.
+- Fixed a bug where the completion got affected by another window's completion
+  if it was open in both windows.
+- Fixed a performance issue with large histories when opening previously
+  unvisited websites.
+- The progress bar now doesn't cause the statusbar to change it's height
+  anymore.
+- `~` is now always expanded when spawning a script.
+- Fixed various corner cases when opening links in an existing instance.
+- Fixed a race-condition causing an exception when starting qutebrowser.
+
+Removed
+~~~~~~~
+
+- The `tabs -> indicator-space` setting got removed as the new padding settings
+  should be used instead.
+- The `tabs -> hide-always` and `tabs -> hide-auto` settings got merged into
+  the new `tabs -> show` setting.
+
+v0.3.0
+------
+
+Added
+~~~~~
+
+- New commands `:message-info`, `:message-error` and `:message-warning` to show messages in the statusbar, e.g. from a userscript.
+- New command `:scroll-px` which replaces `:scroll` for pixel-exact scrolling.
+- New command `:jseval` to run a javascript snippet on the current page.
+- New (hidden) command `:follow-selected` (bound to `Enter`/`Ctrl-Enter` by default) to follow the link which is currently selected (e.g. after searching via `/`).
+- New (hidden) command `:clear-keychain` to clear a partially entered keychain (bound to `<Escape>` by default, in addition to clearing search).
+- New setting `ui -> smooth-scrolling`.
+- New setting `content -> webgl` to enable/disable https://www.khronos.org/webgl/[WebGL].
+- New setting `content -> css-regions` to enable/disable support for http://dev.w3.org/csswg/css-regions/[CSS Regions].
+- New setting `content -> hyperlink-auditing` to enable/disable support for https://html.spec.whatwg.org/multipage/semantics.html#hyperlink-auditing[hyperlink auditing].
+- New setting `tabs -> mousewheel-tab-switching` to control mousewheel behavior on the tab bar.
+- New arguments `--datadir` and `--cachedir` to set the data/cache location.
+- New arguments `--basedir` and `--temp-basedir` (intended for debugging) to set a different base directory for all data, which allows multiple invocations.
+- New argument `--no-err-windows` to suppress all error windows.
+- New arguments `--top-navigate` and `--bottom-navigate` (`-t`/`-b`) for `:scroll-page` to specify a navigation action (e.g. automatically go to the next page when arriving at the bottom).
+- New flag `-d`/`--detach` for `:spawn` to detach the spawned process so it's not closed when qutebrowser is.
+- New flag `-v`/`--verbose` for `:spawn` to print informations when the process started/exited successfully.
+- Many new color settings (foreground setting for every background setting).
+- New setting `ui -> modal-js-dialog` to use the standard modal dialogs for javascript questions instead of using the statusbar.
+- New setting `colors -> webpage.bg` to set the background color to use for websites which don't set one.
+- New setting `completion -> auto-open` to only open the completion when tab is pressed (if set to false).
+- New visual/caret mode (bound to `v`) to select text by keyboard.
+- There are now some example userscripts in `misc/userscripts`.
+- Support for Qt 5.5 and tox 2.0
+
+Changed
+~~~~~~~
+
+- *Breaking change for userscripts:* `QUTE_HTML` and `QUTE_TEXT` for userscripts now don't store the contents directly, and instead contain a filename.
+- The `content -> geolocation` and `notifications` settings now support a `true` value to always allow those. However, this is *not recommended*.
+- New bindings `<Ctrl-R>` (rapid), `<Ctrl-F>` (foreground) and `<Ctrl-B>` (background) to switch hint modes while hinting.
+- `<Ctrl-M>` and numpad-enter are now bound by default for bindings where `<Return>` was bound.
+- `:hint tab` and `F` now respect the `background-tabs` setting. To enforce a foreground tab (what `F` did before), use `:hint tab-fg` or `;f`.
+- `:scroll` now takes a direction argument (`up`/`down`/`left`/`right`/`top`/`bottom`/`page-up`/`page-down`) instead of two pixel arguments (`dx`/`dy`). The old form still works but is deprecated.
+- The `ui -> user-stylesheet` setting now also takes file paths relative to the config directory.
+- The `content -> cookies-accept` setting now has new `no-3rdparty` (default) and `no-unknown-3rdparty` values to block third-party cookies. The `default` value got renamed to `all`.
+- Improved startup time by reading the webpage history while qutebrowser is open.
+- The way `:spawn` splits its commandline has been changed slightly to allow commands with flags.
+- The default for the `new-instance-open-target` setting has been changed to `tab`.
+- Sessions now store zoom/scroll-position separately for each entry.
+
+Deprecated
+~~~~~~~~~~
+
+- `:scroll` with two pixel-arguments is now deprecated - `:scroll-px` should be used instead.
+
+Removed
+~~~~~~~
+
+- The `--no-crash-dialog` argument which was intended for debugging only was removed as it's replaced by `--no-err-windows` which suppresses all error windows.
+- Support for Qt installations without SSL support was dropped.
+
+Fixed
+~~~~~
+
+- Scrolling should now work more reliably on some pages where arrow keys worked but `hjkl` didn't.
+- Small improvements when checking if an input is an URL or not.
+- Fixed wrong cursor position when completing the first item in the completion.
+- Fixed exception when using search engines with {foo} in their name.
+- Fixed a bug where the same title was shown for all tabs on some systems.
+- Don't install the scripts package when installing qutebrowser.
+- Fixed searching for terms starting with a hyphen (e.g. `/-foo`)
+- Proxy authentication credentials are now remembered between different tabs.
+- Fixed updating of the tab title on pages without title.
+- Fixed AssertionError when closing many windows quickly.
+- Various fixes for deprecated key bindings and auto-migrations.
+- Workaround for qutebrowser not starting when there are NUL-bytes in the history (because of a currently unknown bug).
+- Fixed handling of keybindings containing Ctrl/Meta on OS X.
+- Fixed crash when downloading an URL without filename (e.g. magnet links) via "Save as...".
+- Fixed exception when starting qutebrowser with `:set` as argument.
+- Fixed horrible completion performance when the `shrink` option was set.
+- Sessions now store zoom/scroll-position correctly.
+
+https://github.com/The-Compiler/qutebrowser/releases/tag/v0.2.1[v0.2.1]
+-----------------------------------------------------------------------
+
+Fixed
+~~~~~
+
+- Added missing manpage (doc/qutebrowser.1.asciidoc) to archive.
+
 https://github.com/The-Compiler/qutebrowser/releases/tag/v0.2.0[v0.2.0]
 -----------------------------------------------------------------------
 
@@ -252,7 +572,7 @@ Removed
 Fixed
 ~~~~~
 
-* Fix rare exception when a key is pressed shorly after opening a window
+* Fix rare exception when a key is pressed shortly after opening a window
 * Fix exception with certain invalid URLs like `http:foo:0`
 * Work around Qt bug which renders checkboxes on OS X unusable
 * Fix exception when a local files can't be read in `:adblock-update`

CONTRIBUTING.asciidoc

@@ -86,14 +86,15 @@ Useful utilities
 Checkers
 ~~~~~~~~
 
-qutbebrowser uses http://tox.readthedocs.org/en/latest/[tox] to run its
+qutebrowser uses http://tox.readthedocs.org/en/latest/[tox] to run its
 unittests and several linters/checkers.
 
 Currently, the following tools will be invoked when you run `tox`:
 
-* Unit tests using the Python
-https://docs.python.org/3.4/library/unittest.html[unittest] framework
-* https://pypi.python.org/pypi/flake8/[flake8]
+* Unit tests using https://www.pytest.org[pytest].
+* https://pypi.python.org/pypi/pyflakes[pyflakes] via https://pypi.python.org/pypi/pytest-flakes[pytest-flakes]
+* https://pypi.python.org/pypi/pep8[pep8] via https://pypi.python.org/pypi/pytest-pep8[pytest-pep8]
+* https://pypi.python.org/pypi/mccabe[mccabe] via https://pypi.python.org/pypi/pytest-mccabe[pytest-mccabe]
 * https://github.com/GreenSteam/pep257/[pep257]
 * http://pylint.org/[pylint]
 * https://pypi.python.org/pypi/pyroma/[pyroma]
@@ -152,7 +153,7 @@ Useful websites
 
 Some resources which might be handy:
 
-* http://qt-project.org/doc/qt-5/classes.html[The Qt5 reference]
+* http://doc.qt.io/qt-5/classes.html[The Qt5 reference]
 * https://docs.python.org/3/library/index.html[The Python reference]
 * http://httpbin.org/[httpbin, a test service for HTTP requests/responses]
 * http://requestb.in/[RequestBin, a service to inspect HTTP requests]
@@ -210,8 +211,7 @@ Other
 Languages] (http://www.rfc-editor.org/errata_search.php?rfc=5646[Errata])
 * http://www.w3.org/TR/CSS2/[Cascading Style Sheets Level 2 Revision 1 (CSS
 2.1) Specification]
-* http://qt-project.org/doc/qt-4.8/stylesheet-reference.html[Qt Style Sheets
-Reference]
+* http://doc.qt.io/qt-5/stylesheet-reference.html[Qt Style Sheets Reference]
 * http://mimesniff.spec.whatwg.org/[MIME Sniffing Standard]
 * http://spec.whatwg.org/[WHATWG specifications]
 * http://www.w3.org/html/wg/drafts/html/master/Overview.html[HTML 5.1 Nightly]
@@ -227,7 +227,7 @@ Hints
 Python and Qt objects
 ~~~~~~~~~~~~~~~~~~~~~
 
-For many tasks, there are solutions in both Qt and the Python standard libary
+For many tasks, there are solutions in both Qt and the Python standard library
 available.
 
 In qutebrowser, the policy is usually using the Python libraries, as they
@@ -237,9 +237,7 @@ There are some exceptions to that:
 
 * `QThread` is used instead of Python threads because it provides signals and
 slots.
-* `QProcess` is used instead of Python's `subprocess` if certain actions (e.g.
-cleanup) when the process finished are desired, as it provides signals for
-that.
+* `QProcess` is used instead of Python's `subprocess`
 * `QUrl` is used instead of storing URLs as string, see the
 <<handling-urls,handling URLs>> section for details.
 
@@ -294,8 +292,8 @@ All objects can be printed by starting with the `--debug` flag and using the
 
 The registry is mainly used for <<commands,command handlers>> but also can be
 useful in places where using Qt's
-http://qt-project.org/doc/qt-5/signalsandslots.html[signals and slots]
-mechanism would be difficult.
+http://doc.qt.io/qt-5/signalsandslots.html[signals and slots] mechanism would
+be difficult.
 
 Logging
 ~~~~~~~
@@ -397,13 +395,12 @@ then automatically checked. Possible values:
       e.g. `('foo', 'bar')` or `(int, 'foo')`.
 * `flag`: The flag to be used, as 1-char string (default: First char of the
 long name).
-* `name`: The long name to be used, as string (default: Name of the parameter).
-* `special`: The string `count` or `win_id` if the parameter should be
-auto-filled (with the count given by the user and the window ID the command was
-executed in, respectively).
 * `nargs`: Gets passed to argparse, see
 https://docs.python.org/dev/library/argparse.html#nargs[its documentation].
 
+The name of an argument will always be the parameter name, with any trailing
+underscores stripped.
+
 [[handling-urls]]
 Handling URLs
 ~~~~~~~~~~~~~
@@ -541,7 +538,7 @@ New Qt release
 
 * Run all tests and check nothing is broken.
 * Check the
-https://bugreports.qt-project.org/issues/?jql=reporter%20%3D%20%22The%20Compiler%22%20ORDER%20BY%20fixVersion%20ASC[Qt bugtracker]
+https://bugreports.qt.io/issues/?jql=reporter%20%3D%20%22The%20Compiler%22%20ORDER%20BY%20fixVersion%20ASC[Qt bugtracker]
 and make sure all bugs marked as resolved are actually fixed.
 * Update own PKGBUILDs based on upstream Archlinux updates and rebuild.
 * Update recommended Qt version in `README`
@@ -551,27 +548,40 @@ workaround.
 https://github.com/The-Compiler/qutebrowser/issues?q=is%3Aopen+is%3Aissue+label%3Aqt[qutebrowser
 bugs] and check if they're fixed.
 
+New PyQt release
+~~~~~~~~~~~~~~~~
+
+* See above
+* Install new PyQt in Windows VM (32- and 64-bit)
+* Download new installer and update PyQt installer path in `ci_install.py`.
+
 qutebrowser release
 ~~~~~~~~~~~~~~~~~~~
 
-* Make sure there are no unstaged changes.
-* Run `src2asciidoc.py` and commit changes if necessary.
-* Run `asciidoc2html.py`.
-* Adjust `__version_info__` in `qutebrowser/__init__.py`.
+* Make sure there are no unstaged changes and the tests are green.
 
-* Run all tests on all supported systems.
-* Test an upgrade from the previous version (no manual intervention).
-* Test an upgrade from the first version (no manual intervention).
+* Adjust `__version_info__` in `qutebrowser/__init__.py`.
+* Remove *(unreleased)* from changelog.
+* Run tests again
+* Run `asciidoc2html.py`.
+* Commit
 
 * Create annotated git tag (`git tag -s "v0.X.Y" -m "Release v0.X.Y"`)
 * If it's a new minor, create git branch `v0.X.x`
-* `git push`; `git push "v0.X.Y"`
+* If committing on minor branch, cherry-pick release commit to master.
+* `git push origin`; `git push origin v0.X.Y`
 * Create release on github
 * Mark the milestone at https://github.com/The-Compiler/qutebrowser/milestones
 as closed.
 
-* Create standalone Windows package (32/64bit) in Windows VM
-* Upload to PyPI: `python setup.py register sdist upload --sign`
-* Upload to qutebrowser.org with checksum/GPG
+* Run `scripts/dev/build_release.py` on Linux to build an sdist
+* Upload to PyPI: `twine upload dist/foo{,.asc}`
+* Create Windows packages via `scripts/dev/build_release.py` and upload.
 
+* Upload to qutebrowser.org with checksum/GPG
+    - On server: `sudo mkdir -p /srv/http/qutebrowser/releases/v0.X.Y/windows`
+    - `rsync -avPh dist/ tonks:`
+    - On server: `sudo mv qutebrowser-0.X.Y.tar.gz* /srv/http/qutebrowser/releases/v0.X.Y`
+
+* Update AUR package
 * Announce to qutebrowser mailinglist

FAQ.asciidoc

@@ -1,11 +1,12 @@
 Frequently asked questions
 ==========================
+:title: Frequently asked questions
 The Compiler <mail@qutebrowser.org>
 
 [qanda]
 What is qutebrowser based on?::
-    qutebrowser uses http://www.python.org/[Python], http://qt-project.org/[Qt]
-    and http://www.riverbankcomputing.com/software/pyqt/intro[PyQt].
+    qutebrowser uses http://www.python.org/[Python], http://qt.io/[Qt] and
+    http://www.riverbankcomputing.com/software/pyqt/intro[PyQt].
 +
 The concept of it is largely inspired by http://portix.bitbucket.org/dwb/[dwb]
 and http://www.vimperator.org/vimperator[Vimperator]. Many actions and
@@ -15,7 +16,7 @@ Why another browser?::
     It might be hard to believe, but I didn't find any browser which I was
     happy with, so I started to write my own. Also, I needed a project to get
     into writing GUI applications with Python and
-    link:http://qt-project.org/[Qt]/link:http://www.riverbankcomputing.com/software/pyqt/intro[PyQt].
+    link:http://qt.io/[Qt]/link:http://www.riverbankcomputing.com/software/pyqt/intro[PyQt].
 +
 Read the next few questions to find out why I was unhappy with existing
 software.
@@ -32,12 +33,11 @@ API] seems to lack basic features like proxy support, and almost no projects
 seem to have started porting to WebKit2 (I only know of
 http://www.uzbl.org/[uzbl]).
 +
-qutebrowser uses http://qt-project.org/[Qt] and
-http://qt-project.org/wiki/QtWebKit[QtWebKit] instead, which suffers from far
-less such crashes. It might switch to
-http://qt-project.org/wiki/QtWebEngine[QtWebEngine] in the future, which is
-based on Google's https://en.wikipedia.org/wiki/Blink_(layout_engine)[Blink]
-rendering engine.
+qutebrowser uses http://qt.io/[Qt] and http://wiki.qt.io/QtWebKit[QtWebKit]
+instead, which suffers from far less such crashes. It might switch to
+http://wiki.qt.io/QtWebEngine[QtWebEngine] in the future, which is based on
+Google's https://en.wikipedia.org/wiki/Blink_(layout_engine)[Blink] rendering
+engine.
 
 What's wrong with https://www.mozilla.org/en-US/firefox/new/[Firefox] and link:http://5digits.org/pentadactyl/[Pentadactyl]/link:http://www.vimperator.org/vimperator[Vimperator]?::
     Firefox likes to break compatibility with addons on each upgrade, gets
@@ -54,14 +54,14 @@ What's wrong with http://www.chromium.org/Home[Chromium] and https://vimium.gith
 
 Why Python?::
     I enjoy writing Python since 2011, which made it one of the possible
-    choices. I wanted to use http://qt-project.org/[Qt] because of
-    http://qt-project.org/wiki/QtWebKit[QtWebKit] so I didn't have
-    http://qt-project.org/wiki/Category:LanguageBindings[many other choices]. I
-    don't like C++ and can't write it very well, so that wasn't an alternative.
+    choices. I wanted to use http://qt.io/[Qt] because of
+    http://wiki.qt.io/QtWebKit[QtWebKit] so I didn't have
+    http://wiki.qt.io/Category:LanguageBindings[many other choices]. I don't
+    like C++ and can't write it very well, so that wasn't an alternative.
 
 But isn't Python too slow for a browser?::
     http://www.infoworld.com/d/application-development/van-rossum-python-not-too-slow-188715[No.]
-    I believe efficency while coding is a lot more important than efficency
+    I believe efficiency while coding is a lot more important than efficiency
     while running. Also, most of the heavy lifting of qutebrowser is done by Qt
     and WebKit in C++, with the
     https://wiki.python.org/moin/GlobalInterpreterLock[GIL] released.
@@ -83,6 +83,20 @@ How do I play Youtube videos with mpv?::
 :bind x spawn mpv {url}
 :bind ;x hint links spawn mpv {hint-url}
 ----
++
+Note that you might need an additional package (e.g.
+https://www.archlinux.org/packages/community/any/youtube-dl/[youtube-dl] on
+Archlinux) to play web videos with mpv.
+
+How do I use qutebrowser with mutt?::
+    Due to a Qt limitation, local files without `.html` extensions are
+    "downloaded" instead of displayed, see
+    https://github.com/The-Compiler/qutebrowser/issues/566[#566]. You can work
+    around this by using this in your `mailcap`:
++
+----
+    text/html; mv %s %s.html && qutebrowser %s.html >/dev/null 2>/dev/null; needsterminal;
+----
 
 == Troubleshooting
 
@@ -100,7 +114,7 @@ Unable to view flash content.::
 Experiencing freezing on sites like duckduckgo and youtube.::
     This issue could be caused by stale plugin files installed by `mozplugger`
     if mozplugger was subsequently removed.
-    Try exiting qutebroser and removing `~/.mozilla/plugins/mozplugger*.so`.
+    Try exiting qutebrowser and removing `~/.mozilla/plugins/mozplugger*.so`.
     See https://github.com/The-Compiler/qutebrowser/issues/357[Issue #357]
     for more details.
 
@@ -112,10 +126,10 @@ Experiencing segfaults (crashes) on Debian systems.::
 
 Segfaults on Facebook, Medium, Amazon, ...::
     If you are on a Debian or Ubuntu based system, you might experience some crashes
-    visting these sites. This is caused by a known bug in Qt which has been
+    visiting these sites. This is caused by various bugs in Qt which have been
     fixed in Qt 5.4. However Debian and Ubuntu are slow to adopt or upgrade
-    some packages. There is currently no easy way to manually upgrade to Qt
-    5.4 on those systems.
+    some packages. On Debian Jessie, it's recommended to use the experimental
+    repos as described in https://github.com/The-Compiler/qutebrowser/blob/master/INSTALL.asciidoc#on-debian--ubuntu[INSTALL].
 +
 Since Ubuntu Trusty (using Qt 5.2.1),
 https://bugreports.qt.io/browse/QTBUG-42417?jql=component%20%3D%20WebKit%20and%20resolution%20%3D%20Done%20and%20fixVersion%20in%20(5.3.0%2C%20%225.3.0%20Alpha%22%2C%20%225.3.0%20Beta1%22%2C%20%225.3.0%20RC1%22%2C%205.3.1%2C%205.3.2%2C%205.4.0%2C%20%225.4.0%20Alpha%22%2C%20%225.4.0%20Beta%22%2C%20%225.4.0%20RC%22)%20and%20priority%20in%20(%22P2%3A%20Important%22%2C%20%22P1%3A%20Critical%22%2C%20%22P0%3A%20Blocker%22)[over

INSTALL.asciidoc

@@ -8,41 +8,86 @@ qutebrowser should run on these systems:
 
 * Debian jessie or newer
 * Ubuntu Trusty (14.04 LTS) or newer
-* Any other distribution based on these (e.g. Linux Mint)
+* Any other distribution based on these (e.g. Linux Mint 17+)
+
+Unfortunately there is no Debian package yet, but installing qutebrowser is
+still relatively easy! If you want to help packaging it for Debian, please
+https://github.com/The-Compiler/qutebrowser/issues/582[get in touch]!
 
 Install the dependencies via apt-get:
 
+[NOTE]
+==========================
+On Debian, it's recommended to install the Qt packages from the
+https://wiki.debian.org/DebianExperimental[experimental] repository as those
+are a much newer version of Qt which is more stable.
+
+Add the following line to your `/etc/apt/sources.list`:
+
 ----
-# apt-get install python3-pyqt5 python3-pyqt5.qtwebkit python-tox
+deb http://ftp.debian.org/debian experimental main
+----
+
+Then install the packages like this:
+
+----
+# apt-get update
+# apt-get install -t experimental python3-pyqt5 python3-pyqt5.qtwebkit python3-sip python3-dev
+# apt-get install python-tox
+----
+
+It's also recommended to pin those packages to receive updates by creating a
+file `/etc/apt/preferences.d/qutebrowser` with the following contents:
+
+----
+Package: python3-pyqt5* libqt5*
+Pin: release a=experimental
+Pin-Priority: 800
+----
+==========================
+
+For distributions other than Debian or if you prefer to not use the
+experimental repo:
+
+----
+# apt-get install python3-pyqt5 python3-pyqt5.qtwebkit python-tox python3-sip python3-dev
 ----
 
 To generate the documentation for the `:help` command, when using the git
 repository (rather than a release):
 
 ----
-# apt-get install asciidoc
+# apt-get install asciidoc source-highlight
 $ python3 scripts/asciidoc2html.py
 ----
 
-Then run tox like this to set up a
-https://docs.python.org/3/library/venv.html[virtual environment]:
+Then <<tox,install qutebrowser via tox>>.
+
+On Fedora
+---------
+
+qutebrowser should run on Fedora 22.
+
+Unfortunately there is no Fedora package yet, but installing qutebrowser is
+still relatively easy! If you want to help packaging it for Fedora, please
+mailto:mail@qutebrowser.org[get in touch]!
+
+Install the dependencies via dnf:
 
 ----
-$ tox -e mkvenv
+# dnf update
+# dnf install python3-qt5 python-tox python3-sip
 ----
 
-This installs all needed Python dependencies in a `.venv` subfolder. The
-system-wide Qt5/PyQt5 installations are symlinked into the virtual environment.
-
-You can then create a simple wrapper script to start qutebrowser somewhere in
-your `$PATH` (e.g. `/usr/local/bin/qutebrowser` or `~/bin/qutebrowser`):
+To generate the documentation for the `:help` command, when using the git
+repository (rather than a release):
 
 ----
-#!/bin/bash
-~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser "$@"
+# dnf install asciidoc source-highlight
+$ python3 scripts/asciidoc2html.py
 ----
 
-Please also read about <<updating,updating qutebrowser with tox>>.
+Then <<tox,install qutebrowser via tox>>.
 
 On Archlinux
 ------------
@@ -51,13 +96,22 @@ There are two Archlinux packages available in the AUR:
 https://aur.archlinux.org/packages/qutebrowser/[qutebrowser] and
 https://aur.archlinux.org/packages/qutebrowser-git/[qutebrowser-git].
 
-You can install them like this:
+You can install them (and the needed pypeg2 dependency) like this:
 
 ----
-$ mkdir qutebrowser
-$ cd qutebrowser
-$ wget https://aur.archlinux.org/packages/qu/qutebrowser-git/PKGBUILD
+$ wget https://aur.archlinux.org/packages/py/python-pypeg2/python-pypeg2.tar.gz
+$ tar xzf python-pypeg2.tar.gz
+$ cd python-pypeg2
 $ makepkg -si
+$ cd ..
+$ rm -r python-pypeg2 python-pypeg2.tar.gz
+
+$ wget https://aur.archlinux.org/packages/qu/qutebrowser/qutebrowser.tar.gz
+$ tar xzf qutebrowser.tar.gz
+$ cd qutebrowser
+$ makepkg -si
+$ cd ..
+$ rm -r qutebrowser qutebrowser.tar.gz
 ----
 
 or you could use an AUR helper, e.g. `yaourt -S qutebrowser-git`.
@@ -65,23 +119,16 @@ or you could use an AUR helper, e.g. `yaourt -S qutebrowser-git`.
 On Gentoo
 ---------
 
-A dedicated overlay is available on
-https://github.com/posativ/qutebrowser-overlay[GitHub]. To install it, add the
-overlay with http://wiki.gentoo.org/wiki/Layman[layman]:
-
-----
-# layman -a qutebrowser
-----
-
-Note, that Qt5 is available in the portage tree, but masked. You may need to do
-a lot of keywording to install qutebrowser. Also make sure you have `python3_4`
-in your `PYTHON_TARGETS` (`/etc/portage/make.conf`) and rebuild your system
-(`emerge -uDNav @world`). Afterwards, you can install qutebrowser:
+qutebrowser is available in the main repository and can be installed with:
 
 ----
 # emerge -av qutebrowser
 ----
 
+Make sure you have `python3_4` in your `PYTHON_TARGETS`
+(`/etc/portage/make.conf`) and rebuild your system (`emerge -uDNav @world`) if
+necessary.
+
 On Void Linux
 -------------
 
@@ -92,6 +139,16 @@ with:
 # xbps-install qutebrowser
 ----
 
+On NixOS
+--------
+
+Nixpkgs collection contains `pkgs.qutebrowser` since June 2015. You can install
+it with:
+
+----
+$ nix-env -i qutebrowser
+----
+
 On Windows
 ----------
 
@@ -111,17 +168,7 @@ https://pip.pypa.io/en/latest/[pip]:
 $ pip install tox
 ----
 
-Then run tox like this to set up a
-https://docs.python.org/3/library/venv.html[virtual environment]:
-
-----
-$ tox -e mkvenv
-----
-
-This installs all needed Python dependencies in a `.venv` subfolder. The
-system-wide Qt5/PyQt5 installations are used in the virtual environment.
-
-Please also read about <<updating,updating qutebrowser with tox>>.
+Then <<tox,install qutebrowser via tox>>.
 
 On OS X
 -------
@@ -157,9 +204,30 @@ standard location for your distro (`/usr/share/applications` and
 The normal `setup.py install` doesn't install these files, so you'll have to do
 it as part of the packaging process.
 
-[[updating]]
-Updating qutebrowser with tox
------------------------------
+[[tox]]
+Installing qutebrowser with tox
+-------------------------------
+
+Run tox inside the qutebrowser repository to set up a
+https://docs.python.org/3/library/venv.html[virtual environment]:
+
+----
+$ tox -e mkvenv
+----
+
+This installs all needed Python dependencies in a `.venv` subfolder. The
+system-wide Qt5/PyQt5 installations are symlinked into the virtual environment.
+
+You can then create a simple wrapper script to start qutebrowser somewhere in
+your `$PATH` (e.g. `/usr/local/bin/qutebrowser` or `~/bin/qutebrowser`):
+
+----
+#!/bin/bash
+~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser "$@"
+----
+
+Updating
+~~~~~~~~
 
 When you updated your local copy of the code (e.g. by pulling the git repo, or
 extracting a new version), the virtualenv should automatically use the updated

MANIFEST.in

@@ -1,31 +1,37 @@
-global-exclude __pycache__ *.pyc *.pyo
-
-recursive-include qutebrowser/html *.html
-recursive-include qutebrowser/test *.py
-graft icons
-graft scripts/pylint_checkers
-graft doc/img
-graft misc
-include qutebrowser/utils/testfile
-include qutebrowser/git-commit-id
-include COPYING doc/* README.asciidoc CONTRIBUTING.asciidoc FAQ.asciidoc INSTALL.asciidoc CHANGELOG.asciidoc
-include qutebrowser.desktop
-include requirements.txt
-include tox.ini
-include qutebrowser.py
-
-exclude scripts/cleanup.py
-exclude scripts/minimal_webkit_testbrowser.py
-exclude scripts/run_profile.py
-exclude scripts/src2asciidoc.sh
-exclude scripts/gen_resources.sh
-exclude scripts/quit_segfault_test.sh
-exclude scripts/segfault_test.sh
-exclude doc/notes
-recursive-exclude doc *.asciidoc
-prune tests
-exclude qutebrowser.rcc
-exclude .coveragerc
-exclude .flake8
-exclude .pylintrc
-exclude doc/help
+recursive-include qutebrowser *.py
+recursive-include qutebrowser/html *.html
+recursive-include qutebrowser/img *.svg *.png
+recursive-include qutebrowser/test *.py
+recursive-include qutebrowser/javascript *.js
+graft qutebrowser/3rdparty
+graft icons
+graft doc/img
+graft misc
+recursive-include scripts *.py
+include qutebrowser/utils/testfile
+include qutebrowser/git-commit-id
+include COPYING doc/* README.asciidoc CONTRIBUTING.asciidoc FAQ.asciidoc INSTALL.asciidoc CHANGELOG.asciidoc
+include qutebrowser.desktop
+include requirements.txt
+include tox.ini
+include qutebrowser.py
+
+prune www
+prune scripts/dev
+exclude scripts/asciidoc2html.py
+exclude doc/notes
+recursive-exclude doc *.asciidoc
+include doc/qutebrowser.1.asciidoc
+prune tests
+exclude pytest.ini
+exclude qutebrowser.rcc
+exclude .coveragerc
+exclude .pylintrc
+exclude .eslintrc
+exclude .eslintignore
+exclude doc/help
+exclude .appveyor.yml
+exclude .travis.yml
+exclude misc/appveyor_install.py
+
+global-exclude __pycache__ *.pyc *.pyo

README.asciidoc

@@ -6,15 +6,18 @@
 qutebrowser
 ===========
 
+// QUTE_WEB_HIDE
 image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit.*
 
 image:https://img.shields.io/pypi/l/qutebrowser.svg?style=flat["license badge",link="https://github.com/The-Compiler/qutebrowser/blob/master/COPYING"]
 image:https://img.shields.io/pypi/v/qutebrowser.svg?style=flat["version badge",link="https://pypi.python.org/pypi/qutebrowser/"]
-image:https://img.shields.io/github/issues/The-Compiler/qutebrowser.svg?style=flat["issues badge",link="https://github.com/The-Compiler/qutebrowser/issues"]
 image:https://requires.io/github/The-Compiler/qutebrowser/requirements.svg?branch=master["requirements badge",link="https://requires.io/github/The-Compiler/qutebrowser/requirements/?branch=master"]
-image:http://qutebrowser.org:8010/png?builder=archlinux["build badge",link="http://qutebrowser.org:8010/waterfall"]
+image:https://travis-ci.org/The-Compiler/qutebrowser.svg?branch=master["Build Status", link="https://travis-ci.org/The-Compiler/qutebrowser"]
+image:https://ci.appveyor.com/api/projects/status/9gmnuip6i1oq7046?svg=true["AppVeyor build status", link="https://ci.appveyor.com/project/The-Compiler/qutebrowser"]
+image:https://codecov.io/github/The-Compiler/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/The-Compiler/qutebrowser?branch=master"]
+// QUTE_WEB_HIDE_END
 
-qutebrowser is a keyboard-focused browser with with a minimal GUI. It's based
+qutebrowser is a keyboard-focused browser with a minimal GUI. It's based
 on Python, PyQt5 and QtWebKit and free software, licensed under the GPL.
 
 It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl.
@@ -68,7 +71,7 @@ Contributions / Bugs
 --------------------
 
 You want to contribute to qutebrowser? Awesome! Please read
-link:doc/CONTRIBUTING.asciidoc[the contribution guidelines] for details and
+link:CONTRIBUTING.asciidoc[the contribution guidelines] for details and
 useful hints.
 
 If you found a bug or have a feature request, you can report it in several
@@ -88,17 +91,21 @@ Requirements
 
 The following software and libraries are required to run qutebrowser:
 
-* http://www.python.org/[Python] 3.4
-* http://qt-project.org/[Qt] 5.2.0 or newer (5.4.1 recommended)
+* http://www.python.org/[Python] 3.4 or newer
+* http://qt.io/[Qt] 5.2.0 or newer (5.5.1 recommended)
 * QtWebKit
 * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2.0 or newer
-(5.4.1 recommended) for Python 3
+(5.5.1 recommended) for Python 3
 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
 * http://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
 * http://pygments.org/[pygments]
 * http://pyyaml.org/wiki/PyYAML[PyYAML]
 
+The following libraries are optional and provide a better user experience:
+
+* http://cthedot.de/cssutils/[cssutils]
+
 To generate the documentation for the `:help` command, when using the git
 repository (rather than a release), http://asciidoc.org/[asciidoc] is needed.
 
@@ -134,34 +141,65 @@ Contributors, sorted by the number of commits in descending order:
 
 // QUTE_AUTHORS_START
 * Florian Bruhin
+* Daniel Schadt
+* Antoni Boucher
+* Lamar Pavel
 * Bruno Oliveira
-* Joel Torstensson
+* Alexander Cogneau
+* Martin Tournoij
 * Raphael Pierzina
+* Joel Torstensson
 * Claude
-* ZDarian
-* Peter Vilim
-* John ShaggyTwoDope Jenkins
-* Jimmy
-* rikn00
+* meles5
 * Patric Schmitz
+* Artur Shaik
+* Nathan Isom
+* Austin Anderson
+* Thorsten Wißmann
+* Alexey "Averrin" Nabrodov
+* ZDarian
+* John ShaggyTwoDope Jenkins
+* Peter Vilim
+* Jonas Schürmann
+* Panagiotis Ktistakis
+* Jimmy
+* skinnay
+* error800
+* Zach-Button
+* Halfwit
+* Felix Van der Jeugt
+* rikn00
 * Martin Zimmermann
-* Error 800
 * Brian Jackson
 * sbinix
+* neeasade
+* jnphilipp
+* Tobias Patzl
+* Peter Michely
+* Larry Hynes
 * Johannes Altmanninger
 * Samir Benmendil
 * Regina Hug
 * Mathias Fussenegger
-* Larry Hynes
-* error800
-* Thorsten Wißmann
+* Fritz V155 Reichwald
+* Franz Fellner
+* Corentin Jule
+* zwarag
+* xd1le
+* dylan araps
+* Tim Harder
 * Thiago Barroso Perrotta
+* Samuel Loury
 * Matthias Lisin
+* Marcel Schilling
+* Jean-Christophe Petkovich
 * Helen Sherwood-Taylor
 * HalosGhost
 * Gregor Pohl
-* Franz Fellner
 * Eivind Uggedal
+* Daniel Lu
+* Arseniy Seroka
+* Andy Balaam
 * Andreas Fischer
 // QUTE_AUTHORS_END
 
@@ -170,8 +208,8 @@ The following people have contributed graphics:
 * WOFall (icon)
 * regines (key binding cheatsheet)
 
-Thanks / Similiar projects
---------------------------
+Thanks / Similar projects
+-------------------------
 
 Many projects with a similar goal as qutebrowser exist:
 
@@ -214,7 +252,7 @@ Also, thanks to:
 
 * Everyone who had the patience to test qutebrowser before v0.1.
 * Everyone triaging/fixing my bugs in the
-https://bugreports.qt-project.org/secure/Dashboard.jspa[Qt bugtracker]
+https://bugreports.qt.io/secure/Dashboard.jspa[Qt bugtracker]
 * Everyone answering my questions on http://stackoverflow.com/[Stack Overflow]
 and in IRC.
 * All the projects which were a great help while developing qutebrowser.
@@ -234,3 +272,14 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pdf.js
+------
+
+qutebrowser optionally uses https://github.com/mozilla/pdf.js/[pdf.js] to
+display PDF files in the browser. Windows releases come with a bundled pdf.js.
+
+pdf.js is distributed under the terms of the Apache License. You can
+find a copy of the license in `qutebrowser/3rdparty/pdfjs/LICENSE` (in the
+Windows release or after running `scripts/dev/update_3rdparty.py`), or online
+http://www.apache.org/licenses/LICENSE-2.0.html[here].

doc/help/commands.asciidoc

@@ -8,18 +8,25 @@
 |<<adblock-update,adblock-update>>|Update the adblock block lists.
 |<<back,back>>|Go back in the history of the current tab.
 |<<bind,bind>>|Bind a key to a command.
+|<<bookmark-add,bookmark-add>>|Save the current page as a bookmark.
+|<<bookmark-del,bookmark-del>>|Delete a bookmark.
+|<<bookmark-load,bookmark-load>>|Load a bookmark.
 |<<close,close>>|Close the current window.
 |<<download,download>>|Download a given URL, or current page if no URL given.
 |<<download-cancel,download-cancel>>|Cancel the last/[count]th download.
+|<<download-clear,download-clear>>|Remove all finished downloads from the list.
 |<<download-delete,download-delete>>|Delete the last/[count]th download from disk.
 |<<download-open,download-open>>|Open the last/[count]th download.
 |<<download-remove,download-remove>>|Remove the last/[count]th download from the list.
+|<<download-retry,download-retry>>|Retry the first failed/[count]th download.
+|<<fake-key,fake-key>>|Send a fake keypress or key string to the website or qutebrowser.
 |<<forward,forward>>|Go forward in the history of the current tab.
 |<<fullscreen,fullscreen>>|Toggle fullscreen mode.
 |<<help,help>>|Show help about a command or setting.
 |<<hint,hint>>|Start hinting.
 |<<home,home>>|Open main startpage in current tab.
 |<<inspector,inspector>>|Toggle the web inspector.
+|<<jseval,jseval>>|Evaluate a JavaScript string.
 |<<later,later>>|Execute a command after some time.
 |<<navigate,navigate>>|Open typical prev/next links or navigate using the URL path.
 |<<open,open>>|Open a URL in the current/[count]th tab.
@@ -56,6 +63,7 @@
 |<<view-source,view-source>>|Show the source of the current page.
 |<<wq,wq>>|Save open pages and quit.
 |<<yank,yank>>|Yank the current URL/title to the clipboard or primary selection.
+|<<yank-selected,yank-selected>>|Yank the selected text to the clipboard or primary selection.
 |<<zoom,zoom>>|Set the zoom level for the current tab.
 |<<zoom-in,zoom-in>>|Increase the zoom level for the current tab.
 |<<zoom-out,zoom-out>>|Decrease the zoom level for the current tab.
@@ -97,19 +105,59 @@ Bind a key to a command.
 * This command does not split arguments after the last argument and handles quotes literally.
 * With this command, +;;+ is interpreted literally instead of splitting off a second command.
 
+[[bookmark-add]]
+=== bookmark-add
+Save the current page as a bookmark.
+
+[[bookmark-del]]
+=== bookmark-del
+Syntax: +:bookmark-del 'url'+
+
+Delete a bookmark.
+
+==== positional arguments
+* +'url'+: The URL of the bookmark to delete.
+
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+* With this command, +;;+ is interpreted literally instead of splitting off a second command.
+
+[[bookmark-load]]
+=== bookmark-load
+Syntax: +:bookmark-load [*--tab*] [*--bg*] [*--window*] 'url'+
+
+Load a bookmark.
+
+==== positional arguments
+* +'url'+: The url of the bookmark to load.
+
+==== optional arguments
+* +*-t*+, +*--tab*+: Load the bookmark in a new tab.
+* +*-b*+, +*--bg*+: Load the bookmark in a new background tab.
+* +*-w*+, +*--window*+: Load the bookmark in a new window.
+
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+* With this command, +;;+ is interpreted literally instead of splitting off a second command.
+
 [[close]]
 === close
 Close the current window.
 
 [[download]]
 === download
-Syntax: +:download ['url'] ['dest']+
+Syntax: +:download [*--mhtml*] [*--dest* 'DEST'] ['url'] ['dest-old']+
 
 Download a given URL, or current page if no URL given.
 
+The form `:download [url] [dest]` is deprecated, use `:download --dest [dest] [url]` instead.
+
 ==== positional arguments
 * +'url'+: The URL to download. If not given, download the current page.
-* +'dest'+: The file path to write the download to, or not given to ask.
+
+==== optional arguments
+* +*-m*+, +*--mhtml*+: Download the current page and all assets as mhtml file.
+* +*-d*+, +*--dest*+: The file path to write the download to, or not given to ask.
 
 [[download-cancel]]
 === download-cancel
@@ -118,6 +166,10 @@ Cancel the last/[count]th download.
 ==== count
 The index of the download to cancel.
 
+[[download-clear]]
+=== download-clear
+Remove all finished downloads from the list.
+
 [[download-delete]]
 === download-delete
 Delete the last/[count]th download from disk.
@@ -139,11 +191,32 @@ Syntax: +:download-remove [*--all*]+
 Remove the last/[count]th download from the list.
 
 ==== optional arguments
-* +*-a*+, +*--all*+: If given removes all finished downloads.
+* +*-a*+, +*--all*+: Deprecated argument for removing all finished downloads.
 
 ==== count
 The index of the download to cancel.
 
+[[download-retry]]
+=== download-retry
+Retry the first failed/[count]th download.
+
+==== count
+The index of the download to cancel.
+
+[[fake-key]]
+=== fake-key
+Syntax: +:fake-key [*--global*] 'keystring'+
+
+Send a fake keypress or key string to the website or qutebrowser.
+
+:fake-key xy - sends the keychain 'xy' :fake-key <Ctrl-x> - sends Ctrl-x :fake-key <Escape> - sends the escape key
+
+==== positional arguments
+* +'keystring'+: The keystring to send.
+
+==== optional arguments
+* +*-g*+, +*--global*+: If given, the keys are sent to the qutebrowser UI.
+
 [[forward]]
 === forward
 Syntax: +:forward [*--tab*] [*--bg*] [*--window*]+
@@ -198,7 +271,9 @@ Start hinting.
 * +'target'+: What to do with the selected element. 
 
  - `normal`: Open the link in the current tab.
- - `tab`: Open the link in a new tab.
+ - `tab`: Open the link in a new tab (honoring the
+ background-tabs setting).
+ - `tab-fg`: Open the link in a new foreground tab.
  - `tab-bg`: Open the link in a new background tab.
  - `window`: Open the link in a new window.
  - `hover` : Hover over the link.
@@ -208,7 +283,7 @@ Start hinting.
  - `fill`: Fill the commandline with the command given as
  argument.
  - `download`: Download the link.
- - `userscript`: Call an userscript with `$QUTE_URL` set to the
+ - `userscript`: Call a userscript with `$QUTE_URL` set to the
  link.
  - `spawn`: Spawn a command.
  
@@ -219,7 +294,11 @@ Start hinting.
  - With `spawn`: The executable and arguments to spawn.
  `{hint-url}` will get replaced by the selected
  URL.
- - With `userscript`: The userscript to execute.
+ - With `userscript`: The userscript to execute. Either store
+ the userscript in
+ `~/.local/share/qutebrowser/userscripts`
+ (or `$XDG_DATA_DIR`), or use an absolute
+ path.
  - With `fill`: The command to fill the statusbar with.
  `{hint-url}` will get replaced by the selected
  URL.
@@ -227,8 +306,8 @@ Start hinting.
 
 
 ==== optional arguments
-* +*-r*+, +*--rapid*+: Whether to do rapid hinting. This is only possible with targets `tab-bg`, `window`, `run`, `hover`, `userscript` and
- `spawn`.
+* +*-r*+, +*--rapid*+: Whether to do rapid hinting. This is only possible with targets `tab` (with background-tabs=true), `tab-bg`,
+ `window`, `run`, `hover`, `userscript` and `spawn`.
 
 
 [[home]]
@@ -239,6 +318,24 @@ Open main startpage in current tab.
 === inspector
 Toggle the web inspector.
 
+Note: Due a bug in Qt, the inspector will show incorrect request headers in the network tab.
+
+[[jseval]]
+=== jseval
+Syntax: +:jseval [*--quiet*] 'js-code'+
+
+Evaluate a JavaScript string.
+
+==== positional arguments
+* +'js-code'+: The string to evaluate.
+
+==== optional arguments
+* +*-q*+, +*--quiet*+: Don't show resulting JS object.
+
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+* With this command, +;;+ is interpreted literally instead of splitting off a second command.
+
 [[later]]
 === later
 Syntax: +:later 'ms' 'command'+
@@ -494,7 +591,7 @@ If the option name ends with '?', the value of the option is shown instead. If t
 
 [[set-cmd-text]]
 === set-cmd-text
-Syntax: +:set-cmd-text [*--space*] 'text'+
+Syntax: +:set-cmd-text [*--space*] [*--append*] 'text'+
 
 Preset the statusbar to some text.
 
@@ -503,6 +600,7 @@ Preset the statusbar to some text.
 
 ==== optional arguments
 * +*-s*+, +*--space*+: If given, a space is added to the end.
+* +*-a*+, +*--append*+: If given, the text is appended to the current text.
 
 ==== note
 * This command does not split arguments after the last argument and handles quotes literally.
@@ -510,17 +608,25 @@ Preset the statusbar to some text.
 
 [[spawn]]
 === spawn
-Syntax: +:spawn [*--userscript*] 'args' ['args' ...]+
+Syntax: +:spawn [*--userscript*] [*--verbose*] [*--detach*] 'cmdline'+
 
 Spawn a command in a shell.
 
 Note the {url} variable which gets replaced by the current URL might be useful here.
 
 ==== positional arguments
-* +'args'+: The commandline to execute.
+* +'cmdline'+: The commandline to execute.
 
 ==== optional arguments
-* +*-u*+, +*--userscript*+: Run the command as an userscript.
+* +*-u*+, +*--userscript*+: Run the command as a userscript. Either store the userscript in `~/.local/share/qutebrowser/userscripts`
+ (or `$XDG_DATA_DIR`), or use an absolute path.
+
+* +*-v*+, +*--verbose*+: Show notifications when the command started/exited.
+* +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser.
+
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+* With this command, +;;+ is interpreted literally instead of splitting off a second command.
 
 [[stop]]
 === stop
@@ -564,6 +670,8 @@ Syntax: +:tab-focus ['index']+
 
 Select the tab given as argument/[count].
 
+If neither count nor index are given, it behaves like tab-next.
+
 ==== positional arguments
 * +'index'+: The tab index to focus, starting with 1. The special value `last` focuses the last focused tab.
 
@@ -639,13 +747,24 @@ Save open pages and quit.
 
 [[yank]]
 === yank
-Syntax: +:yank [*--title*] [*--sel*]+
+Syntax: +:yank [*--title*] [*--sel*] [*--domain*]+
 
 Yank the current URL/title to the clipboard or primary selection.
 
 ==== optional arguments
 * +*-t*+, +*--title*+: Yank the title instead of the URL.
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
+* +*-d*+, +*--domain*+: Yank only the scheme, domain, and port number.
+
+[[yank-selected]]
+=== yank-selected
+Syntax: +:yank-selected [*--sel*] [*--keep*]+
+
+Yank the selected text to the clipboard or primary selection.
+
+==== optional arguments
+* +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
+* +*-k*+, +*--keep*+: If given, stay in visual mode after yanking.
 
 [[zoom]]
 === zoom
@@ -681,14 +800,36 @@ How many steps to zoom out.
 [options="header",width="75%",cols="25%,75%"]
 |==============
 |Command|Description
+|<<clear-keychain,clear-keychain>>|Clear the currently entered key chain.
 |<<command-accept,command-accept>>|Execute the command currently in the commandline.
 |<<command-history-next,command-history-next>>|Go forward in the commandline history.
 |<<command-history-prev,command-history-prev>>|Go back in the commandline history.
+|<<completion-item-del,completion-item-del>>|Delete the current completion item.
 |<<completion-item-next,completion-item-next>>|Select the next completion item.
 |<<completion-item-prev,completion-item-prev>>|Select the previous completion item.
+|<<drop-selection,drop-selection>>|Drop selection and keep selection mode enabled.
 |<<enter-mode,enter-mode>>|Enter a key mode.
-|<<follow-hint,follow-hint>>|Follow the currently selected hint.
+|<<follow-hint,follow-hint>>|Follow a hint.
+|<<follow-selected,follow-selected>>|Follow the selected text.
 |<<leave-mode,leave-mode>>|Leave the mode we're currently in.
+|<<message-error,message-error>>|Show an error message in the statusbar.
+|<<message-info,message-info>>|Show an info message in the statusbar.
+|<<message-warning,message-warning>>|Show a warning message in the statusbar.
+|<<move-to-end-of-document,move-to-end-of-document>>|Move the cursor or selection to the end of the document.
+|<<move-to-end-of-line,move-to-end-of-line>>|Move the cursor or selection to the end of line.
+|<<move-to-end-of-next-block,move-to-end-of-next-block>>|Move the cursor or selection to the end of next block.
+|<<move-to-end-of-prev-block,move-to-end-of-prev-block>>|Move the cursor or selection to the end of previous block.
+|<<move-to-end-of-word,move-to-end-of-word>>|Move the cursor or selection to the end of the word.
+|<<move-to-next-char,move-to-next-char>>|Move the cursor or selection to the next char.
+|<<move-to-next-line,move-to-next-line>>|Move the cursor or selection to the next line.
+|<<move-to-next-word,move-to-next-word>>|Move the cursor or selection to the next word.
+|<<move-to-prev-char,move-to-prev-char>>|Move the cursor or selection to the previous char.
+|<<move-to-prev-line,move-to-prev-line>>|Move the cursor or selection to the prev line.
+|<<move-to-prev-word,move-to-prev-word>>|Move the cursor or selection to the previous word.
+|<<move-to-start-of-document,move-to-start-of-document>>|Move the cursor or selection to the start of the document.
+|<<move-to-start-of-line,move-to-start-of-line>>|Move the cursor or selection to the start of the line.
+|<<move-to-start-of-next-block,move-to-start-of-next-block>>|Move the cursor or selection to the start of next block.
+|<<move-to-start-of-prev-block,move-to-start-of-prev-block>>|Move the cursor or selection to the start of previous block.
 |<<open-editor,open-editor>>|Open an external editor with the currently selected form field.
 |<<prompt-accept,prompt-accept>>|Accept the current prompt.
 |<<prompt-no,prompt-no>>|Answer no to a yes/no prompt.
@@ -706,12 +847,18 @@ How many steps to zoom out.
 |<<rl-unix-line-discard,rl-unix-line-discard>>|Remove chars backward from the cursor to the beginning of the line.
 |<<rl-unix-word-rubout,rl-unix-word-rubout>>|Remove chars from the cursor to the beginning of the word.
 |<<rl-yank,rl-yank>>|Paste the most recently deleted text.
-|<<scroll,scroll>>|Scroll the current tab by 'count * dx/dy'.
+|<<scroll,scroll>>|Scroll the current tab in the given direction.
 |<<scroll-page,scroll-page>>|Scroll the frame page-wise.
 |<<scroll-perc,scroll-perc>>|Scroll to a specific percentage of the page.
+|<<scroll-px,scroll-px>>|Scroll the current tab by 'count * dx/dy' pixels.
 |<<search-next,search-next>>|Continue the search to the ([count]th) next term.
 |<<search-prev,search-prev>>|Continue the search to the ([count]th) previous term.
+|<<toggle-selection,toggle-selection>>|Toggle caret selection mode.
 |==============
+[[clear-keychain]]
+=== clear-keychain
+Clear the currently entered key chain.
+
 [[command-accept]]
 === command-accept
 Execute the command currently in the commandline.
@@ -724,6 +871,10 @@ Go forward in the commandline history.
 === command-history-prev
 Go back in the commandline history.
 
+[[completion-item-del]]
+=== completion-item-del
+Delete the current completion item.
+
 [[completion-item-next]]
 === completion-item-next
 Select the next completion item.
@@ -732,6 +883,10 @@ Select the next completion item.
 === completion-item-prev
 Select the previous completion item.
 
+[[drop-selection]]
+=== drop-selection
+Drop selection and keep selection mode enabled.
+
 [[enter-mode]]
 === enter-mode
 Syntax: +:enter-mode 'mode'+
@@ -743,12 +898,146 @@ Enter a key mode.
 
 [[follow-hint]]
 === follow-hint
-Follow the currently selected hint.
+Syntax: +:follow-hint ['keystring']+
+
+Follow a hint.
+
+==== positional arguments
+* +'keystring'+: The hint to follow.
+
+[[follow-selected]]
+=== follow-selected
+Syntax: +:follow-selected [*--tab*]+
+
+Follow the selected text.
+
+==== optional arguments
+* +*-t*+, +*--tab*+: Load the selected link in a new tab.
 
 [[leave-mode]]
 === leave-mode
 Leave the mode we're currently in.
 
+[[message-error]]
+=== message-error
+Syntax: +:message-error 'text'+
+
+Show an error message in the statusbar.
+
+==== positional arguments
+* +'text'+: The text to show.
+
+[[message-info]]
+=== message-info
+Syntax: +:message-info 'text'+
+
+Show an info message in the statusbar.
+
+==== positional arguments
+* +'text'+: The text to show.
+
+[[message-warning]]
+=== message-warning
+Syntax: +:message-warning 'text'+
+
+Show a warning message in the statusbar.
+
+==== positional arguments
+* +'text'+: The text to show.
+
+[[move-to-end-of-document]]
+=== move-to-end-of-document
+Move the cursor or selection to the end of the document.
+
+[[move-to-end-of-line]]
+=== move-to-end-of-line
+Move the cursor or selection to the end of line.
+
+[[move-to-end-of-next-block]]
+=== move-to-end-of-next-block
+Move the cursor or selection to the end of next block.
+
+==== count
+How many blocks to move.
+
+[[move-to-end-of-prev-block]]
+=== move-to-end-of-prev-block
+Move the cursor or selection to the end of previous block.
+
+==== count
+How many blocks to move.
+
+[[move-to-end-of-word]]
+=== move-to-end-of-word
+Move the cursor or selection to the end of the word.
+
+==== count
+How many words to move.
+
+[[move-to-next-char]]
+=== move-to-next-char
+Move the cursor or selection to the next char.
+
+==== count
+How many lines to move.
+
+[[move-to-next-line]]
+=== move-to-next-line
+Move the cursor or selection to the next line.
+
+==== count
+How many lines to move.
+
+[[move-to-next-word]]
+=== move-to-next-word
+Move the cursor or selection to the next word.
+
+==== count
+How many words to move.
+
+[[move-to-prev-char]]
+=== move-to-prev-char
+Move the cursor or selection to the previous char.
+
+==== count
+How many chars to move.
+
+[[move-to-prev-line]]
+=== move-to-prev-line
+Move the cursor or selection to the prev line.
+
+==== count
+How many lines to move.
+
+[[move-to-prev-word]]
+=== move-to-prev-word
+Move the cursor or selection to the previous word.
+
+==== count
+How many words to move.
+
+[[move-to-start-of-document]]
+=== move-to-start-of-document
+Move the cursor or selection to the start of the document.
+
+[[move-to-start-of-line]]
+=== move-to-start-of-line
+Move the cursor or selection to the start of the line.
+
+[[move-to-start-of-next-block]]
+=== move-to-start-of-next-block
+Move the cursor or selection to the start of next block.
+
+==== count
+How many blocks to move.
+
+[[move-to-start-of-prev-block]]
+=== move-to-start-of-prev-block
+Move the cursor or selection to the start of previous block.
+
+==== count
+How many blocks to move.
+
 [[open-editor]]
 === open-editor
 Open an external editor with the currently selected form field.
@@ -847,20 +1136,20 @@ This acts like readline's yank.
 
 [[scroll]]
 === scroll
-Syntax: +:scroll 'dx' 'dy'+
+Syntax: +:scroll 'direction'+
 
-Scroll the current tab by 'count * dx/dy'.
+Scroll the current tab in the given direction.
 
 ==== positional arguments
-* +'dx'+: How much to scroll in x-direction.
-* +'dy'+: How much to scroll in x-direction.
+* +'direction'+: In which direction to scroll (up/down/left/right/top/bottom).
+
 
 ==== count
 multiplier
 
 [[scroll-page]]
 === scroll-page
-Syntax: +:scroll-page 'x' 'y'+
+Syntax: +:scroll-page [*--top-navigate* 'ACTION'] [*--bottom-navigate* 'ACTION'] 'x' 'y'+
 
 Scroll the frame page-wise.
 
@@ -868,6 +1157,12 @@ Scroll the frame page-wise.
 * +'x'+: How many pages to scroll to the right.
 * +'y'+: How many pages to scroll down.
 
+==== optional arguments
+* +*-t*+, +*--top-navigate*+: :navigate action (prev, decrement) to run when scrolling up at the top of the page.
+
+* +*-b*+, +*--bottom-navigate*+: :navigate action (next, increment) to run when scrolling down at the bottom of the page.
+
+
 ==== count
 multiplier
 
@@ -888,6 +1183,19 @@ The percentage can be given either as argument or as count. If no percentage is
 ==== count
 Percentage to scroll.
 
+[[scroll-px]]
+=== scroll-px
+Syntax: +:scroll-px 'dx' 'dy'+
+
+Scroll the current tab by 'count * dx/dy' pixels.
+
+==== positional arguments
+* +'dx'+: How much to scroll in x-direction.
+* +'dy'+: How much to scroll in x-direction.
+
+==== count
+multiplier
+
 [[search-next]]
 === search-next
 Continue the search to the ([count]th) next term.
@@ -902,6 +1210,10 @@ Continue the search to the ([count]th) previous term.
 ==== count
 How many elements to ignore.
 
+[[toggle-selection]]
+=== toggle-selection
+Toggle caret selection mode.
+
 
 == Debugging commands
 These commands are mainly intended for debugging. They are hidden if qutebrowser was started without the `--debug`-flag.
@@ -914,8 +1226,10 @@ These commands are mainly intended for debugging. They are hidden if qutebrowser
 |<<debug-cache-stats,debug-cache-stats>>|Print LRU cache stats.
 |<<debug-console,debug-console>>|Show the debugging console.
 |<<debug-crash,debug-crash>>|Crash for debugging purposes.
+|<<debug-dump-page,debug-dump-page>>|Dump the current page's content to a file.
 |<<debug-pyeval,debug-pyeval>>|Evaluate a python string and display the results as a web page.
 |<<debug-trace,debug-trace>>|Trace executed code via hunter.
+|<<debug-webaction,debug-webaction>>|Execute a webaction.
 |==============
 [[debug-all-objects]]
 === debug-all-objects
@@ -938,6 +1252,18 @@ Crash for debugging purposes.
 ==== positional arguments
 * +'typ'+: either 'exception' or 'segfault'.
 
+[[debug-dump-page]]
+=== debug-dump-page
+Syntax: +:debug-dump-page [*--plain*] 'dest'+
+
+Dump the current page's content to a file.
+
+==== positional arguments
+* +'dest'+: Where to write the file to.
+
+==== optional arguments
+* +*-p*+, +*--plain*+: Write plain text instead of HTML.
+
 [[debug-pyeval]]
 === debug-pyeval
 Syntax: +:debug-pyeval 's'+
@@ -964,3 +1290,17 @@ Trace executed code via hunter.
 * This command does not split arguments after the last argument and handles quotes literally.
 * With this command, +;;+ is interpreted literally instead of splitting off a second command.
 
+[[debug-webaction]]
+=== debug-webaction
+Syntax: +:debug-webaction 'action'+
+
+Execute a webaction.
+
+See http://doc.qt.io/qt-5/qwebpage.html#WebAction-enum for the available actions.
+
+==== positional arguments
+* +'action'+: The action to execute, e.g. MoveToNextChar.
+
+==== count
+How many times to repeat the action.
+

doc/quickstart.asciidoc

@@ -11,6 +11,7 @@ What to do now
 * View the http://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]
 to make yourself familiar with the key bindings: +
 image:http://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="http://qutebrowser.org/img/cheatsheet-big.png"]
+* Run `:adblock-update` to download adblock lists and activate adblocking.
 * If you just cloned the repository, you'll need to run
 `scripts/asciidoc2html.py` to generate the documentation.
 * Go to the link:qute://settings[settings page] to set up qutebrowser the way you want it.

doc/qutebrowser.1.asciidoc

@@ -16,7 +16,7 @@ qutebrowser - a keyboard-driven, vim-like browser based on PyQt5 and QtWebKit.
 *qutebrowser* ['-OPTION' ['...']] [':COMMAND' ['...']] ['URL' ['...']]
 
 == DESCRIPTION
-qutebrowser is a keyboard-focused browser with with a minimal GUI. It's based
+qutebrowser is a keyboard-focused browser with a minimal GUI. It's based
 on Python, PyQt5 and QtWebKit and free software, licensed under the GPL.
 
 It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl.
@@ -41,6 +41,15 @@ show it.
 *-c* 'CONFDIR', *--confdir* 'CONFDIR'::
     Set config directory (empty for no config storage).
 
+*--datadir* 'DATADIR'::
+    Set data directory (empty for no data storage).
+
+*--cachedir* 'CACHEDIR'::
+    Set cache directory (empty for no cache storage).
+
+*--basedir* 'BASEDIR'::
+    Base directory for all storage. Other --*dir arguments are ignored if this is given.
+
 *-V*, *--version*::
     Show version and quit.
 
@@ -53,6 +62,9 @@ show it.
 *-R*, *--override-restore*::
     Don't restore a session even if one would be restored.
 
+*--target* '{auto,tab,tab-bg,tab-silent,tab-bg-silent,window}'::
+    How URLs should be opened if there is already a qutebrowser instance running.
+
 === debug arguments
 *-l* 'LOGLEVEL', *--loglevel* 'LOGLEVEL'::
     Set loglevel
@@ -81,12 +93,15 @@ show it.
 *--debug-exit*::
     Turn on debugging of late exit.
 
-*--no-crash-dialog*::
-    Don't show a crash dialog.
-
 *--pdb-postmortem*::
     Drop into pdb on exceptions.
 
+*--temp-basedir*::
+    Use a temporary basedir.
+
+*--no-err-windows*::
+    Don't show any error windows (used for tests/smoke.py).
+
 *--qt-name* 'NAME'::
     Set the window name.
 

doc/stacktrace.asciidoc

@@ -76,7 +76,7 @@ Server = http://qutebrowser.org/qt-debug/$arch
 Then install the packages:
 
 ----
-# pacman -Sy pyqt5-common-debug python-pyqt5-debug qt5-base-debug qt5-webkit-debug
+# pacman -Suy pyqt5-common-debug python-pyqt5-debug qt5-base-debug qt5-webkit-debug
 ----
 
 The `-debug` packages conflict with the non-debug variants - it's safe to

doc/userscripts.asciidoc

@@ -5,9 +5,12 @@ The Compiler <mail@qutebrowser.org>
 qutebrowser is extensible by writing userscripts which can be called via the
 `:spawn --userscript` command, or via a key binding.
 
-These userscripts are similiar to the (non-javascript) dwb userscripts. They
-can be written in any language which can read environment variables and write
-to a FIFO. Note they are *not* related to Greasemonkey userscripts.
+You can also call a userscript via hints so they get the selected hint URL by
+calling `:hint links userscript ...`.
+
+These userscripts are similar to the (non-javascript) dwb userscripts. They can
+be written in any language which can read environment variables and write to a
+FIFO. Note they are *not* related to Greasemonkey userscripts.
 
 Note for simple things such as opening the current page with another browser or
 mpv, a simple key binding to something like `:spawn mpv {url}` should suffice.
@@ -15,17 +18,21 @@ mpv, a simple key binding to something like `:spawn mpv {url}` should suffice.
 Also note userscripts need to have the executable bit set (`chmod +x`) for
 qutebrowser to run them.
 
+To call a userscript, it needs to be stored in your data directory under
+`userscripts` (for example: `~/.local/share/qutebrowser/userscripts/myscript`), 
+or just use an absolute path.
+
 Getting information
 -------------------
 
-The following environment variables will be set when an userscript is launched:
+The following environment variables will be set when a userscript is launched:
 
 - `QUTE_MODE`: Either `hints` (started via hints) or `command` (started via
   command or key binding).
 - `QUTE_USER_AGENT`: The currently set user agent.
 - `QUTE_FIFO`: The FIFO or file to write commands to.
-- `QUTE_HTML`: The HTML source of the current page.
-- `QUTE_TEXT`: The plaintext of the current page.
+- `QUTE_HTML`: Path of a file containing the HTML source of the current page.
+- `QUTE_TEXT`: Path of a file containing the plaintext of the current page.
 
 In `command` mode:
 

misc/apparmor/usr.bin.qutebrowser

@@ -29,6 +29,8 @@ profile qutebrowser /usr/{local/,}bin/qutebrowser {
 
     /proc/*/mounts r,
     owner /tmp/** rwkl,
+    owner /run/user/*/ rw,
+    owner /run/user/*/** krw,
 
     @{HOME}/.config/qutebrowser/** krw,
     @{HOME}/.local/share/qutebrowser/** krw,

misc/cheatsheet.svg

@@ -13,7 +13,7 @@
    height="640"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="cheatsheet.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -33,16 +33,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.8791156"
-     inkscape:cx="327.65084"
-     inkscape:cy="233.0095"
+     inkscape:cx="768.67127"
+     inkscape:cy="133.80749"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      width="1024px"
      height="640px"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="768"
-     inkscape:window-x="0"
+     inkscape:window-width="636"
+     inkscape:window-height="536"
+     inkscape:window-x="2560"
      inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -1939,7 +1939,7 @@
          x="542.06946"
          sodipodi:role="line"
          id="tspan4938"
-         style="font-size:8px">scoll</tspan><tspan
+         style="font-size:8px">scroll</tspan><tspan
          y="276.1955"
          x="542.06946"
          sodipodi:role="line"
@@ -2999,6 +2999,8 @@
          style="font-size:10px;fill:#000000"
          id="flowPara3626-73">;b  -  open hint in background tab</flowPara><flowPara
          style="font-size:10px;fill:#000000"
+         id="flowPara4051">;f - open hint in foreground tab</flowPara><flowPara
+         style="font-size:10px;fill:#000000"
          id="flowPara3788">;h  - hover over hint (mouse-over)</flowPara><flowPara
          style="font-size:10px;fill:#000000"
          id="flowPara3790">;i  -  hint images</flowPara><flowPara
@@ -3324,27 +3326,15 @@
          style="font-size:8px">tab</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:89.99999762%;font-family:TlwgTypewriter;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="267.67316"
-       y="326.20523"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:89.99999762%;font-family:TlwgTypewriter;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;stroke:none"
+       x="274.21381"
+       y="343.17578"
        id="text10547-23-6-7"
        sodipodi:linespacing="89.999998%"><tspan
          sodipodi:role="line"
-         x="267.67316"
-         y="326.20523"
-         id="tspan10560-1-3-1" /><tspan
-         sodipodi:role="line"
-         x="267.67316"
-         y="333.40524"
-         id="tspan5325">co: close</tspan><tspan
-         sodipodi:role="line"
-         x="267.67316"
-         y="340.60522"
-         id="tspan10562-12-5-98">other tabs</tspan><tspan
-         sodipodi:role="line"
-         x="267.67316"
-         y="347.80524"
-         id="tspan4045">cd: clea</tspan></text>
+         x="274.21381"
+         y="343.17578"
+         id="tspan4052">(10)</tspan></text>
     <text
        sodipodi:linespacing="89.999998%"
        id="text10564-6-7-8-0"
@@ -3469,5 +3459,20 @@
          y="177.63554"
          style="font-size:8px"
          id="tspan3719">cache)</tspan></text>
+    <text
+       sodipodi:linespacing="89.999998%"
+       id="text9514-60-7-7-0-8"
+       y="338.04874"
+       x="342.42523"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:89.99999762%;font-family:TlwgTypewriter;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       xml:space="preserve"><tspan
+         y="338.04874"
+         x="342.42523"
+         sodipodi:role="line"
+         id="tspan5689-6">visual</tspan><tspan
+         y="345.24875"
+         x="342.42523"
+         sodipodi:role="line"
+         id="tspan4112">mode</tspan></text>
   </g>
 </svg>

misc/userscripts/dmenu_qutebrowser

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Copyright 2015 Zach-Button <zachrey.button@gmail.com>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+# Pipes history, quickmarks, and URL into dmenu.
+#
+# If run from qutebrowser as a userscript, it runs :open on the URL
+# If not, it opens a new qutebrowser window at the URL
+#
+# Ideal for use with tabs-are-windows. Set a hotkey to launch this script, then:
+#	:bind o spawn --userscript dmenu_qutebrowser
+#
+# Use the hotkey to open in new tab/window, press 'o' to open URL in current tab/window
+# You can simulate "go" by pressing "o<tab>", as the current URL is always first in the list
+#
+# I personally use "<Mod4>o" to launch this script. For me, my workflow is:
+#	Default	keys		Keys with this script
+#	O			<Mod4>o
+#	o			o
+#	go			o<Tab>
+#	gO			gC, then o<Tab>
+#				(This is unnecessarily long. I use this rarely, feel free to make this script accept parameters.)
+#
+
+[ -z "$QUTE_URL" ] && QUTE_URL='http://google.com'
+
+url=$(echo "$QUTE_URL" | cat - ~/.config/qutebrowser/quickmarks ~/.local/share/qutebrowser/history | dmenu -l 15 -p qutebrowser)
+url=$(echo $url | sed -E 's/[^ ]+ +//g' | egrep "https?:" || echo $url)
+
+[ -z "${url// }" ] && exit
+
+echo "open $url" >> "$QUTE_FIFO" || qutebrowser "$url"
+

misc/userscripts/open_download

@@ -0,0 +1,113 @@
+#!/bin/bash -e
+# Both standalone script and qutebrowser userscript that opens a rofi menu with
+# all files from the download director and opens the selected file. It works
+# both as a userscript and a standalone script that is called from outside of
+# qutebrowser.
+#
+# Suggested keybinding (for "show downloads"):
+# spawn --userscript ~/.config/qutebrowser/open_download
+#     sd
+#
+# Requirements:
+#  - rofi (in a recent version)
+#  - xdg-open and xdg-mime
+#  - You should configure qutebrowser to download files to a single directory
+#  - It comes in handy if you enable remove-finished-downloads. If you want to
+#    see the recent downloads, just press "sd".
+#
+# Thorsten Wißmann, 2015 (thorsten` on freenode)
+# Any feedback is welcome!
+
+# open a file from the download directory using rofi
+DOWNLOAD_DIR=${DOWNLOAD_DIR:-$HOME/Downloads}
+# the name of the rofi command
+ROFI_CMD=${ROFI_CMD:-rofi}
+ROFI_ARGS=${ROFI_ARGS:-}
+
+msg() {
+    local cmd="$1"
+    shift
+    local msg="$*"
+    if [ -z "$QUTE_FIFO" ] ; then
+        echo "$cmd: $msg" >&2
+    else
+        echo "message-$cmd '${msg//\'/\\\'}'" >> "$QUTE_FIFO"
+    fi
+}
+die() {
+    msg error "$*"
+    if [ -n "$QUTE_FIFO" ] ; then
+        # when run as a userscript, the above error message already informs the
+        # user about the failure, and no additional "userscript exited with status
+        # 1" is needed.
+        exit 0;
+    else
+        exit 1;
+    fi
+}
+
+if ! [ -d "$DOWNLOAD_DIR" ] ; then
+    die "Download directory »$DOWNLOAD_DIR« not found!"
+fi
+if ! $(which "${ROFI_CMD}" > /dev/null ) ; then
+    die "Rofi command »${ROFI_CMD}« not found in PATH!"
+fi
+
+rofi_default_args=(
+        -monitor -2 # place above window
+        -location 6 # aligned at the bottom
+        -width 100  # use full window width
+        -i
+        -no-custom
+        -format i   # make rofi return the index
+        -l 10
+        -p 'Open download:' -dmenu
+    )
+
+crop-first-column() {
+    local maxlength=${1:-40}
+    local expression='s|^\([^\t]\{0,'"$maxlength"'\}\)[^\t]*\t|\1\t|'
+    sed "$expression"
+}
+
+ls-files() {
+    # add the slash at the end of the download dir enforces to follow the
+    # symlink, if the DOWNLOAD_DIR itself is a symlink
+    ls -Q --quoting-style escape    -h  -o -1 -A -t "${DOWNLOAD_DIR}/" \
+        | grep '^[-]' \
+        | cut -d' ' -f3- \
+        | sed 's,^\(.*[^\]\) \(.*\)$,\2\t\1,' \
+        | sed 's,\\\(.\),\1,g'
+}
+
+mapfile -t entries < <(ls-files)
+
+# we need to manually check that there are items, because rofi doesn't show up
+# if there are no items and -no-custom is passed to rofi.
+if [ "${#entries[@]}" -eq 0 ] ; then
+    die "Download directory »${DOWNLOAD_DIR}« empty"
+fi
+
+line=$(printf "%s\n" "${entries[@]}"  \
+       | crop-first-column 55 \
+       | column -s $'\t' -t \
+       | $ROFI_CMD "${rofi_default_args[@]}" $ROFI_ARGS) || true
+if [ -z "$line" ];  then
+    exit 0
+fi
+
+file="${entries[$line]}"
+file="${file%%$'\t'*}"
+path="$DOWNLOAD_DIR/$file"
+filetype=$(xdg-mime query filetype "$path")
+application=$(xdg-mime query default "$filetype")
+
+if [ -z "$application" ] ; then
+    die "Do not know how to open »$file« of type $filetype"
+fi
+
+msg info "Opening »$file« (of type $filetype) with ${application%.desktop}"
+
+xdg-open "$path" &
+
+

misc/userscripts/openfeeds

@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Copyright 2015 jnphilipp <me@jnphilipp.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+# Opens all links to feeds defined in the head of a site
+#
+# Ideal for use with tabs-are-windows. Set a hotkey to launch this script, then:
+#   :bind gF spawn --userscript openfeeds
+#
+# Use the hotkey to open the feeds in new tab/window, press 'gF' to open
+#
+
+import os
+import re
+
+from bs4 import BeautifulSoup
+
+with open(os.environ['QUTE_HTML'], 'r') as f:
+    soup = BeautifulSoup(f)
+with open(os.environ['QUTE_FIFO'], 'w') as f:
+    for link in soup.find_all('link', rel='alternate', type=re.compile(r'application/((rss|rdf|atom)\+)?xml|text/xml')):
+        f.write('open -t %s\n' % link.get('href'))

misc/userscripts/qutebrowser_viewsource

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright 2015 Zach-Button <zachrey.button@gmail.com>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+# 
+# This script fetches the unprocessed HTML source for a page and opens it in vim.
+#	:bind gf spawn --userscript qutebrowser_viewsource
+#
+# Caveat: Does not use authentication of any kind. Add it in if you want it to.
+#
+
+path=/tmp/qutebrowser_$(mktemp XXXXXXXX).html
+
+curl "$QUTE_URL" > $path
+urxvt -e vim "$path"
+
+rm "$path"

misc/userscripts/qutedmenu

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# Handle open -s && open -t with bemenu
+
+#:bind o spawn --userscript /path/to/userscripts/qutedmenu open
+#:bind O spawn --userscript /path/to/userscripts/qutedmenu tab
+
+# If you would like to set a custom colorscheme/font use these dirs.
+# https://github.com/halfwit/dotfiles/blob/master/.config/dmenu/bemenucolors
+readonly confdir=${XDG_CONFIG_HOME:-$HOME/.config}
+readonly datadir=${XDG_DATA_HOME:-$HOME/.local/share}
+
+readonly optsfile=$confdir/dmenu/bemenucolors
+
+create_menu() {
+    # Check quickmarks
+    while read -r url; do
+        printf -- '%s\n' "$url"
+    done < "$confdir"/qutebrowser/quickmarks
+
+    # Next bookmarks
+    while read -r url _; do
+        printf -- '%s\n' "$url"
+    done < "$confdir"/qutebrowser/bookmarks/urls
+
+    # Finally history
+    while read -r _ url; do
+        printf -- '%s\n' "$url"
+    done < "$datadir"/qutebrowser/history
+    }
+
+get_selection() {
+    opts+=(-p qutebrowser)
+    #create_menu | dmenu -l 10 "${opts[@]}"
+    create_menu | bemenu -l 10 "${opts[@]}"
+}
+
+# Main
+# https://github.com/halfwit/dotfiles/blob/master/.config/dmenu/font
+if [[ -s $confdir/dmenu/font ]]; then
+    read -r font < "$confdir"/dmenu/font
+fi
+
+if [[ $font ]]; then
+    opts+=(-fn "$font")
+fi
+
+if [[ -s $optsfile ]]; then
+    source "$optsfile"
+fi
+
+url=$(get_selection)
+url=${url/*http/http}
+
+# If no selection is made, exit (escape pressed, e.g.)
+[[ ! $url ]] && exit 0
+
+case $1 in
+    open) printf '%s' "open $url" >> "$QUTE_FIFO" || qutebrowser "$url" ;;
+    tab)    printf '%s' "open -t $url" >> "$QUTE_FIFO" || qutebrowser "$url"  ;;
+esac

misc/userscripts/view_in_mpv

@@ -0,0 +1,141 @@
+#!/bin/bash -e
+#
+# Behaviour:
+#   Userscript for qutebrowser which views the current web page in mpv using
+#   sensible mpv-flags. While viewing the page in MPV, all <video>, <embed>,
+#   and <object> tags in the original page are temporarily removed. Clicking on
+#   such a removed video restores the respective video.
+#
+#   In order to use this script, just start it using `spawn --userscript` from
+#   qutebrowser. I recommend using an alias, e.g. put this in the
+#   [alias]-section of qutebrowser.conf:
+#
+#     mpv = spawn --userscript /path/to/view_in_mpv
+#
+# Background:
+#   Most of my machines are too slow to play youtube videos using html5, but
+#   they work fine in mpv (and mpv has further advantages like video scaling,
+#   etc). Of course, I don't want the video to be played (or even to be
+#   downloaded) twice — in MPV and in qwebkit. So I often close the tab after
+#   opening it in mpv. However, I actually want to keep the rest of the page
+#   (comments and video suggestions), i.e. only the videos should disappear
+#   when mpv is started. And that's precisely what the present script does.
+#
+# Thorsten Wißmann, 2015 (thorsten` on freenode)
+# Any feedback is welcome!
+
+if [ -z "$QUTE_FIFO" ] ; then
+    cat 1>&2 <<EOF
+Error: $0 can not be run as a standalone script.
+
+It is a qutebrowser userscript. In order to use it, call it using
+'spawn --userscript' as described in qute://help/userscripts.html
+EOF
+    exit 1
+fi
+
+msg() {
+    local cmd="$1"
+    shift
+    local msg="$*"
+    if [ -z "$QUTE_FIFO" ] ; then
+        echo "$cmd: $msg" >&2
+    else
+        echo "message-$cmd '${msg//\'/\\\'}'" >> "$QUTE_FIFO"
+    fi
+}
+
+MPV_COMMAND=${MPV_COMMAND:-mpv}
+# Warning: spaces in single flags are not supported
+MPV_FLAGS=${MPV_FLAGS:- --force-window --no-terminal --keep-open=yes --ytdl }
+video_command=( "$MPV_COMMAND"  $MPV_FLAGS )
+
+js() {
+cat <<EOF
+
+    function descendantOfTagName(child, ancestorTagName) {
+        // tells whether child has some (proper) ancestor
+        // with the tag name ancestorTagName
+        while (child.parentNode != null) {
+            child = child.parentNode;
+            if (typeof child.tagName === 'undefined') break;
+            if (child.tagName.toUpperCase() == ancestorTagName.toUpperCase()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    var App = {};
+
+    var all_videos = [];
+    all_videos.push.apply(all_videos, document.getElementsByTagName("video"));
+    all_videos.push.apply(all_videos, document.getElementsByTagName("object"));
+    all_videos.push.apply(all_videos, document.getElementsByTagName("embed"));
+    App.backup_videos = Array();
+    App.all_replacements = Array();
+    for (i = 0; i < all_videos.length; i++) {
+        var video = all_videos[i];
+        if (descendantOfTagName(video, "object")) {
+            // skip tags that are contained in an object, because we hide
+            // the object anyway.
+            continue;
+        }
+        var replacement = document.createElement("div");
+        replacement.innerHTML = "
+            <p style=\\"margin-bottom: 0.5em\\">
+            Opening page with:
+            <span style=\\"font-family: monospace;\\">${video_command[*]}</span>
+            </p>
+            <p>
+            In order to restore this particular video
+            <a style=\\"font-weight: bold;
+                        color: white;
+                        background: transparent;
+                     \\"
+               onClick=\\"restore_video(this, " + i + ");\\"
+               href=\\"javascript: restore_video(this, " + i + ")\\"
+              >click here</a>.
+            </p>
+        ";
+        replacement.style.position = "relative";
+        replacement.style.zIndex = "100003000000";
+        replacement.style.fontSize = "1rem";
+        replacement.style.textAlign = "center";
+        replacement.style.verticalAlign = "middle";
+        replacement.style.height = "100%";
+        replacement.style.background = "#101010";
+        replacement.style.color = "white";
+        replacement.style.border = "4px dashed #545454";
+        replacement.style.padding = "2em";
+        replacement.style.margin = "auto";
+        App.all_replacements[i] = replacement;
+        App.backup_videos[i] = video;
+        video.parentNode.replaceChild(replacement, video);
+    }
+
+    function restore_video(obj, index) {
+        obj = App.all_replacements[index];
+        video = App.backup_videos[index];
+        console.log(video);
+        obj.parentNode.replaceChild(video, obj);
+    }
+
+    /** force repainting the video, thanks to:
+     * http://martinwolf.org/2014/06/10/force-repaint-of-an-element-with-javascript/
+     */
+    var siteHeader = document.getElementById('header');
+    siteHeader.style.display='none';
+    siteHeader.offsetHeight; // no need to store this anywhere, the reference is enough
+    siteHeader.style.display='block';
+
+EOF
+}
+
+printjs() {
+    js | sed 's,//.*$,,' | tr '\n' ' '
+}
+echo "jseval -q $(printjs)" >> "$QUTE_FIFO"
+
+msg info "Opening $QUTE_URL with mpv"
+"${video_command[@]}" "$QUTE_URL"

pytest.ini

@@ -0,0 +1,41 @@
+[pytest]
+norecursedirs = .tox .venv
+markers =
+    gui: Tests using the GUI (e.g. spawning widgets)
+    posix: Tests which only can run on a POSIX OS.
+    windows: Tests which only can run on Windows.
+    linux: Tests which only can run on Linux.
+    osx: Tests which only can run on OS X.
+    not_osx: Tests which can not run on OS X.
+    not_frozen: Tests which can't be run if sys.frozen is True.
+    not_xvfb: Tests which can't be run with Xvfb.
+    frozen: Tests which can only be run if sys.frozen is True.
+    integration: Tests which test a bigger portion of code, run without coverage.
+flakes-ignore =
+    UnusedImport
+    UnusedVariable
+    resources.py ALL
+pep8ignore =
+    E265  # Block comment should start with '#'
+    E501  # Line too long
+    E402  # module level import not at top of file
+    E266  # too many leading '#' for block comment
+    W503  # line break before binary operator
+    resources.py ALL
+    .hypothesis/* ALL
+mccabe-complexity = 12
+qt_log_level_fail = WARNING
+qt_log_ignore =
+    ^SpellCheck: .*
+    ^SetProcessDpiAwareness failed: .*
+    ^QWindowsWindow::setGeometryDp: Unable to set geometry .*
+    ^QProcess: Destroyed while process .* is still running\.
+    ^"Method "GetAll" with signature "s" on interface "org\.freedesktop\.DBus\.Properties" doesn't exist
+    ^virtual void QSslSocketBackendPrivate::transmit\(\) SSL write failed with error: -9805
+    ^virtual void QSslSocketBackendPrivate::transmit\(\) SSLRead failed with: -9805
+    ^Type conversion already registered from type .*
+    ^QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once\.
+    ^QWaitCondition: Destroyed while threads are still waiting
+    ^QXcbXSettings::QXcbXSettings\(QXcbScreen\*\) Failed to get selection owner for XSETTINGS_S atom
+    ^QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to .*
+    ^QXcbClipboard: SelectionRequest too old

qutebrowser/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -24,12 +24,12 @@
 import os.path
 
 __author__ = "Florian Bruhin"
-__copyright__ = "Copyright 2014-2015 Florian Bruhin (The Compiler)"
+__copyright__ = "Copyright 2014-2016 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (0, 2, 0)
-__version__ = '.'.join(map(str, __version_info__))
+__version_info__ = (0, 5, 1)
+__version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit."
 
 basedir = os.path.dirname(os.path.realpath(__file__))

qutebrowser/__main__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/browser/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/browser/adblock.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -24,10 +24,11 @@ import os.path
 import functools
 import posixpath
 import zipfile
+import fnmatch
 
 from qutebrowser.config import config
 from qutebrowser.utils import objreg, standarddir, log, message
-from qutebrowser.commands import cmdutils
+from qutebrowser.commands import cmdutils, cmdexc
 
 
 def guess_zip_filename(zf):
@@ -59,6 +60,22 @@ def get_fileobj(byte_io):
     return io.TextIOWrapper(byte_io, encoding='utf-8')
 
 
+def is_whitelisted_host(host):
+    """Check if the given host is on the adblock whitelist.
+
+    Args:
+        host: The host of the request as string.
+    """
+    whitelist = config.get('content', 'host-blocking-whitelist')
+    if whitelist is None:
+        return False
+
+    for pattern in whitelist:
+        if fnmatch.fnmatch(host, pattern.lower()):
+            return True
+    return False
+
+
 class FakeDownload:
 
     """A download stub to use on_download_finished with local files."""
@@ -74,7 +91,7 @@ class HostBlocker:
     """Manage blocked hosts based from /etc/hosts-like files.
 
     Attributes:
-        blocked_hosts: A set of blocked hosts.
+        _blocked_hosts: A set of blocked hosts.
         _in_progress: The DownloadItems which are currently downloading.
         _done_count: How many files have been read successfully.
         _hosts_file: The path to the blocked-hosts file.
@@ -87,31 +104,48 @@ class HostBlocker:
                    'local')
 
     def __init__(self):
-        self.blocked_hosts = set()
+        self._blocked_hosts = set()
         self._in_progress = []
         self._done_count = 0
-        self._hosts_file = os.path.join(standarddir.data(), 'blocked-hosts')
+        data_dir = standarddir.data()
+        if data_dir is None:
+            self._hosts_file = None
+        else:
+            self._hosts_file = os.path.join(data_dir, 'blocked-hosts')
         objreg.get('config').changed.connect(self.on_config_changed)
 
+    def is_blocked(self, url):
+        """Check if the given URL (as QUrl) is blocked."""
+        if not config.get('content', 'host-blocking-enabled'):
+            return False
+        host = url.host()
+        return host in self._blocked_hosts and not is_whitelisted_host(host)
+
     def read_hosts(self):
         """Read hosts from the existing blocked-hosts file."""
-        self.blocked_hosts = set()
+        self._blocked_hosts = set()
+        if self._hosts_file is None:
+            return
         if os.path.exists(self._hosts_file):
             try:
                 with open(self._hosts_file, 'r', encoding='utf-8') as f:
                     for line in f:
-                        self.blocked_hosts.add(line.strip())
+                        self._blocked_hosts.add(line.strip())
             except OSError:
                 log.misc.exception("Failed to read host blocklist!")
         else:
-            if config.get('content', 'host-block-lists') is not None:
+            args = objreg.get('args')
+            if (config.get('content', 'host-block-lists') is not None and
+                    args.basedir is None):
                 message.info('current',
                              "Run :adblock-update to get adblock lists.")
 
-    @cmdutils.register(instance='host-blocker')
-    def adblock_update(self, win_id: {'special': 'win_id'}):
+    @cmdutils.register(instance='host-blocker', win_id='win_id')
+    def adblock_update(self, win_id):
         """Update the adblock block lists."""
-        self.blocked_hosts = set()
+        if self._hosts_file is None:
+            raise cmdexc.CommandError("No data storage is configured!")
+        self._blocked_hosts = set()
         self._done_count = 0
         urls = config.get('content', 'host-block-lists')
         download_manager = objreg.get('download-manager', scope='window',
@@ -179,7 +213,7 @@ class HostBlocker:
                 error_count += 1
                 continue
             if host not in self.WHITELISTED:
-                self.blocked_hosts.add(host)
+                self._blocked_hosts.add(host)
         log.misc.debug("{}: read {} lines".format(byte_io.name, line_count))
         if error_count > 0:
             message.error('current', "adblock: {} read errors for {}".format(
@@ -188,10 +222,10 @@ class HostBlocker:
     def on_lists_downloaded(self):
         """Install block lists after files have been downloaded."""
         with open(self._hosts_file, 'w', encoding='utf-8') as f:
-            for host in sorted(self.blocked_hosts):
+            for host in sorted(self._blocked_hosts):
                 f.write(host + '\n')
             message.info('current', "adblock: Read {} hosts from {} sources."
-                         .format(len(self.blocked_hosts), self._done_count))
+                         .format(len(self._blocked_hosts), self._done_count))
 
     @config.change_filter('content', 'host-block-lists')
     def on_config_changed(self):

qutebrowser/browser/cache.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -21,31 +21,53 @@
 
 import os.path
 
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtNetwork import QNetworkDiskCache, QNetworkCacheMetaData
 
 from qutebrowser.config import config
-from qutebrowser.utils import utils, standarddir, objreg
+from qutebrowser.utils import utils, objreg
 
 
 class DiskCache(QNetworkDiskCache):
 
-    """Disk cache which sets correct cache dir and size."""
+    """Disk cache which sets correct cache dir and size.
 
-    def __init__(self, parent=None):
+    Attributes:
+        _activated: Whether the cache should be used.
+        _cache_dir: The base directory for cache files (standarddir.cache())
+        _http_cache_dir: the HTTP subfolder in _cache_dir.
+    """
+
+    def __init__(self, cache_dir, parent=None):
         super().__init__(parent)
-        self.setCacheDirectory(os.path.join(standarddir.cache(), 'http'))
-        self.setMaximumCacheSize(config.get('storage', 'cache-size'))
-        objreg.get('config').changed.connect(self.cache_size_changed)
+        self._cache_dir = cache_dir
+        self._http_cache_dir = os.path.join(cache_dir, 'http')
+        self._maybe_activate()
+        objreg.get('config').changed.connect(self.on_config_changed)
 
     def __repr__(self):
         return utils.get_repr(self, size=self.cacheSize(),
                               maxsize=self.maximumCacheSize(),
                               path=self.cacheDirectory())
 
-    @config.change_filter('storage', 'cache-size')
-    def cache_size_changed(self):
-        """Update cache size if the config was changed."""
-        self.setMaximumCacheSize(config.get('storage', 'cache-size'))
+    def _maybe_activate(self):
+        """Activate/deactivate the cache based on the config."""
+        if (config.get('general', 'private-browsing') or
+                self._cache_dir is None):
+            self._activated = False
+        else:
+            self._activated = True
+            self.setCacheDirectory(self._http_cache_dir)
+            self.setMaximumCacheSize(config.get('storage', 'cache-size'))
+
+    @pyqtSlot(str, str)
+    def on_config_changed(self, section, option):
+        """Update cache size/activated if the config was changed."""
+        if (section, option) == ('storage', 'cache-size'):
+            self.setMaximumCacheSize(config.get('storage', 'cache-size'))
+        elif (section, option) == ('general',   # pragma: no branch
+                                   'private-browsing'):
+            self._maybe_activate()
 
     def cacheSize(self):
         """Return the current size taken up by the cache.
@@ -53,10 +75,10 @@ class DiskCache(QNetworkDiskCache):
         Return:
             An int.
         """
-        if config.get('general', 'private-browsing'):
-            return 0
-        else:
+        if self._activated:
             return super().cacheSize()
+        else:
+            return 0
 
     def fileMetaData(self, filename):
         """Return the QNetworkCacheMetaData for the cache file filename.
@@ -67,10 +89,10 @@ class DiskCache(QNetworkDiskCache):
         Return:
             A QNetworkCacheMetaData object.
         """
-        if config.get('general', 'private-browsing'):
-            return QNetworkCacheMetaData()
-        else:
+        if self._activated:
             return super().fileMetaData(filename)
+        else:
+            return QNetworkCacheMetaData()
 
     def data(self, url):
         """Return the data associated with url.
@@ -81,10 +103,10 @@ class DiskCache(QNetworkDiskCache):
         return:
             A QIODevice or None.
         """
-        if config.get('general', 'private-browsing'):
-            return None
-        else:
+        if self._activated:
             return super().data(url)
+        else:
+            return None
 
     def insert(self, device):
         """Insert the data in device and the prepared meta data into the cache.
@@ -92,10 +114,10 @@ class DiskCache(QNetworkDiskCache):
         Args:
             device: A QIODevice.
         """
-        if config.get('general', 'private-browsing'):
-            return
-        else:
+        if self._activated:
             super().insert(device)
+        else:
+            return None
 
     def metaData(self, url):
         """Return the meta data for the url url.
@@ -106,10 +128,10 @@ class DiskCache(QNetworkDiskCache):
         Return:
             A QNetworkCacheMetaData object.
         """
-        if config.get('general', 'private-browsing'):
-            return QNetworkCacheMetaData()
-        else:
+        if self._activated:
             return super().metaData(url)
+        else:
+            return QNetworkCacheMetaData()
 
     def prepare(self, meta_data):
         """Return the device that should be populated with the data.
@@ -120,10 +142,10 @@ class DiskCache(QNetworkDiskCache):
         Return:
             A QIODevice or None.
         """
-        if config.get('general', 'private-browsing'):
-            return None
-        else:
+        if self._activated:
             return super().prepare(meta_data)
+        else:
+            return None
 
     def remove(self, url):
         """Remove the cache entry for url.
@@ -131,10 +153,10 @@ class DiskCache(QNetworkDiskCache):
         Return:
             True on success, False otherwise.
         """
-        if config.get('general', 'private-browsing'):
-            return False
-        else:
+        if self._activated:
             return super().remove(url)
+        else:
+            return False
 
     def updateMetaData(self, meta_data):
         """Update the cache meta date for the meta_data's url to meta_data.
@@ -142,14 +164,14 @@ class DiskCache(QNetworkDiskCache):
         Args:
             meta_data: A QNetworkCacheMetaData object.
         """
-        if config.get('general', 'private-browsing'):
-            return
-        else:
+        if self._activated:
             super().updateMetaData(meta_data)
+        else:
+            return
 
     def clear(self):
         """Remove all items from the cache."""
-        if config.get('general', 'private-browsing'):
-            return
-        else:
+        if self._activated:
             super().clear()
+        else:
+            return

qutebrowser/browser/cookies.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -68,23 +68,31 @@ class CookieJar(RAMCookieJar):
         _lineparser: The LineParser managing the cookies file.
     """
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, *, line_parser=None):
         super().__init__(parent)
-        self._lineparser = lineparser.LineParser(
-            standarddir.data(), 'cookies', binary=True, parent=self)
-        cookies = []
-        for line in self._lineparser:
-            cookies += QNetworkCookie.parseCookies(line)
-        self.setAllCookies(cookies)
+
+        if line_parser:
+            self._lineparser = line_parser
+        else:
+            self._lineparser = lineparser.LineParser(
+                standarddir.data(), 'cookies', binary=True, parent=self)
+        self.parse_cookies()
         objreg.get('config').changed.connect(self.cookies_store_changed)
         objreg.get('save-manager').add_saveable(
             'cookies', self.save, self.changed,
             config_opt=('content', 'cookies-store'))
 
+    def parse_cookies(self):
+        """Parse cookies from lineparser and store them."""
+        cookies = []
+        for line in self._lineparser:
+            cookies += QNetworkCookie.parseCookies(line)
+        self.setAllCookies(cookies)
+
     def purge_old_cookies(self):
         """Purge expired cookies from the cookie jar."""
         # Based on:
-        # http://qt-project.org/doc/qt-5/qtwebkitexamples-webkitwidgets-browser-cookiejar-cpp.html
+        # http://doc.qt.io/qt-5/qtwebkitexamples-webkitwidgets-browser-cookiejar-cpp.html
         now = QDateTime.currentDateTime()
         cookies = [c for c in self.allCookies()
                    if c.isSessionCookie() or c.expirationDate() >= now]

qutebrowser/browser/downloads.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -49,15 +49,33 @@ ModelRole = usertypes.enum('ModelRole', ['item'], start=Qt.UserRole,
 RetryInfo = collections.namedtuple('RetryInfo', ['request', 'manager'])
 
 
-def _download_dir():
+DownloadPath = collections.namedtuple('DownloadPath', ['filename',
+                                                       'question'])
+
+
+# Remember the last used directory
+last_used_directory = None
+
+
+# All REFRESH_INTERVAL milliseconds, speeds will be recalculated and downloads
+# redrawn.
+REFRESH_INTERVAL = 500
+
+
+def download_dir():
     """Get the download directory to use."""
     directory = config.get('storage', 'download-directory')
-    if directory is None:
-        directory = standarddir.download()
-    return directory
+    remember_dir = config.get('storage', 'remember-download-directory')
+
+    if remember_dir and last_used_directory is not None:
+        return last_used_directory
+    elif directory is None:
+        return standarddir.download()
+    else:
+        return directory
 
 
-def _path_suggestion(filename):
+def path_suggestion(filename):
     """Get the suggested file path.
 
     Args:
@@ -66,21 +84,84 @@ def _path_suggestion(filename):
     suggestion = config.get('completion', 'download-path-suggestion')
     if suggestion == 'path':
         # add trailing '/' if not present
-        return os.path.join(_download_dir(), '')
+        return os.path.join(download_dir(), '')
     elif suggestion == 'filename':
         return filename
     elif suggestion == 'both':
-        return os.path.join(_download_dir(), filename)
+        return os.path.join(download_dir(), filename)
     else:
         raise ValueError("Invalid suggestion value {}!".format(suggestion))
 
 
+def create_full_filename(basename, filename):
+    """Create a full filename based on the given basename and filename.
+
+    Args:
+        basename: The basename to use if filename is a directory.
+        filename: The path to a folder or file where you want to save.
+
+    Return:
+        The full absolute path, or None if filename creation was not possible.
+    """
+    if os.path.isabs(filename) and os.path.isdir(filename):
+        # We got an absolute directory from the user, so we save it under
+        # the default filename in that directory.
+        return os.path.join(filename, basename)
+    elif os.path.isabs(filename):
+        # We got an absolute filename from the user, so we save it under
+        # that filename.
+        return filename
+    return None
+
+
+def ask_for_filename(suggested_filename, win_id, *, parent=None,
+                     prompt_download_directory=None):
+    """Prepare a question for a download-path.
+
+    If a filename can be determined directly, it is returned instead.
+
+    Returns a (filename, question)-namedtuple, in which one component is
+    None. filename is a string, question is a usertypes.Question. The
+    question has a special .ask() method that takes no arguments for
+    convenience, as this function does not yet ask the question, it
+    only prepares it.
+
+    Args:
+        suggested_filename: The "default"-name that is pre-entered as path.
+        win_id: The window where the question will be asked.
+        parent: The parent of the question (a QObject).
+        prompt_download_directory: If this is something else than None, it
+                                   will overwrite the
+                                   storage->prompt-download-directory setting.
+    """
+    if prompt_download_directory is None:
+        prompt_download_directory = config.get('storage',
+                                               'prompt-download-directory')
+
+    if not prompt_download_directory:
+        return DownloadPath(filename=download_dir(), question=None)
+
+    encoding = sys.getfilesystemencoding()
+    suggested_filename = utils.force_encoding(suggested_filename,
+                                              encoding)
+
+    q = usertypes.Question(parent)
+    q.text = "Save file to:"
+    q.mode = usertypes.PromptMode.text
+    q.completed.connect(q.deleteLater)
+    q.default = path_suggestion(suggested_filename)
+
+    message_bridge = objreg.get('message-bridge', scope='window',
+                                window=win_id)
+    q.ask = lambda: message_bridge.ask(q, blocking=False)
+    return DownloadPath(filename=None, question=q)
+
+
 class DownloadItemStats(QObject):
 
     """Statistics (bytes done, total bytes, time, etc.) about a download.
 
     Class attributes:
-        SPEED_REFRESH_INTERVAL: How often to refresh the speed, in msec.
         SPEED_AVG_WINDOW: How many seconds of speed data to average to
                           estimate the remaining time.
 
@@ -93,42 +174,40 @@ class DownloadItemStats(QObject):
                     the speed the last time.
     """
 
-    SPEED_REFRESH_INTERVAL = 500
     SPEED_AVG_WINDOW = 30
 
-    updated = pyqtSignal()
-
     def __init__(self, parent=None):
         super().__init__(parent)
         self.total = None
         self.done = 0
         self.speed = 0
         self._last_done = 0
-        samples = int(self.SPEED_AVG_WINDOW *
-                      (1000 / self.SPEED_REFRESH_INTERVAL))
+        samples = int(self.SPEED_AVG_WINDOW * (1000 / REFRESH_INTERVAL))
         self._speed_avg = collections.deque(maxlen=samples)
-        self.timer = usertypes.Timer(self, 'speed_refresh')
-        self.timer.timeout.connect(self._update_speed)
-        self.timer.setInterval(self.SPEED_REFRESH_INTERVAL)
-        self.timer.start()
 
-    @pyqtSlot()
-    def _update_speed(self):
-        """Recalculate the current download speed."""
+    def update_speed(self):
+        """Recalculate the current download speed.
+
+        The caller needs to guarantee this is called all REFRESH_INTERVAL ms.
+        """
+        if self.done is None:
+            # this can happen for very fast downloads, e.g. when actually
+            # opening a file
+            return
         delta = self.done - self._last_done
-        self.speed = delta * 1000 / self.SPEED_REFRESH_INTERVAL
+        self.speed = delta * 1000 / REFRESH_INTERVAL
         self._speed_avg.append(self.speed)
         self._last_done = self.done
-        self.updated.emit()
 
     def finish(self):
         """Set the download stats as finished."""
-        self.timer.stop()
         self.done = self.total
 
     def percentage(self):
         """The current download percentage, or None if unknown."""
-        if self.total == 0 or self.total is None:
+        if self.done == self.total:
+            return 100
+        elif self.total == 0 or self.total is None:
             return None
         else:
             return 100 * self.done / self.total
@@ -148,7 +227,7 @@ class DownloadItemStats(QObject):
 
     @pyqtSlot(int, int)
     def on_download_progress(self, bytes_done, bytes_total):
-        """Upload local variables when the download progress changed.
+        """Update local variables when the download progress changed.
 
         Args:
             bytes_done: How many bytes are downloaded.
@@ -158,7 +237,6 @@ class DownloadItemStats(QObject):
             bytes_total = None
         self.done = bytes_done
         self.total = bytes_total
-        self.updated.emit()
 
 
 class DownloadItem(QObject):
@@ -192,6 +270,7 @@ class DownloadItem(QObject):
         fileobj: The file object to download the file to.
         reply: The QNetworkReply associated with this download.
         retry_info: A RetryInfo instance.
+        raw_headers: The headers sent by the server.
         _filename: The filename of the download.
         _redirects: How many time we were redirected already.
         _buffer: A BytesIO object to buffer incoming data until we know the
@@ -231,7 +310,6 @@ class DownloadItem(QObject):
         self.retry_info = None
         self.done = False
         self.stats = DownloadItemStats(self)
-        self.stats.updated.connect(self.data_changed)
         self.index = 0
         self.autoclose = True
         self.reply = None
@@ -247,6 +325,7 @@ class DownloadItem(QObject):
         self._filename = None
         self.init_reply(reply)
         self._win_id = win_id
+        self.raw_headers = {}
 
     def __repr__(self):
         return utils.get_repr(self, basename=self.basename)
@@ -297,10 +376,10 @@ class DownloadItem(QObject):
         else:
             self.set_fileobj(fileobj)
 
-    def _ask_overwrite_question(self):
+    def _ask_confirm_question(self, msg):
         """Create a Question object to be asked."""
         q = usertypes.Question(self)
-        q.text = self._filename + " already exists. Overwrite? (y/n)"
+        q.text = msg
         q.mode = usertypes.PromptMode.yesno
         q.answered_yes.connect(self._create_fileobj)
         q.answered_no.connect(functools.partial(self.cancel, False))
@@ -346,6 +425,7 @@ class DownloadItem(QObject):
         reply.finished.connect(self.on_reply_finished)
         reply.error.connect(self.on_reply_error)
         reply.readyRead.connect(self.on_ready_read)
+        reply.metaDataChanged.connect(self.on_meta_data_changed)
         self.retry_info = RetryInfo(request=reply.request(),
                                     manager=reply.manager())
         if not self.fileobj:
@@ -356,12 +436,19 @@ class DownloadItem(QObject):
         if reply.error() != QNetworkReply.NoError:
             QTimer.singleShot(0, lambda: self.error.emit(reply.errorString()))
 
-    def bg_color(self):
-        """Background color to be shown."""
-        start = config.get('colors', 'downloads.bg.start')
-        stop = config.get('colors', 'downloads.bg.stop')
-        system = config.get('colors', 'downloads.bg.system')
-        error = config.get('colors', 'downloads.bg.error')
+    def get_status_color(self, position):
+        """Choose an appropriate color for presenting the download's status.
+
+        Args:
+            position: The color type requested, can be 'fg' or 'bg'.
+        """
+        # pylint: disable=bad-config-call
+        # WORKAROUND for https://bitbucket.org/logilab/astroid/issue/104/
+        assert position in ("fg", "bg")
+        start = config.get('colors', 'downloads.{}.start'.format(position))
+        stop = config.get('colors', 'downloads.{}.stop'.format(position))
+        system = config.get('colors', 'downloads.{}.system'.format(position))
+        error = config.get('colors', 'downloads.{}.error'.format(position))
         if self.error_msg is not None:
             assert not self.successful
             return error
@@ -405,6 +492,8 @@ class DownloadItem(QObject):
     @pyqtSlot()
     def retry(self):
         """Retry a failed download."""
+        assert self.done
+        assert not self.successful
         download_manager = objreg.get('download-manager', scope='window',
                                       window=self._win_id)
         new_reply = self.retry_info.manager.get(self.retry_info.request)
@@ -427,6 +516,7 @@ class DownloadItem(QObject):
             filename: The full filename to save the download to.
                       None: special value to stop the download.
         """
+        global last_used_directory
         if self.fileobj is not None:
             raise ValueError("fileobj was already set! filename: {}, "
                              "existing: {}, fileobj {}".format(
@@ -436,39 +526,32 @@ class DownloadItem(QObject):
         # See https://github.com/The-Compiler/qutebrowser/issues/427
         encoding = sys.getfilesystemencoding()
         filename = utils.force_encoding(filename, encoding)
-        if not self._create_full_filename(filename):
+        self._filename = create_full_filename(self.basename, filename)
+        if self._filename is None:
             # We only got a filename (without directory) or a relative path
             # from the user, so we append that to the default directory and
             # try again.
-            self._create_full_filename(os.path.join(_download_dir(), filename))
+            self._filename = create_full_filename(
+                self.basename, os.path.join(download_dir(), filename))
+
+        self.basename = os.path.basename(self._filename)
+        last_used_directory = os.path.dirname(self._filename)
 
         log.downloads.debug("Setting filename to {}".format(filename))
         if os.path.isfile(self._filename):
             # The file already exists, so ask the user if it should be
             # overwritten.
-            self._ask_overwrite_question()
+            txt = self._filename + " already exists. Overwrite?"
+            self._ask_confirm_question(txt)
+        # FIFO, device node, etc. Make sure we want to do this
+        elif (os.path.exists(self._filename) and not
+                os.path.isdir(self._filename)):
+            txt = (self._filename + " already exists and is a special file. "
+                   "Write to this?")
+            self._ask_confirm_question(txt)
         else:
             self._create_fileobj()
 
-    def _create_full_filename(self, filename):
-        """Try to create the full filename.
-
-        Return:
-            True if the full filename was created, False otherwise.
-        """
-        if os.path.isabs(filename) and os.path.isdir(filename):
-            # We got an absolute directory from the user, so we save it under
-            # the default filename in that directory.
-            self._filename = os.path.join(filename, self.basename)
-            return True
-        elif os.path.isabs(filename):
-            # We got an absolute filename from the user, so we save it under
-            # that filename.
-            self._filename = filename
-            self.basename = os.path.basename(self._filename)
-            return True
-        return False
-
     def set_fileobj(self, fileobj):
         """"Set the file object to write the download to.
 
@@ -566,6 +649,15 @@ class DownloadItem(QObject):
         if data is not None:
             self._buffer.write(data)
 
+    @pyqtSlot()
+    def on_meta_data_changed(self):
+        """Update the download's metadata."""
+        if self.reply is None:
+            return
+        self.raw_headers = {}
+        for key, value in self.reply.rawHeaderPairs():
+            self.raw_headers[bytes(key)] = bytes(value)
+
     def _handle_redirect(self):
         """Handle a HTTP redirect.
 
@@ -617,32 +709,33 @@ class DownloadManager(QAbstractListModel):
         self.questions = []
         self._networkmanager = networkmanager.NetworkManager(
             win_id, None, self)
+        self._update_timer = usertypes.Timer(self, 'download-update')
+        self._update_timer.timeout.connect(self.update_gui)
+        self._update_timer.setInterval(REFRESH_INTERVAL)
 
     def __repr__(self):
         return utils.get_repr(self, downloads=len(self.downloads))
 
-    def _prepare_question(self):
-        """Prepare a Question object to be asked."""
-        q = usertypes.Question(self)
-        q.text = "Save file to:"
-        q.mode = usertypes.PromptMode.text
-        q.completed.connect(q.deleteLater)
+    def _postprocess_question(self, q):
+        """Postprocess a Question object that is asked."""
         q.destroyed.connect(functools.partial(self.questions.remove, q))
         self.questions.append(q)
-        return q
+
+    @pyqtSlot()
+    def update_gui(self):
+        """Periodical GUI update of all items."""
+        assert self.downloads
+        for dl in self.downloads:
+            dl.stats.update_speed()
+        self.dataChanged.emit(self.index(0), self.last_index())
 
     @pyqtSlot('QUrl', 'QWebPage')
-    def get(self, url, page=None, fileobj=None, filename=None,
-            auto_remove=False):
+    def get(self, url, **kwargs):
         """Start a download with a link URL.
 
         Args:
             url: The URL to get, as QUrl
-            page: The QWebPage to get the download from.
-            fileobj: The file object to write the answer to.
-            filename: A path to write the data to.
-            auto_remove: Whether to remove the download even if
-                         ui -> remove-finished-downloads is set to false.
+            **kwargs: passed to get_request().
 
         Return:
             If the download could start immediately, (fileobj/filename given),
@@ -650,25 +743,24 @@ class DownloadManager(QAbstractListModel):
 
             If not, None.
         """
-        if fileobj is not None and filename is not None:
-            raise TypeError("Only one of fileobj/filename may be given!")
         if not url.isValid():
             urlutils.invalid_url_error(self._win_id, url, "start download")
             return
         req = QNetworkRequest(url)
-        return self.get_request(req, page, fileobj, filename, auto_remove)
+        return self.get_request(req, **kwargs)
 
-    def get_request(self, request, page=None, fileobj=None, filename=None,
-                    auto_remove=False):
+    def get_request(self, request, *, fileobj=None, filename=None,
+                    prompt_download_directory=None, **kwargs):
         """Start a download with a QNetworkRequest.
 
         Args:
             request: The QNetworkRequest to download.
-            page: The QWebPage to use.
             fileobj: The file object to write the answer to.
             filename: A path to write the data to.
-            auto_remove: Whether to remove the download even if
-                         ui -> remove-finished-downloads is set to false.
+            prompt_download_directory: Whether to prompt for the download dir
+                                       or automatically download. If None, the
+                                       config is used.
+            **kwargs: Passed to fetch_request.
 
         Return:
             If the download could start immediately, (fileobj/filename given),
@@ -679,37 +771,40 @@ class DownloadManager(QAbstractListModel):
         if fileobj is not None and filename is not None:
             raise TypeError("Only one of fileobj/filename may be given!")
         # WORKAROUND for Qt corrupting data loaded from cache:
-        # https://bugreports.qt-project.org/browse/QTBUG-42757
+        # https://bugreports.qt.io/browse/QTBUG-42757
         request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
                              QNetworkRequest.AlwaysNetwork)
         suggested_fn = urlutils.filename_from_url(request.url())
+
+        # We won't need a question if a filename or fileobj is already given
+        if fileobj is None and filename is None:
+            filename, q = ask_for_filename(
+                suggested_fn, self._win_id, parent=self,
+                prompt_download_directory=prompt_download_directory
+            )
+
         if fileobj is not None or filename is not None:
-            return self.fetch_request(request, page, fileobj, filename,
-                                      auto_remove, suggested_fn)
-        encoding = sys.getfilesystemencoding()
-        suggested_fn = utils.force_encoding(suggested_fn, encoding)
-        q = self._prepare_question()
-        q.default = _path_suggestion(suggested_fn)
-        message_bridge = objreg.get('message-bridge', scope='window',
-                                    window=self._win_id)
+            return self.fetch_request(request,
+                                      fileobj=fileobj,
+                                      filename=filename,
+                                      suggested_filename=suggested_fn,
+                                      **kwargs)
         q.answered.connect(
-            lambda fn: self.fetch_request(request, page, filename=fn,
-                                          auto_remove=auto_remove,
-                                          suggested_filename=suggested_fn))
-        message_bridge.ask(q, blocking=False)
+            lambda fn: self.fetch_request(request,
+                                          filename=fn,
+                                          suggested_filename=suggested_fn,
+                                          **kwargs))
+        self._postprocess_question(q)
+        q.ask()
         return None
 
-    def fetch_request(self, request, page=None, fileobj=None, filename=None,
-                      auto_remove=False, suggested_filename=None):
+    def fetch_request(self, request, *, page=None, **kwargs):
         """Download a QNetworkRequest to disk.
 
         Args:
             request: The QNetworkRequest to download.
             page: The QWebPage to use.
-            fileobj: The file object to write the answer to.
-            filename: A path to write the data to.
-            auto_remove: Whether to remove the download even if
-                         ui -> remove-finished-downloads is set to false.
+            **kwargs: passed to fetch().
 
         Return:
             The created DownloadItem.
@@ -719,12 +814,11 @@ class DownloadManager(QAbstractListModel):
         else:
             nam = page.networkAccessManager()
         reply = nam.get(request)
-        return self.fetch(reply, fileobj, filename, auto_remove,
-                          suggested_filename)
+        return self.fetch(reply, **kwargs)
 
     @pyqtSlot('QNetworkReply')
-    def fetch(self, reply, fileobj=None, filename=None, auto_remove=False,
-              suggested_filename=None):
+    def fetch(self, reply, *, fileobj=None, filename=None, auto_remove=False,
+              suggested_filename=None, prompt_download_directory=None):
         """Download a QNetworkReply to disk.
 
         Args:
@@ -732,7 +826,7 @@ class DownloadManager(QAbstractListModel):
             fileobj: The file object to write the answer to.
             filename: A path to write the data to.
             auto_remove: Whether to remove the download even if
-                         ui -> remove-finished-downloads is set to false.
+                         ui -> remove-finished-downloads is set to -1.
 
         Return:
             The created DownloadItem.
@@ -751,9 +845,15 @@ class DownloadManager(QAbstractListModel):
         download = DownloadItem(reply, self._win_id, self)
         download.cancelled.connect(
             functools.partial(self.remove_item, download))
-        if config.get('ui', 'remove-finished-downloads') or auto_remove:
+
+        delay = config.get('ui', 'remove-finished-downloads')
+        if delay > -1:
+            download.finished.connect(
+                functools.partial(self.remove_item_delayed, download, delay))
+        elif auto_remove:
             download.finished.connect(
                 functools.partial(self.remove_item, download))
+
         download.data_changed.connect(
             functools.partial(self.on_data_changed, download))
         download.error.connect(self.on_error)
@@ -766,21 +866,36 @@ class DownloadManager(QAbstractListModel):
         self.downloads.append(download)
         self.endInsertRows()
 
-        if filename is not None:
-            download.set_filename(filename)
-        elif fileobj is not None:
+        if not self._update_timer.isActive():
+            self._update_timer.start()
+
+        if fileobj is not None:
             download.set_fileobj(fileobj)
             download.autoclose = False
-        else:
-            q = self._prepare_question()
-            q.default = _path_suggestion(suggested_filename)
-            q.answered.connect(download.set_filename)
-            q.cancelled.connect(download.cancel)
-            download.cancelled.connect(q.abort)
-            download.error.connect(q.abort)
-            message_bridge = objreg.get('message-bridge', scope='window',
-                                        window=self._win_id)
-            message_bridge.ask(q, blocking=False)
+            return download
+
+        if filename is not None:
+            download.set_filename(filename)
+            return download
+
+        # Neither filename nor fileobj were given, prepare a question
+        filename, q = ask_for_filename(
+            suggested_filename, self._win_id, parent=self,
+            prompt_download_directory=prompt_download_directory,
+        )
+
+        # User doesn't want to be asked, so just use the download_dir
+        if filename is not None:
+            download.set_filename(filename)
+            return download
+
+        # Ask the user for a filename
+        self._postprocess_question(q)
+        q.answered.connect(download.set_filename)
+        q.cancelled.connect(download.cancel)
+        download.cancelled.connect(q.abort)
+        download.error.connect(q.abort)
+        q.ask()
 
         return download
 
@@ -794,8 +909,9 @@ class DownloadManager(QAbstractListModel):
             raise cmdexc.CommandError("There's no download!")
         raise cmdexc.CommandError("There's no download {}!".format(count))
 
-    @cmdutils.register(instance='download-manager', scope='window')
-    def download_cancel(self, count: {'special': 'count'}=0):
+    @cmdutils.register(instance='download-manager', scope='window',
+                       count='count')
+    def download_cancel(self, count=0):
         """Cancel the last/[count]th download.
 
         Args:
@@ -812,8 +928,9 @@ class DownloadManager(QAbstractListModel):
                                       .format(count))
         download.cancel()
 
-    @cmdutils.register(instance='download-manager', scope='window')
-    def download_delete(self, count: {'special': 'count'}=0):
+    @cmdutils.register(instance='download-manager', scope='window',
+                       count='count')
+    def download_delete(self, count=0):
         """Delete the last/[count]th download from disk.
 
         Args:
@@ -831,17 +948,8 @@ class DownloadManager(QAbstractListModel):
         self.remove_item(download)
 
     @cmdutils.register(instance='download-manager', scope='window',
-                       deprecated="Use :download-cancel instead.")
-    def cancel_download(self, count: {'special': 'count'}=1):
-        """Cancel the first/[count]th download.
-
-        Args:
-            count: The index of the download to cancel.
-        """
-        self.download_cancel(count)
-
-    @cmdutils.register(instance='download-manager', scope='window')
-    def download_open(self, count: {'special': 'count'}=0):
+                       count='count')
+    def download_open(self, count=0):
         """Open the last/[count]th download.
 
         Args:
@@ -857,6 +965,31 @@ class DownloadManager(QAbstractListModel):
             raise cmdexc.CommandError("Download {} is not done!".format(count))
         download.open_file()
 
+    @cmdutils.register(instance='download-manager', scope='window',
+                       count='count')
+    def download_retry(self, count=0):
+        """Retry the first failed/[count]th download.
+
+        Args:
+            count: The index of the download to cancel.
+        """
+        if count:
+            try:
+                download = self.downloads[count - 1]
+            except IndexError:
+                self.raise_no_download(count)
+            if download.successful or not download.done:
+                raise cmdexc.CommandError("Download {} did not fail!".format(
+                    count))
+        else:
+            to_retry = [d for d in self.downloads
+                        if d.done and not d.successful]
+            if not to_retry:
+                raise cmdexc.CommandError("No failed downloads!")
+            else:
+                download = to_retry[0]
+        download.retry()
+
     @pyqtSlot(QNetworkRequest, QNetworkReply)
     def on_redirect(self, download, request, reply):
         """Handle a HTTP redirect of a download.
@@ -913,17 +1046,24 @@ class DownloadManager(QAbstractListModel):
         return any(download.done for download in self.downloads)
 
     @cmdutils.register(instance='download-manager', scope='window')
-    def download_remove(self, all_: {'name': 'all'}=False,
-                        count: {'special': 'count'}=0):
+    def download_clear(self):
+        """Remove all finished downloads from the list."""
+        finished_items = [d for d in self.downloads if d.done]
+        self.remove_items(finished_items)
+
+    @cmdutils.register(instance='download-manager', scope='window',
+                       count='count')
+    def download_remove(self, all_=False, count=0):
         """Remove the last/[count]th download from the list.
 
         Args:
-            all_: If given removes all finished downloads.
+            all_: Deprecated argument for removing all finished downloads.
             count: The index of the download to cancel.
         """
         if all_:
-            finished_items = [d for d in self.downloads if d.done]
-            self.remove_items(finished_items)
+            message.warning(self._win_id, ":download-remove --all is "
+                            "deprecated - use :download-clear instead!")
+            self.download_clear()
         else:
             try:
                 download = self.downloads[count - 1]
@@ -957,6 +1097,12 @@ class DownloadManager(QAbstractListModel):
         self.endRemoveRows()
         download.deleteLater()
         self.update_indexes()
+        if not self.downloads:
+            self._update_timer.stop()
+
+    def remove_item_delayed(self, download, delay):
+        """Remove a given download after a short delay."""
+        QTimer.singleShot(delay, functools.partial(self.remove_item, download))
 
     def remove_items(self, downloads):
         """Remove an iterable of downloads."""
@@ -985,6 +1131,8 @@ class DownloadManager(QAbstractListModel):
             else:
                 download.deleteLater()
         self.endRemoveRows()
+        if not self.downloads:
+            self._update_timer.stop()
 
     def update_indexes(self):
         """Update indexes of all DownloadItems."""
@@ -1016,9 +1164,9 @@ class DownloadManager(QAbstractListModel):
         if role == Qt.DisplayRole:
             data = str(item)
         elif role == Qt.ForegroundRole:
-            data = config.get('colors', 'downloads.fg')
+            data = item.get_status_color('fg')
         elif role == Qt.BackgroundRole:
-            data = item.bg_color()
+            data = item.get_status_color('bg')
         elif role == ModelRole.item:
             data = item
         elif role == Qt.ToolTipRole:
@@ -1034,7 +1182,7 @@ class DownloadManager(QAbstractListModel):
         """Override flags so items aren't selectable.
 
         The default would be Qt.ItemIsEnabled | Qt.ItemIsSelectable."""
-        return Qt.ItemIsEnabled
+        return Qt.ItemIsEnabled | Qt.ItemNeverHasChildren
 
     def rowCount(self, parent=QModelIndex()):
         """Get count of active downloads."""

qutebrowser/browser/downloadview.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -64,8 +64,8 @@ class DownloadView(QListView):
 
     STYLESHEET = """
         QListView {
-            {{ color['downloads.bg.bar'] }}
-            {{ font['downloads'] }}
+            background-color: {{ color['downloads.bg.bar'] }};
+            font: {{ font['downloads'] }};
         }
 
         QListView::item {
@@ -125,6 +125,7 @@ class DownloadView(QListView):
                 - (QAction, callable) tuples.
                 - (None, None) for a separator
         """
+        model = self.model()
         actions = []
         if item is None:
             pass
@@ -134,13 +135,12 @@ class DownloadView(QListView):
             else:
                 actions.append(("Retry", item.retry))
             actions.append(("Remove",
-                            functools.partial(self.model().remove_item, item)))
+                            functools.partial(model.remove_item, item)))
         else:
             actions.append(("Cancel", item.cancel))
-        if self.model().can_clear():
+        if model.can_clear():
             actions.append((None, None))
-            actions.append(("Remove all finished", functools.partial(
-                self.model().download_remove, True)))
+            actions.append(("Remove all finished", model.download_clear))
         return actions
 
     @pyqtSlot('QPoint')

qutebrowser/browser/hints.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -21,7 +21,6 @@
 
 import math
 import functools
-import subprocess
 import collections
 
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QEvent, Qt, QUrl,
@@ -36,15 +35,16 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.browser import webelem
 from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
 from qutebrowser.utils import usertypes, log, qtutils, message, objreg
+from qutebrowser.misc import guiprocess
 
 
 ElemTuple = collections.namedtuple('ElemTuple', ['elem', 'label'])
 
 
-Target = usertypes.enum('Target', ['normal', 'tab', 'tab_bg', 'window', 'yank',
-                                   'yank_primary', 'run', 'fill', 'hover',
-                                   'rapid', 'rapid_win', 'download',
-                                   'userscript', 'spawn'])
+Target = usertypes.enum('Target', ['normal', 'tab', 'tab_fg', 'tab_bg',
+                                   'window', 'yank', 'yank_primary', 'run',
+                                   'fill', 'hover', 'download', 'userscript',
+                                   'spawn'])
 
 
 @pyqtSlot(usertypes.KeyMode)
@@ -65,11 +65,10 @@ class HintContext:
         elems: A mapping from key strings to (elem, label) namedtuples.
         baseurl: The URL of the current page.
         target: What to do with the opened links.
-                normal/tab/tab_bg/window: Get passed to BrowserTab.
+                normal/tab/tab_fg/tab_bg/window: Get passed to BrowserTab.
                 yank/yank_primary: Yank to clipboard/primary selection.
                 run: Run a command.
                 fill: Fill commandline with link.
-                rapid: Rapid mode with background tabs
                 download: Download the link.
                 userscript: Call a custom userscript.
                 spawn: Spawn a simple command.
@@ -117,13 +116,14 @@ class HintManager(QObject):
         mouse_event: Mouse event to be posted in the web view.
                      arg: A QMouseEvent
         start_hinting: Emitted when hinting starts, before a link is clicked.
-                       arg: The hinting target name.
+                       arg: The ClickTarget to use.
         stop_hinting: Emitted after a link was clicked.
     """
 
     HINT_TEXTS = {
         Target.normal: "Follow hint",
         Target.tab: "Follow hint in new tab",
+        Target.tab_fg: "Follow hint in foreground tab",
         Target.tab_bg: "Follow hint in background tab",
         Target.window: "Follow hint in new window",
         Target.yank: "Yank hint to clipboard",
@@ -137,7 +137,7 @@ class HintManager(QObject):
     }
 
     mouse_event = pyqtSignal('QMouseEvent')
-    start_hinting = pyqtSignal(str)
+    start_hinting = pyqtSignal(usertypes.ClickTarget)
     stop_hinting = pyqtSignal()
 
     def __init__(self, win_id, tab_id, parent=None):
@@ -413,22 +413,28 @@ class HintManager(QObject):
             elem: The QWebElement to click.
             context: The HintContext to use.
         """
-        if context.target == Target.rapid:
-            target = Target.tab_bg
-        elif context.target == Target.rapid_win:
-            target = Target.window
+        target_mapping = {
+            Target.normal: usertypes.ClickTarget.normal,
+            Target.tab_fg: usertypes.ClickTarget.tab,
+            Target.tab_bg: usertypes.ClickTarget.tab_bg,
+            Target.window: usertypes.ClickTarget.window,
+            Target.hover: usertypes.ClickTarget.normal,
+        }
+        if config.get('tabs', 'background-tabs'):
+            target_mapping[Target.tab] = usertypes.ClickTarget.tab_bg
         else:
-            target = context.target
+            target_mapping[Target.tab] = usertypes.ClickTarget.tab
         # FIXME Instead of clicking the center, we could have nicer heuristics.
         # e.g. parse (-webkit-)border-radius correctly and click text fields at
         # the bottom right, and everything else on the top left or so.
         # https://github.com/The-Compiler/qutebrowser/issues/70
         pos = elem.rect_on_view().center()
-        action = "Hovering" if target == Target.hover else "Clicking"
+        action = "Hovering" if context.target == Target.hover else "Clicking"
         log.hints.debug("{} on '{}' at {}/{}".format(
             action, elem, pos.x(), pos.y()))
-        self.start_hinting.emit(target.name)
-        if target in (Target.tab, Target.tab_bg, Target.window):
+        self.start_hinting.emit(target_mapping[context.target])
+        if context.target in [Target.tab, Target.tab_fg, Target.tab_bg,
+                              Target.window]:
             modifiers = Qt.ControlModifier
         else:
             modifiers = Qt.NoModifier
@@ -436,7 +442,7 @@ class HintManager(QObject):
             QMouseEvent(QEvent.MouseMove, pos, Qt.NoButton, Qt.NoButton,
                         Qt.NoModifier),
         ]
-        if target != Target.hover:
+        if context.target != Target.hover:
             events += [
                 QMouseEvent(QEvent.MouseButtonPress, pos, Qt.LeftButton,
                             Qt.LeftButton, modifiers),
@@ -505,12 +511,18 @@ class HintManager(QObject):
         if url is None:
             self._show_url_error()
             return
+        if context.rapid:
+            prompt = False
+        else:
+            prompt = None
+
         download_manager = objreg.get('download-manager', scope='window',
                                       window=self._win_id)
-        download_manager.get(url, elem.webFrame().page())
+        download_manager.get(url, page=elem.webFrame().page(),
+                             prompt_download_directory=prompt)
 
     def _call_userscript(self, elem, context):
-        """Call an userscript from a hint.
+        """Call a userscript from a hint.
 
         Args:
             elem: The QWebElement to use in the userscript.
@@ -523,12 +535,11 @@ class HintManager(QObject):
             'QUTE_MODE': 'hints',
             'QUTE_SELECTED_TEXT': str(elem),
             'QUTE_SELECTED_HTML': elem.toOuterXml(),
-            'QUTE_HTML': frame.toHtml(),
-            'QUTE_TEXT': frame.toPlainText(),
         }
         url = self._resolve_url(elem, context.baseurl)
         if url is not None:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
+        env.update(userscripts.store_source(frame))
         userscripts.run(cmd, *args, win_id=self._win_id, env=env)
 
     def _spawn(self, url, context):
@@ -540,11 +551,9 @@ class HintManager(QObject):
         """
         urlstr = url.toString(QUrl.FullyEncoded | QUrl.RemovePassword)
         args = context.get_args(urlstr)
-        try:
-            subprocess.Popen(args)
-        except OSError as e:
-            msg = "Error while spawning command: {}".format(e)
-            message.error(self._win_id, msg, immediately=True)
+        cmd, *args = args
+        proc = guiprocess.GUIProcess(self._win_id, what='command', parent=self)
+        proc.start(cmd, args)
 
     def _resolve_url(self, elem, baseurl):
         """Resolve a URL and check if we want to keep it.
@@ -590,13 +599,16 @@ class HintManager(QObject):
         # Then check for regular links/buttons.
         elems = frame.findAllElements(
             webelem.SELECTORS[webelem.Group.prevnext])
+        elems = [webelem.WebElementWrapper(e) for e in elems]
+        filterfunc = webelem.FILTERS[webelem.Group.prevnext]
+        elems = [e for e in elems if filterfunc(e)]
+
         option = 'prev-regexes' if prev else 'next-regexes'
         if not elems:
             return None
         for regex in config.get('hints', option):
             log.hints.vdebug("== Checking regex '{}'.".format(regex.pattern))
             for e in elems:
-                e = webelem.WebElementWrapper(e)
                 text = str(e)
                 if not text:
                     continue
@@ -694,15 +706,16 @@ class HintManager(QObject):
                                  tab=self._tab_id)
             webview.openurl(url)
 
-    @cmdutils.register(instance='hintmanager', scope='tab', name='hint')
+    @cmdutils.register(instance='hintmanager', scope='tab', name='hint',
+                       win_id='win_id')
     def start(self, rapid=False, group=webelem.Group.all, target=Target.normal,
-              *args: {'nargs': '*'}, win_id: {'special': 'win_id'}):
+              *args: {'nargs': '*'}, win_id):
         """Start hinting.
 
         Args:
             rapid: Whether to do rapid hinting. This is only possible with
-                   targets `tab-bg`, `window`, `run`, `hover`, `userscript` and
-                   `spawn`.
+                   targets `tab` (with background-tabs=true), `tab-bg`,
+                   `window`, `run`, `hover`, `userscript` and `spawn`.
             group: The hinting mode to use.
 
                 - `all`: All clickable elements.
@@ -712,7 +725,9 @@ class HintManager(QObject):
             target: What to do with the selected element.
 
                 - `normal`: Open the link in the current tab.
-                - `tab`: Open the link in a new tab.
+                - `tab`: Open the link in a new tab (honoring the
+                         background-tabs setting).
+                - `tab-fg`: Open the link in a new foreground tab.
                 - `tab-bg`: Open the link in a new background tab.
                 - `window`: Open the link in a new window.
                 - `hover` : Hover over the link.
@@ -722,7 +737,7 @@ class HintManager(QObject):
                 - `fill`: Fill the commandline with the command given as
                           argument.
                 - `download`: Download the link.
-                - `userscript`: Call an userscript with `$QUTE_URL` set to the
+                - `userscript`: Call a userscript with `$QUTE_URL` set to the
                                 link.
                 - `spawn`: Spawn a command.
 
@@ -731,7 +746,11 @@ class HintManager(QObject):
                 - With `spawn`: The executable and arguments to spawn.
                                 `{hint-url}` will get replaced by the selected
                                 URL.
-                - With `userscript`: The userscript to execute.
+                - With `userscript`: The userscript to execute. Either store
+                                     the userscript in
+                                     `~/.local/share/qutebrowser/userscripts`
+                                     (or `$XDG_DATA_DIR`), or use an absolute
+                                     path.
                 - With `fill`: The command to fill the statusbar with.
                                 `{hint-url}` will get replaced by the selected
                                 URL.
@@ -748,14 +767,20 @@ class HintManager(QObject):
         mode_manager = objreg.get('mode-manager', scope='window',
                                   window=self._win_id)
         if mode_manager.mode == usertypes.KeyMode.hint:
-            raise cmdexc.CommandError("Already hinting!")
+            modeman.leave(win_id, usertypes.KeyMode.hint, 're-hinting')
 
-        if rapid and target not in (Target.tab_bg, Target.window, Target.run,
-                                    Target.hover, Target.userscript,
-                                    Target.spawn):
-            name = target.name.replace('_', '-')
-            raise cmdexc.CommandError("Rapid hinting makes no sense with "
-                                      "target {}!".format(name))
+        if rapid:
+            if target in [Target.tab_bg, Target.window, Target.run,
+                          Target.hover, Target.userscript, Target.spawn,
+                          Target.download]:
+                pass
+            elif (target == Target.tab and
+                  config.get('tabs', 'background-tabs')):
+                pass
+            else:
+                name = target.name.replace('_', '-')
+                raise cmdexc.CommandError("Rapid hinting makes no sense with "
+                                          "target {}!".format(name))
 
         self._check_args(target, *args)
         self._context = HintContext()
@@ -774,7 +799,6 @@ class HintManager(QObject):
         self._context.args = args
         self._context.mainframe = mainframe
         self._context.group = group
-        self._handle_old_rapid_targets(win_id)
         self._init_elements()
         message_bridge = objreg.get('message-bridge', scope='window',
                                     window=self._win_id)
@@ -783,29 +807,6 @@ class HintManager(QObject):
         modeman.enter(self._win_id, usertypes.KeyMode.hint,
                       'HintManager.start')
 
-    def _handle_old_rapid_targets(self, win_id):
-        """Switch to the new way for rapid hinting with a rapid target.
-
-        Args:
-            win_id: The window ID to display the warning in.
-
-        DEPRECATED.
-        """
-        old_rapid_targets = {
-            Target.rapid: Target.tab_bg,
-            Target.rapid_win: Target.window,
-        }
-        target = self._context.target
-        if target in old_rapid_targets:
-            self._context.target = old_rapid_targets[target]
-            self._context.rapid = True
-            name = target.name.replace('_', '-')
-            group_name = self._context.group.name.replace('_', '-')
-            new_name = self._context.target.name.replace('_', '-')
-            message.warning(
-                win_id, ':hint with target {} is deprecated, use :hint '
-                '--rapid {} {} instead!'.format(name, group_name, new_name))
-
     def handle_partial_key(self, keystr):
         """Handle a new partial keypress."""
         log.hints.debug("Handling new keystring: '{}'".format(keystr))
@@ -831,12 +832,12 @@ class HintManager(QObject):
         """Filter displayed hints according to a text.
 
         Args:
-            filterstr: The string to filer with, or None to show all.
+            filterstr: The string to filter with, or None to show all.
         """
         for elems in self._context.elems.values():
             try:
                 if (filterstr is None or
-                        str(elems.elem).lower().startswith(filterstr)):
+                        filterstr.casefold() in str(elems.elem).casefold()):
                     if self._is_hidden(elems.label):
                         # hidden element which matches again -> show it
                         self._show_elem(elems.label)
@@ -874,6 +875,7 @@ class HintManager(QObject):
         elem_handlers = {
             Target.normal: self._click,
             Target.tab: self._click,
+            Target.tab_fg: self._click,
             Target.tab_bg: self._click,
             Target.window: self._click,
             Target.hover: self._click,
@@ -917,12 +919,22 @@ class HintManager(QObject):
                 elems.label.setInnerXml(string)
         handler()
 
-    @cmdutils.register(instance='hintmanager', scope='tab', hide=True)
-    def follow_hint(self):
-        """Follow the currently selected hint."""
-        if not self._context.to_follow:
-            raise cmdexc.CommandError("No hint to follow")
-        self.fire(self._context.to_follow, force=True)
+    @cmdutils.register(instance='hintmanager', scope='tab', hide=True,
+                       modes=[usertypes.KeyMode.hint])
+    def follow_hint(self, keystring=None):
+        """Follow a hint.
+
+        Args:
+            keystring: The hint to follow, or None.
+        """
+        if keystring is None:
+            if self._context.to_follow is None:
+                raise cmdexc.CommandError("No hint to follow")
+            else:
+                keystring = self._context.to_follow
+        elif keystring not in self._context.elems:
+            raise cmdexc.CommandError("No hint {}!".format(keystring))
+        self.fire(keystring, force=True)
 
     @pyqtSlot('QSize')
     def on_contents_size_changed(self, _size):

qutebrowser/browser/history.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -52,11 +52,6 @@ class HistoryEntry:
     def __str__(self):
         return '{} {}'.format(int(self.atime), self.url_string)
 
-    @classmethod
-    def from_str(cls, s):
-        """Get a history based on a 'TIME URL' string."""
-        return cls(*s.split(' ', maxsplit=1))
-
 
 class WebHistory(QWebHistoryInterface):
 
@@ -67,41 +62,30 @@ class WebHistory(QWebHistoryInterface):
         _history_dict: An OrderedDict of URLs read from the on-disk history.
         _new_history: A list of HistoryEntry items of the current session.
         _saved_count: How many HistoryEntries have been written to disk.
+        _initial_read_started: Whether async_read was called.
+        _initial_read_done: Whether async_read has completed.
+        _temp_history: OrderedDict of temporary history entries before
+                       async_read was called.
 
     Signals:
-        item_about_to_be_added: Emitted before a new HistoryEntry is added.
-                                arg: The new HistoryEntry.
+        add_completion_item: Emitted before a new HistoryEntry is added.
+                             arg: The new HistoryEntry.
         item_added: Emitted after a new HistoryEntry is added.
                     arg: The new HistoryEntry.
     """
 
-    item_about_to_be_added = pyqtSignal(HistoryEntry)
+    add_completion_item = pyqtSignal(HistoryEntry)
     item_added = pyqtSignal(HistoryEntry)
+    async_read_done = pyqtSignal()
 
     def __init__(self, parent=None):
         super().__init__(parent)
+        self._initial_read_started = False
+        self._initial_read_done = False
         self._lineparser = lineparser.AppendLineParser(
             standarddir.data(), 'history', parent=self)
         self._history_dict = collections.OrderedDict()
-        with self._lineparser.open():
-            for line in self._lineparser:
-                data = line.rstrip().split(maxsplit=1)
-                if not data:
-                    # empty line
-                    continue
-                elif len(data) != 2:
-                    # other malformed line
-                    log.init.warning("Invalid history entry {!r}!".format(
-                        line))
-                    continue
-                atime, url = data
-                # This de-duplicates history entries; only the latest
-                # entry for each URL is kept. If you want to keep
-                # information about previous hits change the items in
-                # old_urls to be lists or change HistoryEntry to have a
-                # list of atimes.
-                self._history_dict[url] = HistoryEntry(atime, url)
-                self._history_dict.move_to_end(url)
+        self._temp_history = collections.OrderedDict()
         self._new_history = []
         self._saved_count = 0
         objreg.get('save-manager').add_saveable(
@@ -119,6 +103,60 @@ class WebHistory(QWebHistoryInterface):
     def __len__(self):
         return len(self._history_dict)
 
+    def async_read(self):
+        """Read the initial history."""
+        if self._initial_read_started:
+            log.init.debug("Ignoring async_read() because reading is started.")
+            return
+        self._initial_read_started = True
+
+        if standarddir.data() is None:
+            self._initial_read_done = True
+            self.async_read_done.emit()
+            return
+
+        with self._lineparser.open():
+            for line in self._lineparser:
+                yield
+                data = line.rstrip().split(maxsplit=1)
+                if not data:
+                    # empty line
+                    continue
+                elif len(data) != 2:
+                    # other malformed line
+                    log.init.warning("Invalid history entry {!r}!".format(
+                        line))
+                    continue
+                atime, url = data
+                if atime.startswith('\0'):
+                    log.init.warning(
+                        "Removing NUL bytes from entry {!r} - see "
+                        "https://github.com/The-Compiler/qutebrowser/issues/"
+                        "670".format(data))
+                    atime = atime.lstrip('\0')
+                # This de-duplicates history entries; only the latest
+                # entry for each URL is kept. If you want to keep
+                # information about previous hits change the items in
+                # old_urls to be lists or change HistoryEntry to have a
+                # list of atimes.
+                entry = HistoryEntry(atime, url)
+                self._add_entry(entry)
+
+        self._initial_read_done = True
+        self.async_read_done.emit()
+
+        for url, entry in self._temp_history.items():
+            self._new_history.append(entry)
+            self._add_entry(entry)
+            self.add_completion_item.emit(entry)
+
+    def _add_entry(self, entry, target=None):
+        """Add an entry to self._history_dict or another given OrderedDict."""
+        if target is None:
+            target = self._history_dict
+        target[entry.url_string] = entry
+        target.move_to_end(entry.url_string)
+
     def get_recent(self):
         """Get the most recent history entries."""
         old = self._lineparser.get_recent()
@@ -139,13 +177,16 @@ class WebHistory(QWebHistoryInterface):
         """
         if not url_string:
             return
-        if not config.get('general', 'private-browsing'):
-            entry = HistoryEntry(time.time(), url_string)
-            self.item_about_to_be_added.emit(entry)
+        if config.get('general', 'private-browsing'):
+            return
+        entry = HistoryEntry(time.time(), url_string)
+        if self._initial_read_done:
+            self.add_completion_item.emit(entry)
             self._new_history.append(entry)
-            self._history_dict[url_string] = entry
-            self._history_dict.move_to_end(url_string)
+            self._add_entry(entry)
             self.item_added.emit(entry)
+        else:
+            self._add_entry(entry, target=self._temp_history)
 
     def historyContains(self, url_string):
         """Called by WebKit to determine if an URL is contained in the history.

qutebrowser/browser/http.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Other utilities which don't fit anywhere else."""
+"""Parsing functions for various HTTP headers."""
 
 
 import os.path
@@ -46,16 +46,19 @@ def parse_content_disposition(reply):
         # We use the unsafe variant of the filename as we sanitize it via
         # os.path.basename later.
         try:
-            content_disposition = rfc6266.parse_headers(
-                bytes(reply.rawHeader(content_disposition_header)))
+            value = bytes(reply.rawHeader(content_disposition_header))
+            log.rfc6266.debug("Parsing Content-Disposition: {}".format(value))
+            content_disposition = rfc6266.parse_headers(value)
             filename = content_disposition.filename()
-        except UnicodeDecodeError:
-            log.rfc6266.exception("Error while decoding filename")
+        except (SyntaxError, UnicodeDecodeError, rfc6266.Error):
+            log.rfc6266.exception("Error while parsing filename")
         else:
             is_inline = content_disposition.is_inline()
     # Then try to get filename from url
     if not filename:
-        filename = reply.url().path()
+        path = reply.url().path()
+        if path is not None:
+            filename = path.rstrip('/')
     # If that fails as well, use a fallback
     if not filename:
         filename = 'qutebrowser-download'

qutebrowser/browser/inspector.py

@@ -0,0 +1,61 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Customized QWebInspector."""
+
+import base64
+import binascii
+
+from PyQt5.QtWebKitWidgets import QWebInspector
+
+from qutebrowser.utils import log, objreg
+
+
+class WebInspector(QWebInspector):
+
+    """A customized WebInspector which stores its geometry."""
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self._load_state_geometry()
+
+    def closeEvent(self, e):
+        """Save the geometry when closed."""
+        state_config = objreg.get('state-config')
+        data = bytes(self.saveGeometry())
+        geom = base64.b64encode(data).decode('ASCII')
+        state_config['geometry']['inspector'] = geom
+        super().closeEvent(e)
+
+    def _load_state_geometry(self):
+        """Load the geometry from the state file."""
+        state_config = objreg.get('state-config')
+        try:
+            data = state_config['geometry']['inspector']
+            geom = base64.b64decode(data, validate=True)
+        except KeyError:
+            # First start
+            pass
+        except binascii.Error:
+            log.misc.exception("Error while reading geometry")
+        else:
+            log.init.debug("Loading geometry from {}".format(geom))
+            ok = self.restoreGeometry(geom)
+            if not ok:
+                log.init.warning("Error while loading geometry.")

qutebrowser/browser/mhtml.py

@@ -0,0 +1,532 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015-2016 Daniel Schadt
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Utils for writing a MHTML file."""
+
+import functools
+import io
+import os
+import re
+import sys
+import collections
+import uuid
+import email.policy
+import email.generator
+import email.encoders
+import email.mime.multipart
+import email.message
+
+from PyQt5.QtCore import QUrl
+
+from qutebrowser.browser import webelem, downloads
+from qutebrowser.utils import log, objreg, message, usertypes, utils, urlutils
+
+try:
+    import cssutils
+except (ImportError, re.error):
+    # Catching re.error because cssutils in earlier releases (<= 1.0) is broken
+    # on Python 3.5
+    # See https://bitbucket.org/cthedot/cssutils/issues/52
+    cssutils = None
+
+_File = collections.namedtuple('_File',
+                               ['content', 'content_type', 'content_location',
+                                'transfer_encoding'])
+
+
+_CSS_URL_PATTERNS = [re.compile(x) for x in [
+    r"@import\s+'(?P<url>[^']+)'",
+    r'@import\s+"(?P<url>[^"]+)"',
+    r'''url\((?P<url>[^'"][^)]*)\)''',
+    r'url\("(?P<url>[^"]+)"\)',
+    r"url\('(?P<url>[^']+)'\)",
+]]
+
+
+def _get_css_imports_regex(data):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+    """
+    urls = []
+    for pattern in _CSS_URL_PATTERNS:
+        for match in pattern.finditer(data):
+            url = match.group("url")
+            if url:
+                urls.append(url)
+    return urls
+
+
+def _get_css_imports_cssutils(data, inline=False):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+        inline: True if the argument is a inline HTML style attribute.
+    """
+    # We don't care about invalid CSS data, this will only litter the log
+    # output with CSS errors
+    parser = cssutils.CSSParser(loglevel=100,
+                                fetcher=lambda url: (None, ""), validate=False)
+    if not inline:
+        sheet = parser.parseString(data)
+        return list(cssutils.getUrls(sheet))
+    else:
+        urls = []
+        declaration = parser.parseStyle(data)
+        # prop = background, color, margin, ...
+        for prop in declaration:
+            # value = red, 10px, url(foobar), ...
+            for value in prop.propertyValue:
+                if isinstance(value, cssutils.css.URIValue):
+                    if value.uri:
+                        urls.append(value.uri)
+        return urls
+
+
+def _get_css_imports(data, inline=False):
+    """Return all assets that are referenced in the given CSS document.
+
+    The returned URLs are relative to the stylesheet's URL.
+
+    Args:
+        data: The content of the stylesheet to scan as string.
+        inline: True if the argument is a inline HTML style attribute.
+    """
+    if cssutils is None:
+        return _get_css_imports_regex(data)
+    else:
+        return _get_css_imports_cssutils(data, inline)
+
+
+def _check_rel(element):
+    """Return true if the element's rel attribute fits our criteria.
+
+    rel has to contain 'stylesheet' or 'icon'. Also returns True if the rel
+    attribute is unset.
+
+    Args:
+        element: The WebElementWrapper which should be checked.
+    """
+    if 'rel' not in element:
+        return True
+    must_have = {'stylesheet', 'icon'}
+    rels = [rel.lower() for rel in element['rel'].split(' ')]
+    return any(rel in rels for rel in must_have)
+
+
+MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
+
+
+# Encode the file using base64 encoding.
+E_BASE64 = email.encoders.encode_base64
+
+
+# Encode the file using MIME quoted-printable encoding.
+E_QUOPRI = email.encoders.encode_quopri
+
+
+class MHTMLWriter:
+
+    """A class for outputting multiple files to a MHTML document.
+
+    Attributes:
+        root_content: The root content as bytes.
+        content_location: The url of the page as str.
+        content_type: The MIME-type of the root content as str.
+        _files: Mapping of location->_File namedtuple.
+    """
+
+    def __init__(self, root_content, content_location, content_type):
+        self.root_content = root_content
+        self.content_location = content_location
+        self.content_type = content_type
+        self._files = {}
+
+    def add_file(self, location, content, content_type=None,
+                 transfer_encoding=E_QUOPRI):
+        """Add a file to the given MHTML collection.
+
+        Args:
+            location: The original location (URL) of the file.
+            content: The binary content of the file.
+            content_type: The MIME-type of the content (if available)
+            transfer_encoding: The transfer encoding to use for this file.
+        """
+        self._files[location] = _File(
+            content=content, content_type=content_type,
+            content_location=location, transfer_encoding=transfer_encoding,
+        )
+
+    def write_to(self, fp):
+        """Output the MHTML file to the given file-like object.
+
+        Args:
+            fp: The file-object, opened in "wb" mode.
+        """
+        msg = email.mime.multipart.MIMEMultipart(
+            'related', '---=_qute-{}'.format(uuid.uuid4()))
+
+        root = self._create_root_file()
+        msg.attach(root)
+
+        for _, file_data in sorted(self._files.items()):
+            msg.attach(self._create_file(file_data))
+
+        gen = email.generator.BytesGenerator(fp, policy=MHTMLPolicy)
+        gen.flatten(msg)
+
+    def _create_root_file(self):
+        """Return the root document as MIMEMultipart."""
+        root_file = _File(
+            content=self.root_content, content_type=self.content_type,
+            content_location=self.content_location, transfer_encoding=E_QUOPRI,
+        )
+        return self._create_file(root_file)
+
+    def _create_file(self, f):
+        """Return the single given file as email.message.Message."""
+        msg = email.message.Message()
+        msg['MIME-Version'] = '1.0'
+        msg['Content-Location'] = f.content_location
+        if f.content_type:
+            msg.set_type(f.content_type)
+        msg.set_payload(f.content)
+        f.transfer_encoding(msg)
+        return msg
+
+
+class _Downloader:
+
+    """A class to download whole websites.
+
+    Attributes:
+        web_view: The QWebView which contains the website that will be saved.
+        dest: Destination filename.
+        writer: The MHTMLWriter object which is used to save the page.
+        loaded_urls: A set of QUrls of finished asset downloads.
+        pending_downloads: A set of unfinished (url, DownloadItem) tuples.
+        _finished_file: A flag indicating if the file has already been
+                        written.
+        _used: A flag indicating if the downloader has already been used.
+        _win_id: The window this downloader belongs to.
+    """
+
+    def __init__(self, web_view, dest):
+        self.web_view = web_view
+        self.dest = dest
+        self.writer = None
+        self.loaded_urls = {web_view.url()}
+        self.pending_downloads = set()
+        self._finished_file = False
+        self._used = False
+        self._win_id = web_view.win_id
+
+    def run(self):
+        """Download and save the page.
+
+        The object must not be reused, you should create a new one if
+        you want to download another page.
+        """
+        if self._used:
+            raise ValueError("Downloader already used")
+        self._used = True
+        web_url = self.web_view.url()
+        web_frame = self.web_view.page().mainFrame()
+
+        self.writer = MHTMLWriter(
+            web_frame.toHtml().encode('utf-8'),
+            content_location=urlutils.encoded_url(web_url),
+            # I've found no way of getting the content type of a QWebView, but
+            # since we're using .toHtml, it's probably safe to say that the
+            # content-type is HTML
+            content_type='text/html; charset="UTF-8"',
+        )
+        # Currently only downloading <link> (stylesheets), <script>
+        # (javascript) and <img> (image) elements.
+        elements = web_frame.findAllElements('link, script, img')
+
+        for element in elements:
+            element = webelem.WebElementWrapper(element)
+            # Websites are free to set whatever rel=... attribute they want.
+            # We just care about stylesheets and icons.
+            if not _check_rel(element):
+                continue
+            if 'src' in element:
+                element_url = element['src']
+            elif 'href' in element:
+                element_url = element['href']
+            else:
+                # Might be a local <script> tag or something else
+                continue
+            absolute_url = web_url.resolved(QUrl(element_url))
+            self._fetch_url(absolute_url)
+
+        styles = web_frame.findAllElements('style')
+        for style in styles:
+            style = webelem.WebElementWrapper(style)
+            # The Mozilla Developer Network says:
+            # type: This attribute defines the styling language as a MIME type
+            # (charset should not be specified). This attribute is optional and
+            # default to text/css if it's missing.
+            # https://developer.mozilla.org/en/docs/Web/HTML/Element/style
+            if 'type' in style and style['type'] != 'text/css':
+                continue
+            for element_url in _get_css_imports(str(style)):
+                self._fetch_url(web_url.resolved(QUrl(element_url)))
+
+        # Search for references in inline styles
+        for element in web_frame.findAllElements('[style]'):
+            element = webelem.WebElementWrapper(element)
+            style = element['style']
+            for element_url in _get_css_imports(style, inline=True):
+                self._fetch_url(web_url.resolved(QUrl(element_url)))
+
+        # Shortcut if no assets need to be downloaded, otherwise the file would
+        # never be saved. Also might happen if the downloads are fast enough to
+        # complete before connecting their finished signal.
+        self._collect_zombies()
+        if not self.pending_downloads and not self._finished_file:
+            self._finish_file()
+
+    def _fetch_url(self, url):
+        """Download the given url and add the file to the collection.
+
+        Args:
+            url: The file to download as QUrl.
+        """
+        if url.scheme() not in {'http', 'https'}:
+            return
+        # Prevent loading an asset twice
+        if url in self.loaded_urls:
+            return
+        self.loaded_urls.add(url)
+
+        log.downloads.debug("loading asset at {}".format(url))
+
+        # Using the download manager to download host-blocked urls might crash
+        # qute, see the comments/discussion on
+        # https://github.com/The-Compiler/qutebrowser/pull/962#discussion_r40256987
+        # and https://github.com/The-Compiler/qutebrowser/issues/1053
+        host_blocker = objreg.get('host-blocker')
+        if host_blocker.is_blocked(url):
+            log.downloads.debug("Skipping {}, host-blocked".format(url))
+            # We still need an empty file in the output, QWebView can be pretty
+            # picky about displaying a file correctly when not all assets are
+            # at least referenced in the mhtml file.
+            self.writer.add_file(urlutils.encoded_url(url), b'')
+            return
+
+        download_manager = objreg.get('download-manager', scope='window',
+                                      window=self._win_id)
+        item = download_manager.get(url, fileobj=_NoCloseBytesIO(),
+                                    auto_remove=True)
+        self.pending_downloads.add((url, item))
+        item.finished.connect(
+            functools.partial(self._finished, url, item))
+        item.error.connect(
+            functools.partial(self._error, url, item))
+        item.cancelled.connect(
+            functools.partial(self._error, url, item))
+
+    def _finished(self, url, item):
+        """Callback when a single asset is downloaded.
+
+        Args:
+            url: The original url of the asset as QUrl.
+            item: The DownloadItem given by the DownloadManager
+        """
+        self.pending_downloads.remove((url, item))
+        mime = item.raw_headers.get(b'Content-Type', b'')
+
+        # Note that this decoding always works and doesn't produce errors
+        # RFC 7230 (https://tools.ietf.org/html/rfc7230) states:
+        # Historically, HTTP has allowed field content with text in the
+        # ISO-8859-1 charset [ISO-8859-1], supporting other charsets only
+        # through use of [RFC2047] encoding.  In practice, most HTTP header
+        # field values use only a subset of the US-ASCII charset [USASCII].
+        # Newly defined header fields SHOULD limit their field values to
+        # US-ASCII octets.  A recipient SHOULD treat other octets in field
+        # content (obs-text) as opaque data.
+        mime = mime.decode('iso-8859-1')
+
+        if mime.lower() == 'text/css' or url.fileName().endswith('.css'):
+            # We can't always assume that CSS files are UTF-8, but CSS files
+            # shouldn't contain many non-ASCII characters anyway (in most
+            # cases). Using "ignore" lets us decode the file even if it's
+            # invalid UTF-8 data.
+            # The file written to the MHTML file won't be modified by this
+            # decoding, since there we're taking the original bytestream.
+            try:
+                css_string = item.fileobj.getvalue().decode('utf-8')
+            except UnicodeDecodeError:
+                log.downloads.warning("Invalid UTF-8 data in {}".format(url))
+                css_string = item.fileobj.getvalue().decode('utf-8', 'ignore')
+            import_urls = _get_css_imports(css_string)
+            for import_url in import_urls:
+                absolute_url = url.resolved(QUrl(import_url))
+                self._fetch_url(absolute_url)
+
+        encode = E_QUOPRI if mime.startswith('text/') else E_BASE64
+        # Our MHTML handler refuses non-ASCII headers. This will replace every
+        # non-ASCII char with '?'. This is probably okay, as official Content-
+        # Type headers contain ASCII only anyway. Anything else is madness.
+        mime = utils.force_encoding(mime, 'ascii')
+        self.writer.add_file(urlutils.encoded_url(url),
+                             item.fileobj.getvalue(), mime, encode)
+        item.fileobj.actual_close()
+        if self.pending_downloads:
+            return
+        self._finish_file()
+
+    def _error(self, url, item, *_args):
+        """Callback when a download error occurred.
+
+        Args:
+            url: The orignal url of the asset as QUrl.
+            item: The DownloadItem given by the DownloadManager.
+        """
+        try:
+            self.pending_downloads.remove((url, item))
+        except KeyError:
+            # This might happen if .collect_zombies() calls .finished() and the
+            # error handler will be called after .collect_zombies
+            log.downloads.debug("Oops! Download already gone: {}".format(item))
+            return
+        item.fileobj.actual_close()
+        # Add a stub file, see comment in .fetch_url() for more information
+        self.writer.add_file(urlutils.encoded_url(url), b'')
+        if self.pending_downloads:
+            return
+        self._finish_file()
+
+    def _finish_file(self):
+        """Save the file to the filename given in __init__."""
+        if self._finished_file:
+            log.downloads.debug("finish_file called twice, ignored!")
+            return
+        self._finished_file = True
+        log.downloads.debug("All assets downloaded, ready to finish off!")
+        try:
+            with open(self.dest, 'wb') as file_output:
+                self.writer.write_to(file_output)
+        except OSError as error:
+            message.error(self._win_id,
+                          "Could not save file: {}".format(error))
+            return
+        log.downloads.debug("File successfully written.")
+        message.info(self._win_id, "Page saved as {}".format(self.dest))
+
+    def _collect_zombies(self):
+        """Collect done downloads and add their data to the MHTML file.
+
+        This is needed if a download finishes before attaching its
+        finished signal.
+        """
+        items = set((url, item) for url, item in self.pending_downloads
+                    if item.done)
+        log.downloads.debug("Zombie downloads: {}".format(items))
+        for url, item in items:
+            self._finished(url, item)
+
+
+class _NoCloseBytesIO(io.BytesIO):
+
+    """BytesIO that can't be .closed().
+
+    This is needed to prevent the DownloadManager from closing the stream, thus
+    discarding the data.
+    """
+
+    def close(self):
+        """Do nothing."""
+        pass
+
+    def actual_close(self):
+        """Close the stream."""
+        super().close()
+
+
+def _start_download(dest, web_view):
+    """Start downloading the current page and all assets to a MHTML file.
+
+    This will overwrite dest if it already exists.
+
+    Args:
+        dest: The filename where the resulting file should be saved.
+        web_view: Specify the webview whose page should be loaded.
+    """
+    loader = _Downloader(web_view, dest)
+    loader.run()
+
+
+def start_download_checked(dest, web_view):
+    """First check if dest is already a file, then start the download.
+
+    Args:
+        dest: The filename where the resulting file should be saved.
+        web_view: Specify the webview whose page should be loaded.
+    """
+    # The default name is 'page title.mht'
+    title = web_view.title()
+    default_name = utils.sanitize_filename(title + '.mht')
+
+    # Remove characters which cannot be expressed in the file system encoding
+    encoding = sys.getfilesystemencoding()
+    default_name = utils.force_encoding(default_name, encoding)
+    dest = utils.force_encoding(dest, encoding)
+
+    dest = os.path.expanduser(dest)
+
+    # See if we already have an absolute path
+    path = downloads.create_full_filename(default_name, dest)
+    if path is None:
+        # We still only have a relative path, prepend download_dir and
+        # try again.
+        path = downloads.create_full_filename(
+            default_name, os.path.join(downloads.download_dir(), dest))
+    downloads.last_used_directory = os.path.dirname(path)
+
+    # Avoid downloading files if we can't save the output anyway...
+    # Yes, this is prone to race conditions, but we're checking again before
+    # saving the file anyway.
+    if not os.path.isdir(os.path.dirname(path)):
+        folder = os.path.dirname(path)
+        message.error(web_view.win_id,
+                      "Directory {} does not exist.".format(folder))
+        return
+
+    if not os.path.isfile(path):
+        _start_download(path, web_view=web_view)
+        return
+
+    q = usertypes.Question()
+    q.mode = usertypes.PromptMode.yesno
+    q.text = "{} exists. Overwrite?".format(path)
+    q.completed.connect(q.deleteLater)
+    q.answered_yes.connect(functools.partial(
+        _start_download, path, web_view=web_view))
+    message_bridge = objreg.get('message-bridge', scope='window',
+                                window=web_view.win_id)
+    message_bridge.ask(q, blocking=False)

qutebrowser/browser/network/filescheme.py

@@ -0,0 +1,119 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2016 Antoni Boucher (antoyo) <bouanto@zoho.com>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+#
+# pylint complains when using .render() on jinja templates, so we make it shut
+# up for this whole module.
+
+"""Handler functions for file:... pages."""
+
+import os
+
+from qutebrowser.browser.network import schemehandler, networkreply
+from qutebrowser.utils import jinja
+
+
+def get_file_list(basedir, all_files, filterfunc):
+    """Get a list of files filtered by a filter function and sorted by name.
+
+    Args:
+        basedir: The parent directory of all files.
+        all_files: The list of files to filter and sort.
+        filterfunc: The filter function.
+
+    Return:
+        A list of dicts. Each dict contains the name and absname keys.
+    """
+    items = []
+    for filename in all_files:
+        absname = os.path.join(basedir, filename)
+        if filterfunc(absname):
+            items.append({'name': filename, 'absname': absname})
+    return sorted(items, key=lambda v: v['name'].lower())
+
+
+def is_root(directory):
+    """Check if the directory is the root directory.
+
+    Args:
+        directory: The directory to check.
+
+    Return:
+        Whether the directory is a root directory or not.
+    """
+    return os.path.dirname(directory) == directory
+
+
+def dirbrowser_html(path):
+    """Get the directory browser web page.
+
+    Args:
+        path: The directory path.
+
+    Return:
+        The HTML of the web page.
+    """
+    title = "Browse directory: {}".format(path)
+    template = jinja.env.get_template('dirbrowser.html')
+    # pylint: disable=no-member
+    # WORKAROUND for https://bitbucket.org/logilab/pylint/issue/490/
+
+    if is_root(path):
+        parent = None
+    else:
+        parent = os.path.dirname(path)
+
+    try:
+        all_files = os.listdir(path)
+    except OSError as e:
+        html = jinja.env.get_template('error.html').render(
+            title="Error while reading directory",
+            url='file://%s' % path,
+            error=str(e),
+            icon='')
+        return html.encode('UTF-8', errors='xmlcharrefreplace')
+
+    files = get_file_list(path, all_files, os.path.isfile)
+    directories = get_file_list(path, all_files, os.path.isdir)
+    html = template.render(title=title, url=path, icon='',
+                           parent=parent, files=files,
+                           directories=directories)
+    return html.encode('UTF-8', errors='xmlcharrefreplace')
+
+
+class FileSchemeHandler(schemehandler.SchemeHandler):
+
+    """Scheme handler for file: URLs."""
+
+    def createRequest(self, _op, request, _outgoing_data):
+        """Create a new request.
+
+        Args:
+             request: const QNetworkRequest & req
+             _op: Operation op
+             _outgoing_data: QIODevice * outgoingData
+
+        Return:
+            A QNetworkReply for directories, None for files.
+        """
+        path = request.url().toLocalFile()
+        if os.path.isdir(path):
+            data = dirbrowser_html(path)
+            return networkreply.FixedDataNetworkReply(
+                request, data, 'text/html', self.parent())

qutebrowser/browser/network/networkmanager.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -19,38 +19,36 @@
 
 """Our own QNetworkAccessManager."""
 
+import os
 import collections
+import netrc
 
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, PYQT_VERSION, QCoreApplication,
-                          QUrl)
-from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply, QSslError
-
-try:
-    from PyQt5.QtNetwork import QSslSocket
-except ImportError:
-    SSL_AVAILABLE = False
-else:
-    SSL_AVAILABLE = QSslSocket.supportsSsl()
+                          QUrl, QByteArray)
+from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslError,
+                             QSslSocket)
 
 from qutebrowser.config import config
 from qutebrowser.utils import (message, log, usertypes, utils, objreg, qtutils,
                                urlutils)
 from qutebrowser.browser import cookies
 from qutebrowser.browser.network import qutescheme, networkreply
+from qutebrowser.browser.network import filescheme
 
 
 HOSTBLOCK_ERROR_STRING = '%HOSTBLOCK%'
+ProxyId = collections.namedtuple('ProxyId', 'type, hostname, port')
+_proxy_auth_cache = {}
 
 
 def init():
     """Disable insecure SSL ciphers on old Qt versions."""
-    if SSL_AVAILABLE:
-        if not qtutils.version_check('5.3.0'):
-            # Disable weak SSL ciphers.
-            # See https://codereview.qt-project.org/#/c/75943/
-            good_ciphers = [c for c in QSslSocket.supportedCiphers()
-                            if c.usedBits() >= 128]
-            QSslSocket.setDefaultCiphers(good_ciphers)
+    if not qtutils.version_check('5.3.0'):
+        # Disable weak SSL ciphers.
+        # See https://codereview.qt-project.org/#/c/75943/
+        good_ciphers = [c for c in QSslSocket.supportedCiphers()
+                        if c.usedBits() >= 128]
+        QSslSocket.setDefaultCiphers(good_ciphers)
 
 
 class SslError(QSslError):
@@ -60,6 +58,7 @@ class SslError(QSslError):
     def __hash__(self):
         try:
             # Qt >= 5.4
+            # pylint: disable=not-callable,useless-suppression
             return super().__hash__()
         except TypeError:
             return hash((self.certificate().toDer(), self.error()))
@@ -102,13 +101,13 @@ class NetworkManager(QNetworkAccessManager):
         self._requests = []
         self._scheme_handlers = {
             'qute': qutescheme.QuteSchemeHandler(win_id),
+            'file': filescheme.FileSchemeHandler(win_id),
         }
-        self._set_cookiejar()
+        self._set_cookiejar(private=config.get('general', 'private-browsing'))
         self._set_cache()
-        if SSL_AVAILABLE:
-            self.sslErrors.connect(self.on_ssl_errors)
-            self._rejected_ssl_errors = collections.defaultdict(list)
-            self._accepted_ssl_errors = collections.defaultdict(list)
+        self.sslErrors.connect(self.on_ssl_errors)
+        self._rejected_ssl_errors = collections.defaultdict(list)
+        self._accepted_ssl_errors = collections.defaultdict(list)
         self.authenticationRequired.connect(self.on_authentication_required)
         self.proxyAuthenticationRequired.connect(
             self.on_proxy_authentication_required)
@@ -171,16 +170,6 @@ class NetworkManager(QNetworkAccessManager):
         q.deleteLater()
         return q.answer
 
-    def _fill_authenticator(self, authenticator, answer):
-        """Fill a given QAuthenticator object with an answer."""
-        if answer is not None:
-            # Since the answer could be something else than (user, password)
-            # pylint seems to think we're unpacking a non-sequence. However we
-            # *did* explicitly ask for a tuple, so it *will* always be one.
-            user, password = answer
-            authenticator.setUser(user)
-            authenticator.setPassword(password)
-
     def shutdown(self):
         """Abort all running requests."""
         self.setNetworkAccessible(QNetworkAccessManager.NotAccessible)
@@ -189,80 +178,117 @@ class NetworkManager(QNetworkAccessManager):
             request.deleteLater()
         self.shutting_down.emit()
 
-    if SSL_AVAILABLE:  # noqa
-        @pyqtSlot('QNetworkReply*', 'QList<QSslError>')
-        def on_ssl_errors(self, reply, errors):
-            """Decide if SSL errors should be ignored or not.
+    @pyqtSlot('QNetworkReply*', 'QList<QSslError>')
+    def on_ssl_errors(self, reply, errors):  # pragma: no mccabe
+        """Decide if SSL errors should be ignored or not.
 
-            This slot is called on SSL/TLS errors by the self.sslErrors signal.
+        This slot is called on SSL/TLS errors by the self.sslErrors signal.
 
-            Args:
-                reply: The QNetworkReply that is encountering the errors.
-                errors: A list of errors.
-            """
-            errors = [SslError(e) for e in errors]
-            ssl_strict = config.get('network', 'ssl-strict')
-            if ssl_strict == 'ask':
+        Args:
+            reply: The QNetworkReply that is encountering the errors.
+            errors: A list of errors.
+        """
+        errors = [SslError(e) for e in errors]
+        ssl_strict = config.get('network', 'ssl-strict')
+        if ssl_strict == 'ask':
+            try:
                 host_tpl = urlutils.host_tuple(reply.url())
-                if set(errors).issubset(self._accepted_ssl_errors[host_tpl]):
-                    reply.ignoreSslErrors()
-                elif set(errors).issubset(self._rejected_ssl_errors[host_tpl]):
-                    pass
-                else:
-                    err_string = '\n'.join('- ' + err.errorString() for err in
-                                           errors)
-                    answer = self._ask('SSL errors - continue?\n{}'.format(
-                        err_string), mode=usertypes.PromptMode.yesno,
-                        owner=reply)
-                    if answer:
-                        reply.ignoreSslErrors()
-                        self._accepted_ssl_errors[host_tpl] += errors
-                    else:
-                        self._rejected_ssl_errors[host_tpl] += errors
-            elif ssl_strict:
+            except ValueError:
+                host_tpl = None
+                is_accepted = False
+                is_rejected = False
+            else:
+                is_accepted = set(errors).issubset(
+                    self._accepted_ssl_errors[host_tpl])
+                is_rejected = set(errors).issubset(
+                    self._rejected_ssl_errors[host_tpl])
+            if is_accepted:
+                reply.ignoreSslErrors()
+            elif is_rejected:
                 pass
             else:
-                for err in errors:
-                    # FIXME we might want to use warn here (non-fatal error)
-                    # https://github.com/The-Compiler/qutebrowser/issues/114
-                    message.error(self._win_id,
-                                  'SSL error: {}'.format(err.errorString()))
-                reply.ignoreSslErrors()
+                err_string = '\n'.join('- ' + err.errorString() for err in
+                                       errors)
+                answer = self._ask('SSL errors - continue?\n{}'.format(
+                    err_string), mode=usertypes.PromptMode.yesno,
+                    owner=reply)
+                if answer:
+                    reply.ignoreSslErrors()
+                    d = self._accepted_ssl_errors
+                else:
+                    d = self._rejected_ssl_errors
+                if host_tpl is not None:
+                    d[host_tpl] += errors
+        elif ssl_strict:
+            pass
+        else:
+            for err in errors:
+                # FIXME we might want to use warn here (non-fatal error)
+                # https://github.com/The-Compiler/qutebrowser/issues/114
+                message.error(self._win_id,
+                              'SSL error: {}'.format(err.errorString()))
+            reply.ignoreSslErrors()
 
-        @pyqtSlot(QUrl)
-        def clear_rejected_ssl_errors(self, url):
-            """Clear the rejected SSL errors on a reload.
+    @pyqtSlot(QUrl)
+    def clear_rejected_ssl_errors(self, url):
+        """Clear the rejected SSL errors on a reload.
 
-            Args:
-                url: The URL to remove.
-            """
-            try:
-                del self._rejected_ssl_errors[url]
-            except KeyError:
-                pass
-    else:
-        @pyqtSlot(QUrl)
-        def clear_rejected_ssl_errors(self, _url):
-            """Clear the rejected SSL errors on a reload.
-
-            Does nothing because SSL is unavailable.
-            """
+        Args:
+            url: The URL to remove.
+        """
+        try:
+            del self._rejected_ssl_errors[url]
+        except KeyError:
             pass
 
     @pyqtSlot('QNetworkReply', 'QAuthenticator')
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""
-        answer = self._ask("Username ({}):".format(authenticator.realm()),
-                           mode=usertypes.PromptMode.user_pwd,
-                           owner=reply)
-        self._fill_authenticator(authenticator, answer)
+        user, password = None, None
+        if not hasattr(reply, "netrc_used") and 'HOME' in os.environ:
+            # We'll get an OSError by netrc if 'HOME' isn't available in
+            # os.environ. We don't want to log that, so we prevent it
+            # altogether.
+            reply.netrc_used = True
+            try:
+                net = netrc.netrc()
+                authenticators = net.authenticators(reply.url().host())
+                if authenticators is not None:
+                    (user, _account, password) = authenticators
+            except FileNotFoundError:
+                log.misc.debug("No .netrc file found")
+            except OSError:
+                log.misc.exception("Unable to read the netrc file")
+            except netrc.NetrcParseError:
+                log.misc.exception("Error when parsing the netrc file")
+
+        if user is None:
+            # netrc check failed
+            answer = self._ask(
+                "Username ({}):".format(authenticator.realm()),
+                mode=usertypes.PromptMode.user_pwd,
+                owner=reply)
+            if answer is not None:
+                user, password = answer.user, answer.password
+        if user is not None:
+            authenticator.setUser(user)
+            authenticator.setPassword(password)
 
     @pyqtSlot('QNetworkProxy', 'QAuthenticator')
-    def on_proxy_authentication_required(self, _proxy, authenticator):
+    def on_proxy_authentication_required(self, proxy, authenticator):
         """Called when a proxy needs authentication."""
-        answer = self._ask("Proxy username ({}):".format(
-            authenticator.realm()), mode=usertypes.PromptMode.user_pwd)
-        self._fill_authenticator(authenticator, answer)
+        proxy_id = ProxyId(proxy.type(), proxy.hostName(), proxy.port())
+        if proxy_id in _proxy_auth_cache:
+            user, password = _proxy_auth_cache[proxy_id]
+            authenticator.setUser(user)
+            authenticator.setPassword(password)
+        else:
+            answer = self._ask("Proxy username ({}):".format(
+                authenticator.realm()), mode=usertypes.PromptMode.user_pwd)
+            if answer is not None:
+                authenticator.setUser(answer.user)
+                authenticator.setPassword(answer.password)
+                _proxy_auth_cache[proxy_id] = answer
 
     @config.change_filter('general', 'private-browsing')
     def on_config_changed(self):
@@ -297,6 +323,25 @@ class NetworkManager(QNetworkAccessManager):
         download.destroyed.connect(self.on_adopted_download_destroyed)
         download.do_retry.connect(self.adopt_download)
 
+    def set_referer(self, req, current_url):
+        """Set the referer header."""
+        referer_header_conf = config.get('network', 'referer-header')
+
+        try:
+            if referer_header_conf == 'never':
+                # Note: using ''.encode('ascii') sends a header with no value,
+                # instead of no header at all
+                req.setRawHeader('Referer'.encode('ascii'), QByteArray())
+            elif (referer_header_conf == 'same-domain' and
+                    not urlutils.same_domain(req.url(), current_url)):
+                req.setRawHeader('Referer'.encode('ascii'), QByteArray())
+            # If refer_header_conf is set to 'always', we leave the header
+            # alone as QtWebKit did set it.
+        except urlutils.InvalidUrlError:
+            # req.url() or current_url can be invalid - this happens on
+            # https://www.playstation.com/ for example.
+            pass
+
     # WORKAROUND for:
     # http://www.riverbankcomputing.com/pipermail/pyqt/2014-September/034806.html
     #
@@ -319,18 +364,15 @@ class NetworkManager(QNetworkAccessManager):
             A QNetworkReply.
         """
         scheme = req.url().scheme()
-        if scheme == 'https' and not SSL_AVAILABLE:
-            return networkreply.ErrorNetworkReply(
-                req, "SSL is not supported by the installed Qt library!",
-                QNetworkReply.ProtocolUnknownError, self)
-        elif scheme in self._scheme_handlers:
-            return self._scheme_handlers[scheme].createRequest(
+        if scheme in self._scheme_handlers:
+            result = self._scheme_handlers[scheme].createRequest(
                 op, req, outgoing_data)
+            if result is not None:
+                return result
 
         host_blocker = objreg.get('host-blocker')
         if (op == QNetworkAccessManager.GetOperation and
-                req.url().host() in host_blocker.blocked_hosts and
-                config.get('content', 'host-blocking-enabled')):
+                host_blocker.is_blocked(req.url())):
             log.webview.info("Request to {} blocked by host blocker.".format(
                 req.url().host()))
             return networkreply.ErrorNetworkReply(
@@ -343,6 +385,25 @@ class NetworkManager(QNetworkAccessManager):
             dnt = '0'.encode('ascii')
         req.setRawHeader('DNT'.encode('ascii'), dnt)
         req.setRawHeader('X-Do-Not-Track'.encode('ascii'), dnt)
+
+        # There are some scenarios where we can't figure out current_url:
+        # - There's a generic NetworkManager, e.g. for downloads
+        # - The download was in a tab which is now closed.
+        current_url = QUrl()
+
+        if self._tab_id is not None:
+            try:
+                webview = objreg.get('webview', scope='tab',
+                                     window=self._win_id, tab=self._tab_id)
+                current_url = webview.url()
+            except (KeyError, RuntimeError, TypeError):
+                # https://github.com/The-Compiler/qutebrowser/issues/889
+                # Catching RuntimeError and TypeError because we could be in
+                # the middle of the webpage shutdown here.
+                current_url = QUrl()
+
+        self.set_referer(req, current_url)
+
         accept_language = config.get('network', 'accept-language')
         if accept_language is not None:
             req.setRawHeader('Accept-Language'.encode('ascii'),

qutebrowser/browser/network/networkreply.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # Based on the Eric5 helpviewer,
 # Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
@@ -87,9 +87,11 @@ class FixedDataNetworkReply(QNetworkReply):
         return buf
 
     def isFinished(self):
-        """Check if the reply is finished."""
         return True
 
+    def isRunning(self):
+        return False
+
 
 class ErrorNetworkReply(QNetworkReply):
 
@@ -125,6 +127,12 @@ class ErrorNetworkReply(QNetworkReply):
         """We always have 0 bytes available."""
         return 0
 
-    def readData(self):
+    def readData(self, _maxlen):
         """No data available."""
         return bytes()
+
+    def isFinished(self):
+        return True
+
+    def isRunning(self):
+        return False

qutebrowser/browser/network/pastebin.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/browser/network/proxy.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/browser/network/qutescheme.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -21,7 +21,7 @@
 # up for this whole module.
 
 # pylint: disable=no-member
-# https://bitbucket.org/logilab/pylint/issue/490/
+# WORKAROUND for https://bitbucket.org/logilab/pylint/issue/490/
 
 """Handler functions for different qute:... pages.
 
@@ -31,11 +31,13 @@ Module attributes:
 
 import functools
 import configparser
+import mimetypes
 
 from PyQt5.QtCore import pyqtSlot, QObject
 from PyQt5.QtNetwork import QNetworkReply
 
 import qutebrowser
+from qutebrowser.browser import pdfjs
 from qutebrowser.browser.network import schemehandler, networkreply
 from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
                                objreg)
@@ -45,6 +47,17 @@ from qutebrowser.config import configexc, configdata
 pyeval_output = ":pyeval was never called"
 
 
+HANDLERS = {}
+
+
+def add_handler(name):
+    """Add a handler to the qute: scheme."""
+    def namedecorator(function):
+        HANDLERS[name] = function
+        return function
+    return namedecorator
+
+
 class QuteSchemeHandler(schemehandler.SchemeHandler):
 
     """Scheme handler for qute: URLs."""
@@ -82,8 +95,11 @@ class QuteSchemeHandler(schemehandler.SchemeHandler):
             return networkreply.ErrorNetworkReply(
                 request, str(e), QNetworkReply.ContentNotFoundError,
                 self.parent())
+        mimetype, _encoding = mimetypes.guess_type(request.url().fileName())
+        if mimetype is None:
+            mimetype = 'text/html'
         return networkreply.FixedDataNetworkReply(
-            request, data, 'text/html', self.parent())
+            request, data, mimetype, self.parent())
 
 
 class JSBridge(QObject):
@@ -96,12 +112,19 @@ class JSBridge(QObject):
     @pyqtSlot(int, str, str, str)
     def set(self, win_id, sectname, optname, value):
         """Slot to set a setting from qute:settings."""
+        # https://github.com/The-Compiler/qutebrowser/issues/727
+        if ((sectname, optname) == ('content', 'allow-javascript') and
+                value == 'false'):
+            message.error(win_id, "Refusing to disable javascript via "
+                          "qute:settings as it needs javascript support.")
+            return
         try:
             objreg.get('config').set('conf', sectname, optname, value)
         except (configexc.Error, configparser.Error) as e:
             message.error(win_id, e)
 
 
+@add_handler('pyeval')
 def qute_pyeval(_win_id, _request):
     """Handler for qute:pyeval. Return HTML content as bytes."""
     html = jinja.env.get_template('pre.html').render(
@@ -109,6 +132,7 @@ def qute_pyeval(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('version')
 def qute_version(_win_id, _request):
     """Handler for qute:version. Return HTML content as bytes."""
     html = jinja.env.get_template('version.html').render(
@@ -117,6 +141,7 @@ def qute_version(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('plainlog')
 def qute_plainlog(_win_id, _request):
     """Handler for qute:plainlog. Return HTML content as bytes."""
     if log.ram_handler is None:
@@ -127,6 +152,7 @@ def qute_plainlog(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('log')
 def qute_log(_win_id, _request):
     """Handler for qute:log. Return HTML content as bytes."""
     if log.ram_handler is None:
@@ -138,22 +164,24 @@ def qute_log(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('gpl')
 def qute_gpl(_win_id, _request):
     """Handler for qute:gpl. Return HTML content as bytes."""
     return utils.read_file('html/COPYING.html').encode('ASCII')
 
 
+@add_handler('help')
 def qute_help(win_id, request):
     """Handler for qute:help. Return HTML content as bytes."""
     try:
         utils.read_file('html/doc/index.html')
-    except FileNotFoundError:
+    except OSError:
         html = jinja.env.get_template('error.html').render(
             title="Error while loading documentation",
             url=request.url().toDisplayString(),
             error="This most likely means the documentation was not generated "
                   "properly. If you are running qutebrowser from the git "
-                  "repository, please run scripts/asciidoc2html.py."
+                  "repository, please run scripts/asciidoc2html.py. "
                   "If you're running a released version this is a bug, please "
                   "use :report to report it.",
             icon='')
@@ -170,6 +198,7 @@ def qute_help(win_id, request):
     return utils.read_file(path).encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('settings')
 def qute_settings(win_id, _request):
     """Handler for qute:settings. View/change qute configuration."""
     config_getter = functools.partial(objreg.get('config').get, raw=True)
@@ -179,12 +208,8 @@ def qute_settings(win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
-HANDLERS = {
-    'pyeval': qute_pyeval,
-    'version': qute_version,
-    'plainlog': qute_plainlog,
-    'log': qute_log,
-    'gpl': qute_gpl,
-    'help': qute_help,
-    'settings': qute_settings,
-}
+@add_handler('pdfjs')
+def qute_pdfjs(_win_id, request):
+    """Handler for qute://pdfjs. Return the pdf.js viewer."""
+    urlpath = request.url().path()
+    return pdfjs.get_pdfjs_res(urlpath)

qutebrowser/browser/network/schemehandler.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # Based on the Eric5 helpviewer,
 # Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>

qutebrowser/browser/pdfjs.py

@@ -0,0 +1,175 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015 Daniel Schadt
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""pdf.js integration for qutebrowser."""
+
+import os
+
+from PyQt5.QtCore import QUrl
+
+from qutebrowser.browser import webelem
+from qutebrowser.utils import utils
+
+
+class PDFJSNotFound(Exception):
+
+    """Raised when no pdf.js installation is found."""
+
+    pass
+
+
+def generate_pdfjs_page(url):
+    """Return the html content of a page that displays url with pdfjs.
+
+    Returns a string.
+
+    Args:
+        url: The url of the pdf as QUrl.
+    """
+    viewer = get_pdfjs_res('web/viewer.html').decode('utf-8')
+    script = _generate_pdfjs_script(url)
+    html_page = viewer.replace(
+        '</body>', '</body><script>{}</script>'.format(script)
+    )
+    return html_page
+
+
+def _generate_pdfjs_script(url):
+    """Generate the script that shows the pdf with pdf.js.
+
+    Args:
+        url: The url of the pdf page as QUrl.
+    """
+    return (
+        'PDFJS.verbosity = PDFJS.VERBOSITY_LEVELS.info;\n'
+        'PDFView.open("{url}");\n'
+    ).format(url=webelem.javascript_escape(url.toString(QUrl.FullyEncoded)))
+
+
+def fix_urls(asset):
+    """Take a html page and replace each relative URL wth an absolute.
+
+    This is specialized for pdf.js files and not a general purpose function.
+
+    Args:
+        asset: js file or html page as string.
+    """
+    new_urls = {
+        'viewer.css': 'qute://pdfjs/web/viewer.css',
+        'compatibility.js': 'qute://pdfjs/web/compatibility.js',
+        'locale/locale.properties':
+            'qute://pdfjs/web/locale/locale.properties',
+        'l10n.js': 'qute://pdfjs/web/l10n.js',
+        '../build/pdf.js': 'qute://pdfjs/build/pdf.js',
+        'debugger.js': 'qute://pdfjs/web/debugger.js',
+        'viewer.js': 'qute://pdfjs/web/viewer.js',
+        'compressed.tracemonkey-pldi-09.pdf': '',
+        './images/': 'qute://pdfjs/web/images/',
+        '../build/pdf.worker.js': 'qute://pdfjs/build/pdf.worker.js',
+        '../web/cmaps/': 'qute://pdfjs/web/cmaps/',
+    }
+    for original, new in new_urls.items():
+        asset = asset.replace(original, new)
+    return asset
+
+
+SYSTEM_PDFJS_PATHS = [
+    '/usr/share/pdf.js/',  # Debian pdf.js-common
+    '/usr/share/javascript/pdf/',  # Debian libjs-pdf
+    os.path.expanduser('~/.local/share/qutebrowser/pdfjs/'),  # fallback
+]
+
+
+def get_pdfjs_res(path):
+    """Get a pdf.js resource in binary format.
+
+    Args:
+        path: The path inside the pdfjs directory.
+    """
+    path = path.lstrip('/')
+    content = None
+
+    # First try a system wide installation
+    # System installations might strip off the 'build/' or 'web/' prefixes.
+    # qute expects them, so we need to adjust for it.
+    names_to_try = [path, _remove_prefix(path)]
+    for system_path in SYSTEM_PDFJS_PATHS:
+        content = _read_from_system(system_path, names_to_try)
+        if content is not None:
+            break
+
+    # Fallback to bundled pdf.js
+    if content is None:
+        res_path = '3rdparty/pdfjs/{}'.format(path)
+        try:
+            content = utils.read_file(res_path, binary=True)
+        except FileNotFoundError:
+            raise PDFJSNotFound
+
+    try:
+        # Might be script/html or might be binary
+        text_content = content.decode('utf-8')
+    except UnicodeDecodeError:
+        return content
+    text_content = fix_urls(text_content)
+    return text_content.encode('utf-8')
+
+
+def _remove_prefix(path):
+    """Remove the web/ or build/ prefix of a pdfjs-file-path.
+
+    Args:
+        path: Path as string where the prefix should be stripped off.
+    """
+    prefixes = {'web/', 'build/'}
+    if any(path.startswith(prefix) for prefix in prefixes):
+        return path.split('/', maxsplit=1)[1]
+    # Return the unchanged path if no prefix is found
+    return path
+
+
+def _read_from_system(system_path, names):
+    """Try to read a file with one of the given names in system_path.
+
+    Each file in names is considered equal, the first file that is found
+    is read and its binary content returned.
+
+    Returns None if no file could be found
+
+    Args:
+        system_path: The folder where the file should be searched.
+        names: List of possible file names.
+    """
+    for name in names:
+        try:
+            with open(os.path.join(system_path, name), 'rb') as f:
+                return f.read()
+        except OSError:
+            continue
+    return None
+
+
+def is_available():
+    """Return true if a pdfjs installation is available."""
+    try:
+        get_pdfjs_res('build/pdf.js')
+    except PDFJSNotFound:
+        return False
+    else:
+        return True

qutebrowser/browser/quickmarks.py

@@ -1,169 +0,0 @@
-# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Manager for quickmarks.
-
-Note we violate our general QUrl rule by storing url strings in the marks
-OrderedDict. This is because we read them from a file at start and write them
-to a file on shutdown, so it makes sense to keep them as strings here.
-"""
-
-import os.path
-import functools
-import collections
-
-from PyQt5.QtCore import pyqtSignal, QUrl, QObject
-
-from qutebrowser.utils import message, usertypes, urlutils, standarddir, objreg
-from qutebrowser.commands import cmdexc, cmdutils
-from qutebrowser.misc import lineparser
-
-
-class QuickmarkManager(QObject):
-
-    """Manager for quickmarks.
-
-    Attributes:
-        marks: An OrderedDict of all quickmarks.
-        _lineparser: The LineParser used for the quickmarks, or None
-                     (when qutebrowser is started with -c '').
-
-    Signals:
-        changed: Emitted when anything changed.
-        added: Emitted when a new quickmark was added.
-               arg 0: The name of the quickmark.
-               arg 1: The URL of the quickmark, as string.
-        removed: Emitted when an existing quickmark was removed.
-                 arg 0: The name of the quickmark.
-    """
-
-    changed = pyqtSignal()
-    added = pyqtSignal(str, str)
-    removed = pyqtSignal(str)
-
-    def __init__(self, parent=None):
-        """Initialize and read quickmarks."""
-        super().__init__(parent)
-
-        self.marks = collections.OrderedDict()
-
-        if standarddir.config() is None:
-            self._lineparser = None
-        else:
-            self._lineparser = lineparser.LineParser(
-                standarddir.config(), 'quickmarks', parent=self)
-            for line in self._lineparser:
-                if not line.strip():
-                    # Ignore empty or whitespace-only lines.
-                    continue
-                try:
-                    key, url = line.rsplit(maxsplit=1)
-                except ValueError:
-                    message.error(0, "Invalid quickmark '{}'".format(line))
-                else:
-                    self.marks[key] = url
-            filename = os.path.join(standarddir.config(), 'quickmarks')
-            objreg.get('save-manager').add_saveable(
-                'quickmark-manager', self.save, self.changed,
-                filename=filename)
-
-    def save(self):
-        """Save the quickmarks to disk."""
-        if self._lineparser is not None:
-            self._lineparser.data = [' '.join(tpl)
-                                     for tpl in self.marks.items()]
-            self._lineparser.save()
-
-    def prompt_save(self, win_id, url):
-        """Prompt for a new quickmark name to be added and add it.
-
-        Args:
-            win_id: The current window ID.
-            url: The quickmark url as a QUrl.
-        """
-        if not url.isValid():
-            urlutils.invalid_url_error(win_id, url, "save quickmark")
-            return
-        urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
-        message.ask_async(
-            win_id, "Add quickmark:", usertypes.PromptMode.text,
-            functools.partial(self.quickmark_add, win_id, urlstr))
-
-    @cmdutils.register(instance='quickmark-manager')
-    def quickmark_add(self, win_id: {'special': 'win_id'}, url, name):
-        """Add a new quickmark.
-
-        Args:
-            win_id: The window ID to display the errors in.
-            url: The url to add as quickmark.
-            name: The name for the new quickmark.
-        """
-        # We don't raise cmdexc.CommandError here as this can be called async
-        # via prompt_save.
-        if not name:
-            message.error(win_id, "Can't set mark with empty name!")
-            return
-        if not url:
-            message.error(win_id, "Can't set mark with empty URL!")
-            return
-
-        def set_mark():
-            """Really set the quickmark."""
-            self.marks[name] = url
-            self.changed.emit()
-            self.added.emit(name, url)
-
-        if name in self.marks:
-            message.confirm_async(
-                win_id, "Override existing quickmark?", set_mark, default=True)
-        else:
-            set_mark()
-
-    @cmdutils.register(instance='quickmark-manager', maxsplit=0,
-                       completion=[usertypes.Completion.quickmark_by_name])
-    def quickmark_del(self, name):
-        """Delete a quickmark.
-
-        Args:
-            name: The name of the quickmark to delete.
-        """
-        try:
-            del self.marks[name]
-        except KeyError:
-            raise cmdexc.CommandError("Quickmark '{}' not found!".format(name))
-        else:
-            self.changed.emit()
-            self.removed.emit(name)
-
-    def get(self, name):
-        """Get the URL of the quickmark named name as a QUrl."""
-        if name not in self.marks:
-            raise cmdexc.CommandError(
-                "Quickmark '{}' does not exist!".format(name))
-        urlstr = self.marks[name]
-        try:
-            url = urlutils.fuzzy_url(urlstr, do_search=False)
-        except urlutils.FuzzyUrlError as e:
-            if e.url is None or not e.url.errorString():
-                errstr = ''
-            else:
-                errstr = ' ({})'.format(e.url.errorString())
-            raise cmdexc.CommandError("Invalid URL for quickmark {}: "
-                                      "{}{}".format(name, urlstr, errstr))
-        return url

qutebrowser/browser/rfc6266.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -26,7 +26,7 @@ import re
 
 import pypeg2 as peg
 
-from qutebrowser.utils import log, utils
+from qutebrowser.utils import utils
 
 
 class UniqueNamespace(peg.Namespace):
@@ -40,9 +40,7 @@ class UniqueNamespace(peg.Namespace):
 
 
 # RFC 2616
-separator_chars = "()<>@,;:\\\"/[]?={} \t"
 ctl_chars = ''.join(chr(i) for i in range(32)) + chr(127)
-nontoken_chars = separator_chars + ctl_chars
 
 
 # RFC 5987
@@ -215,17 +213,22 @@ class ContentDispositionValue:
 LangTagged = collections.namedtuple('LangTagged', ['string', 'langtag'])
 
 
-class DuplicateParamError(Exception):
+class Error(Exception):
+
+    """Base class for RFC6266 errors."""
+
+
+class DuplicateParamError(Error):
 
     """Exception raised when a parameter has been given twice."""
 
 
-class InvalidISO8859Error(Exception):
+class InvalidISO8859Error(Error):
 
     """Exception raised when a byte is invalid in ISO-8859-1."""
 
 
-class ContentDisposition:
+class _ContentDisposition:
 
     """Records various indications and hints about content disposition.
 
@@ -234,24 +237,15 @@ class ContentDisposition:
     in the download case.
     """
 
-    def __init__(self, disposition='inline', assocs=None):
-        """Used internally after parsing the header.
-
-        Instances should generally be created from a factory
-        function, such as parse_headers and its variants.
-        """
-        if len(disposition) != 1:
-            self.disposition = 'inline'
-        else:
-            self.disposition = disposition[0]
-        if assocs is None:
-            self.assocs = {}
-        else:
-            self.assocs = dict(assocs)  # So we can change values
-            if 'filename*' in self.assocs:
-                param = self.assocs['filename*']
-                assert isinstance(param, ExtDispositionParm)
-                self.assocs['filename*'] = parse_ext_value(param.value).string
+    def __init__(self, disposition, assocs):
+        """Used internally after parsing the header."""
+        assert len(disposition) == 1
+        self.disposition = disposition[0]
+        self.assocs = dict(assocs)  # So we can change values
+        if 'filename*' in self.assocs:
+            param = self.assocs['filename*']
+            assert isinstance(param, ExtDispositionParm)
+            self.assocs['filename*'] = parse_ext_value(param.value).string
 
     def filename(self):
         """The filename from the Content-Disposition header or None.
@@ -291,8 +285,8 @@ def normalize_ws(text):
 
 
 def parse_headers(content_disposition):
-    """Build a ContentDisposition from header values."""
-    # https://bitbucket.org/logilab/pylint/issue/492/
+    """Build a _ContentDisposition from header values."""
+    # WORKAROUND for https://bitbucket.org/logilab/pylint/issue/492/
     # pylint: disable=no-member
 
     # We allow non-ascii here (it will only be parsed inside of qdtext, and
@@ -302,8 +296,6 @@ def parse_headers(content_disposition):
     # filename parameter. But it does mean we occasionally give
     # less-than-certain values for some legacy senders.
     content_disposition = content_disposition.decode('iso-8859-1')
-    log.rfc6266.debug("Parsing Content-Disposition: {}".format(
-        content_disposition))
     # Our parsing is relaxed in these regards:
     # - The grammar allows a final ';' in the header;
     # - We do LWS-folding, and possibly normalise other broken
@@ -311,14 +303,8 @@ def parse_headers(content_disposition):
     # XXX Would prefer to accept only the quoted whitespace
     # case, rather than normalising everything.
     content_disposition = normalize_ws(content_disposition)
-    try:
-        parsed = peg.parse(content_disposition, ContentDispositionValue)
-    except (SyntaxError, DuplicateParamError, InvalidISO8859Error):
-        log.rfc6266.exception("Error while parsing Content-Disposition")
-        return ContentDisposition()
-    else:
-        return ContentDisposition(disposition=parsed.dtype,
-                                  assocs=parsed.params)
+    parsed = peg.parse(content_disposition, ContentDispositionValue)
+    return _ContentDisposition(disposition=parsed.dtype, assocs=parsed.params)
 
 
 def parse_ext_value(val):

qutebrowser/browser/signalfilter.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -24,7 +24,6 @@ import functools
 from PyQt5.QtCore import QObject
 
 from qutebrowser.utils import debug, log, objreg
-from qutebrowser.browser import webview
 
 
 class SignalFilter(QObject):
@@ -56,11 +55,8 @@ class SignalFilter(QObject):
             tab: The WebView to create filters for.
 
         Return:
-            A partial functon calling _filter_signals with a signal.
+            A partial function calling _filter_signals with a signal.
         """
-        if not isinstance(tab, webview.WebView):
-            raise ValueError("Tried to create filter for {} which is no "
-                             "WebView!".format(tab))
         return functools.partial(self._filter_signals, signal, tab)
 
     def _filter_signals(self, signal, tab, *args):

qutebrowser/browser/tabhistory.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -35,14 +35,19 @@ class TabHistoryItem:
 
     Attributes:
         url: The QUrl of this item.
+        original_url: The QUrl of this item which was originally requested.
         title: The title as string of this item.
         active: Whether this item is the item currently navigated to.
         user_data: The user data for this item.
     """
 
-    def __init__(self, url, original_url, title, active=False, user_data=None):
+    def __init__(self, url, title, *, original_url=None, active=False,
+                 user_data=None):
         self.url = url
-        self.original_url = original_url
+        if original_url is None:
+            self.original_url = url
+        else:
+            self.original_url = original_url
         self.title = title
         self.active = active
         self.user_data = user_data
@@ -133,7 +138,7 @@ def serialize(items):
 
     Return:
         A (stream, data, user_data) tuple.
-            stream: The reseted QDataStream.
+            stream: The reset QDataStream.
             data: The QByteArray with the raw data.
             user_data: A list with each item's user data.
 

qutebrowser/browser/urlmarks.py

@@ -0,0 +1,298 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2016 Antoni Boucher <bouanto@zoho.com>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Managers for bookmarks and quickmarks.
+
+Note we violate our general QUrl rule by storing url strings in the marks
+OrderedDict. This is because we read them from a file at start and write them
+to a file on shutdown, so it makes sense to keep them as strings here.
+"""
+
+import os
+import os.path
+import functools
+import collections
+
+from PyQt5.QtCore import pyqtSignal, QUrl, QObject
+
+from qutebrowser.utils import message, usertypes, urlutils, standarddir, objreg
+from qutebrowser.commands import cmdexc, cmdutils
+from qutebrowser.misc import lineparser
+
+
+class Error(Exception):
+
+    """Base class for all errors in this module."""
+
+    pass
+
+
+class InvalidUrlError(Error):
+
+    """Exception emitted when a URL is invalid."""
+
+    pass
+
+
+class DoesNotExistError(Error):
+
+    """Exception emitted when a given URL does not exist."""
+
+    pass
+
+
+class AlreadyExistsError(Error):
+
+    """Exception emitted when a given URL does already exist."""
+
+    pass
+
+
+class UrlMarkManager(QObject):
+
+    """Base class for BookmarkManager and QuickmarkManager.
+
+    Attributes:
+        marks: An OrderedDict of all quickmarks/bookmarks.
+        _lineparser: The LineParser used for the marks, or None
+                     (when qutebrowser is started with -c '').
+
+    Signals:
+        changed: Emitted when anything changed.
+        added: Emitted when a new quickmark/bookmark was added.
+        removed: Emitted when an existing quickmark/bookmark was removed.
+    """
+
+    changed = pyqtSignal()
+    added = pyqtSignal(str, str)
+    removed = pyqtSignal(str)
+
+    def __init__(self, parent=None):
+        """Initialize and read quickmarks."""
+        super().__init__(parent)
+
+        self.marks = collections.OrderedDict()
+        self._lineparser = None
+
+        if standarddir.config() is None:
+            return
+
+        self._init_lineparser()
+        for line in self._lineparser:
+            if not line.strip():
+                # Ignore empty or whitespace-only lines.
+                continue
+            self._parse_line(line)
+        self._init_savemanager(objreg.get('save-manager'))
+
+    def _init_lineparser(self):
+        raise NotImplementedError
+
+    def _parse_line(self, line):
+        raise NotImplementedError
+
+    def _init_savemanager(self, _save_manager):
+        raise NotImplementedError
+
+    def save(self):
+        """Save the marks to disk."""
+        if self._lineparser is not None:
+            self._lineparser.data = [' '.join(tpl)
+                                     for tpl in self.marks.items()]
+            self._lineparser.save()
+
+    def delete(self, key):
+        """Delete a quickmark/bookmark.
+
+        Args:
+            key: The key to delete (name for quickmarks, URL for bookmarks.)
+        """
+        del self.marks[key]
+        self.changed.emit()
+        self.removed.emit(key)
+
+
+class QuickmarkManager(UrlMarkManager):
+
+    """Manager for quickmarks.
+
+    The primary key for quickmarks is their *name*, this means:
+
+        - self.marks maps names to URLs.
+        - changed gets emitted with the name as first argument and the URL as
+          second argument.
+        - removed gets emitted with the name as argument.
+    """
+
+    def _init_lineparser(self):
+        self._lineparser = lineparser.LineParser(
+            standarddir.config(), 'quickmarks', parent=self)
+
+    def _init_savemanager(self, save_manager):
+        filename = os.path.join(standarddir.config(), 'quickmarks')
+        save_manager.add_saveable('quickmark-manager', self.save, self.changed,
+                                  filename=filename)
+
+    def _parse_line(self, line):
+        try:
+            key, url = line.rsplit(maxsplit=1)
+        except ValueError:
+            message.error('current', "Invalid quickmark '{}'".format(
+                line))
+        else:
+            self.marks[key] = url
+
+    def prompt_save(self, win_id, url):
+        """Prompt for a new quickmark name to be added and add it.
+
+        Args:
+            win_id: The current window ID.
+            url: The quickmark url as a QUrl.
+        """
+        if not url.isValid():
+            urlutils.invalid_url_error(win_id, url, "save quickmark")
+            return
+        urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
+        message.ask_async(
+            win_id, "Add quickmark:", usertypes.PromptMode.text,
+            functools.partial(self.quickmark_add, win_id, urlstr))
+
+    @cmdutils.register(instance='quickmark-manager', win_id='win_id')
+    def quickmark_add(self, win_id, url, name):
+        """Add a new quickmark.
+
+        Args:
+            win_id: The window ID to display the errors in.
+            url: The url to add as quickmark.
+            name: The name for the new quickmark.
+        """
+        # We don't raise cmdexc.CommandError here as this can be called async
+        # via prompt_save.
+        if not name:
+            message.error(win_id, "Can't set mark with empty name!")
+            return
+        if not url:
+            message.error(win_id, "Can't set mark with empty URL!")
+            return
+
+        def set_mark():
+            """Really set the quickmark."""
+            self.marks[name] = url
+            self.changed.emit()
+            self.added.emit(name, url)
+
+        if name in self.marks:
+            message.confirm_async(
+                win_id, "Override existing quickmark?", set_mark, default=True)
+        else:
+            set_mark()
+
+    @cmdutils.register(instance='quickmark-manager', maxsplit=0,
+                       completion=[usertypes.Completion.quickmark_by_name])
+    def quickmark_del(self, name):
+        """Delete a quickmark.
+
+        Args:
+            name: The name of the quickmark to delete.
+        """
+        try:
+            self.delete(name)
+        except KeyError:
+            raise cmdexc.CommandError("Quickmark '{}' not found!".format(name))
+
+    def get(self, name):
+        """Get the URL of the quickmark named name as a QUrl."""
+        if name not in self.marks:
+            raise DoesNotExistError(
+                "Quickmark '{}' does not exist!".format(name))
+        urlstr = self.marks[name]
+        try:
+            url = urlutils.fuzzy_url(urlstr, do_search=False)
+        except urlutils.InvalidUrlError as e:
+            raise InvalidUrlError(
+                "Invalid URL for quickmark {}: {}".format(name, str(e)))
+        return url
+
+
+class BookmarkManager(UrlMarkManager):
+
+    """Manager for bookmarks.
+
+    The primary key for bookmarks is their *url*, this means:
+
+        - self.marks maps URLs to titles.
+        - changed gets emitted with the URL as first argument and the title as
+          second argument.
+        - removed gets emitted with the URL as argument.
+    """
+
+    def _init_lineparser(self):
+        bookmarks_directory = os.path.join(standarddir.config(), 'bookmarks')
+        if not os.path.isdir(bookmarks_directory):
+            os.makedirs(bookmarks_directory)
+
+        bookmarks_subdir = os.path.join('bookmarks', 'urls')
+        self._lineparser = lineparser.LineParser(
+            standarddir.config(), bookmarks_subdir, parent=self)
+
+    def _init_savemanager(self, save_manager):
+        filename = os.path.join(standarddir.config(), 'bookmarks', 'urls')
+        save_manager.add_saveable('bookmark-manager', self.save, self.changed,
+                                  filename=filename)
+
+    def _parse_line(self, line):
+        parts = line.split(maxsplit=1)
+        if len(parts) == 2:
+            self.marks[parts[0]] = parts[1]
+        elif len(parts) == 1:
+            self.marks[parts[0]] = ''
+
+    def add(self, url, title):
+        """Add a new bookmark.
+
+        Args:
+            url: The url to add as bookmark.
+            title: The title for the new bookmark.
+        """
+        if not url.isValid():
+            errstr = urlutils.get_errstring(url)
+            raise InvalidUrlError(errstr)
+
+        urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
+
+        if urlstr in self.marks:
+            raise AlreadyExistsError("Bookmark already exists!")
+        else:
+            self.marks[urlstr] = title
+            self.changed.emit()
+            self.added.emit(title, urlstr)
+
+    @cmdutils.register(instance='bookmark-manager', maxsplit=0,
+                       completion=[usertypes.Completion.bookmark_by_url])
+    def bookmark_del(self, url):
+        """Delete a bookmark.
+
+        Args:
+            url: The URL of the bookmark to delete.
+        """
+        try:
+            self.delete(url)
+        except KeyError:
+            raise cmdexc.CommandError("Bookmark '{}' not found!".format(url))

qutebrowser/browser/webelem.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -43,18 +43,23 @@ Group = usertypes.enum('Group', ['all', 'links', 'images', 'url', 'prevnext',
 
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
-                'frame, iframe, [onclick], [onmousedown], [role=link], '
+                'frame, iframe, link, [onclick], [onmousedown], [role=link], '
                 '[role=option], [role=button], img'),
     Group.links: 'a, area, link, [role=link]',
     Group.images: 'img',
     Group.url: '[src], [href]',
-    Group.prevnext: 'a, area, button, [role=button]',
+    Group.prevnext: 'a, area, button, link, [role=button]',
     Group.focus: '*:focus',
 }
 
+
+def filter_links(elem):
+    return 'href' in elem and QUrl(elem['href']).scheme() != 'javascript'
+
+
 FILTERS = {
-    Group.links: (lambda e: 'href' in e and
-                            QUrl(e['href']).scheme() != 'javascript'),
+    Group.links: filter_links,
+    Group.prevnext: filter_links,
 }
 
 
@@ -101,7 +106,6 @@ class WebElementWrapper(collections.abc.MutableMapping):
             method = getattr(self._elem, name)
 
             def _wrapper(meth, *args, **kwargs):
-                # pylint: disable=missing-docstring
                 self._check_vanished()
                 return meth(*args, **kwargs)
 
@@ -136,7 +140,7 @@ class WebElementWrapper(collections.abc.MutableMapping):
         self._check_vanished()
         if key not in self:
             raise KeyError(key)
-        self.removeAttribute(key)
+        self._elem.removeAttribute(key)
 
     def __contains__(self, key):
         self._check_vanished()
@@ -179,8 +183,6 @@ class WebElementWrapper(collections.abc.MutableMapping):
     def is_content_editable(self):
         """Check if an element has a contenteditable attribute.
 
-        FIXME: Add tests.
-
         Args:
             elem: The QWebElement to check.
 
@@ -240,12 +242,11 @@ class WebElementWrapper(collections.abc.MutableMapping):
         for klass in self._elem.classes():
             if any([klass.startswith(e) for e in div_classes]):
                 return True
+        return False
 
     def is_editable(self, strict=False):
         """Check whether we should switch to insert mode for this element.
 
-        FIXME: add tests
-
         Args:
             strict: Whether to do stricter checking so only fields where we can
                     get the value match, for use with the :editor command.
@@ -261,7 +262,7 @@ class WebElementWrapper(collections.abc.MutableMapping):
         tag = self._elem.tagName().lower()
         if self.is_content_editable() and self.is_writable():
             return True
-        elif self.get('role', None) in roles:
+        elif self.get('role', None) in roles and self.is_writable():
             return True
         elif tag == 'input':
             return self._is_editable_input()
@@ -279,6 +280,7 @@ class WebElementWrapper(collections.abc.MutableMapping):
 
     def is_text_input(self):
         """Check if this element is some kind of text box."""
+        self._check_vanished()
         roles = ('combobox', 'textbox')
         tag = self._elem.tagName().lower()
         return self.get('role', None) in roles or tag in ('input', 'textarea')
@@ -303,6 +305,12 @@ def javascript_escape(text):
         ("'", r"\'"),   # Then escape ' and " as \' and \".
         ('"', r'\"'),   # (note it won't hurt when we escape the wrong one).
         ('\n', r'\n'),  # We also need to escape newlines for some reason.
+        ('\r', r'\r'),
+        ('\x00', r'\x00'),
+        ('\ufeff', r'\ufeff'),
+        # http://stackoverflow.com/questions/2965293/
+        ('\u2028', r'\u2028'),
+        ('\u2029', r'\u2029'),
     )
     for orig, repl in replacements:
         text = text.replace(orig, repl)
@@ -312,7 +320,7 @@ def javascript_escape(text):
 def get_child_frames(startframe):
     """Get all children recursively of a given QWebFrame.
 
-    Loosly based on http://blog.nextgenetics.net/?e=64
+    Loosely based on http://blog.nextgenetics.net/?e=64
 
     Args:
         startframe: The QWebFrame to start with.
@@ -334,8 +342,6 @@ def get_child_frames(startframe):
 def focus_elem(frame):
     """Get the focused element in a web frame.
 
-    FIXME: Add tests.
-
     Args:
         frame: The QWebFrame to search in.
     """

qutebrowser/browser/webpage.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -30,7 +30,7 @@ from PyQt5.QtPrintSupport import QPrintDialog
 from PyQt5.QtWebKitWidgets import QWebPage
 
 from qutebrowser.config import config
-from qutebrowser.browser import http, tabhistory
+from qutebrowser.browser import http, tabhistory, pdfjs
 from qutebrowser.browser.network import networkmanager
 from qutebrowser.utils import (message, usertypes, log, jinja, qtutils, utils,
                                objreg, debug)
@@ -46,7 +46,7 @@ class BrowserPage(QWebPage):
                      ("normal", "tab", "tab_bg")
         _hint_target: Override for open_target while hinting, or None.
         _extension_handlers: Mapping of QWebPage extensions to their handlers.
-        _networkmnager: The NetworkManager used.
+        _networkmanager: The NetworkManager used.
         _win_id: The window ID this BrowserPage is associated with.
         _ignore_load_started: Whether to ignore the next loadStarted signal.
         _is_shutting_down: Whether the page is currently shutting down.
@@ -109,7 +109,7 @@ class BrowserPage(QWebPage):
     def _handle_errorpage(self, info, errpage):
         """Display an error page if needed.
 
-        Loosly based on Helpviewer/HelpBrowserWV.py from eric5
+        Loosely based on Helpviewer/HelpBrowserWV.py from eric5
         (line 260 @ 5d937eb378dd)
 
         Args:
@@ -168,7 +168,7 @@ class BrowserPage(QWebPage):
             title = "Error loading page: {}".format(urlstr)
             template = jinja.env.get_template('error.html')
             # pylint: disable=no-member
-            # https://bitbucket.org/logilab/pylint/issue/490/
+            # WORKAROUND for https://bitbucket.org/logilab/pylint/issue/490/
             html = template.render(
                 title=title, url=urlstr, error=error_str, icon='')
             errpage.content = html.encode('utf-8')
@@ -178,7 +178,7 @@ class BrowserPage(QWebPage):
     def _handle_multiple_files(self, info, files):
         """Handle uploading of multiple files.
 
-        Loosly based on Helpviewer/HelpBrowserWV.py from eric5.
+        Loosely based on Helpviewer/HelpBrowserWV.py from eric5.
 
         Args:
             info: The ChooseMultipleFilesExtensionOption instance.
@@ -218,6 +218,19 @@ class BrowserPage(QWebPage):
         q.deleteLater()
         return q.answer
 
+    def _show_pdfjs(self, reply):
+        """Show the reply with pdfjs."""
+        try:
+            page = pdfjs.generate_pdfjs_page(reply.url()).encode('utf-8')
+        except pdfjs.PDFJSNotFound:
+            # pylint: disable=no-member
+            # WORKAROUND for https://bitbucket.org/logilab/pylint/issue/490/
+            page = (jinja.env.get_template('no_pdfjs.html')
+                    .render(url=reply.url().toDisplayString())
+                    .encode('utf-8'))
+        self.mainFrame().setContent(page, 'text/html', reply.url())
+        reply.deleteLater()
+
     def shutdown(self):
         """Prepare the web page for being deleted."""
         self._is_shutting_down = True
@@ -241,7 +254,7 @@ class BrowserPage(QWebPage):
         if cur_data is not None:
             frame = self.mainFrame()
             if 'zoom' in cur_data:
-                frame.setZoomFactor(cur_data['zoom'])
+                frame.page().view().zoom_perc(cur_data['zoom'] * 100)
             if ('scroll-pos' in cur_data and
                     frame.scrollPosition() == QPoint(0, 0)):
                 QTimer.singleShot(0, functools.partial(
@@ -305,6 +318,10 @@ class BrowserPage(QWebPage):
             else:
                 reply.finished.connect(functools.partial(
                     self.display_content, reply, 'image/jpeg'))
+        elif (mimetype in {'application/pdf', 'application/x-pdf'} and
+              config.get('content', 'enable-pdfjs')):
+            # Use pdf.js to display the page
+            self._show_pdfjs(reply)
         else:
             # Unknown mimetype, so download anyways.
             download_manager.fetch(reply,
@@ -325,7 +342,8 @@ class BrowserPage(QWebPage):
             QWebPage.Notifications: ('content', 'notifications'),
             QWebPage.Geolocation: ('content', 'geolocation'),
         }
-        if config.get(*options[feature]) == 'ask':
+        config_val = config.get(*options[feature])
+        if config_val == 'ask':
             bridge = objreg.get('message-bridge', scope='window',
                                 window=self._win_id)
             q = usertypes.Question(bridge)
@@ -361,6 +379,9 @@ class BrowserPage(QWebPage):
             self.loadStarted.connect(q.abort)
 
             bridge.ask(q, blocking=False)
+        elif config_val:
+            self.setFeaturePermission(frame, feature,
+                                      QWebPage.PermissionGrantedByUser)
         else:
             self.setFeaturePermission(frame, feature,
                                       QWebPage.PermissionDeniedByUser)
@@ -414,7 +435,7 @@ class BrowserPage(QWebPage):
         if data is None:
             return
         if 'zoom' in data:
-            frame.setZoomFactor(data['zoom'])
+            frame.page().view().zoom_perc(data['zoom'] * 100)
         if 'scroll-pos' in data and frame.scrollPosition() == QPoint(0, 0):
             frame.setScrollPosition(data['scroll-pos'])
 
@@ -423,14 +444,10 @@ class BrowserPage(QWebPage):
         """Emitted before a hinting-click takes place.
 
         Args:
-            hint_target: A string to set self._hint_target to.
+            hint_target: A ClickTarget member to set self._hint_target to.
         """
-        t = getattr(usertypes.ClickTarget, hint_target, None)
-        if t is None:
-            return
-        log.webview.debug("Setting force target to {}/{}".format(
-            hint_target, t))
-        self._hint_target = t
+        log.webview.debug("Setting force target to {}".format(hint_target))
+        self._hint_target = hint_target
 
     @pyqtSlot()
     def on_stop_hinting(self):
@@ -478,17 +495,23 @@ class BrowserPage(QWebPage):
             return super().extension(ext, opt, out)
         return handler(opt, out)
 
-    def javaScriptAlert(self, _frame, msg):
+    def javaScriptAlert(self, frame, msg):
         """Override javaScriptAlert to use the statusbar."""
         log.js.debug("alert: {}".format(msg))
+        if config.get('ui', 'modal-js-dialog'):
+            return super().javaScriptAlert(frame, msg)
+
         if (self._is_shutting_down or
                 config.get('content', 'ignore-javascript-alert')):
             return
         self._ask("[js alert] {}".format(msg), usertypes.PromptMode.alert)
 
-    def javaScriptConfirm(self, _frame, msg):
+    def javaScriptConfirm(self, frame, msg):
         """Override javaScriptConfirm to use the statusbar."""
         log.js.debug("confirm: {}".format(msg))
+        if config.get('ui', 'modal-js-dialog'):
+            return super().javaScriptConfirm(frame, msg)
+
         if self._is_shutting_down:
             return False
         ans = self._ask("[js confirm] {}".format(msg),
@@ -497,8 +520,15 @@ class BrowserPage(QWebPage):
 
     def javaScriptConsoleMessage(self, msg, line, source):
         """Override javaScriptConsoleMessage to use debug log."""
-        if config.get('general', 'log-javascript-console'):
-            log.js.debug("[{}:{}] {}".format(source, line, msg))
+        log_javascript_console = config.get('general',
+                                            'log-javascript-console')
+        logstring = "[{}:{}] {}".format(source, line, msg)
+        logmap = {
+            'debug': log.js.debug,
+            'info': log.js.info,
+            'none': lambda arg: None
+        }
+        logmap[log_javascript_console](logstring)
 
     def chooseFile(self, _frame, suggested_file):
         """Override QWebPage's chooseFile to be able to chose a file to upload.

qutebrowser/browser/webview.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -24,6 +24,7 @@ import itertools
 import functools
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer, QUrl
+from PyQt5.QtGui import QPalette
 from PyQt5.QtWidgets import QApplication, QStyleFactory
 from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtWebKitWidgets import QWebView, QWebPage
@@ -32,11 +33,10 @@ from qutebrowser.config import config
 from qutebrowser.keyinput import modeman
 from qutebrowser.utils import message, log, usertypes, utils, qtutils, objreg
 from qutebrowser.browser import webpage, hints, webelem
-from qutebrowser.commands import cmdexc
 
 
-LoadStatus = usertypes.enum('LoadStatus', ['none', 'success', 'error', 'warn',
-                                           'loading'])
+LoadStatus = usertypes.enum('LoadStatus', ['none', 'success', 'success_https',
+                                           'error', 'warn', 'loading'])
 
 
 tab_id_gen = itertools.count(0)
@@ -64,13 +64,14 @@ class WebView(QWebView):
         win_id: The window ID of the view.
         search_text: The text of the last search.
         search_flags: The search flags of the last search.
-        _cur_url: The current URL (accessed via cur_url property).
         _has_ssl_errors: Whether SSL errors occurred during loading.
         _zoom: A NeighborList with the zoom levels.
         _old_scroll_pos: The old scroll position.
         _check_insertmode: If True, in mouseReleaseEvent we should check if we
                            need to enter/leave insert mode.
         _default_zoom_changed: Whether the zoom was changed from the default.
+        _ignore_wheel_event: Ignore the next wheel event.
+                             See https://github.com/The-Compiler/qutebrowser/issues/395
 
     Signals:
         scroll_pos_changed: Scroll percentage of current tab changed.
@@ -103,10 +104,13 @@ class WebView(QWebView):
         self._old_scroll_pos = (-1, -1)
         self._zoom = None
         self._has_ssl_errors = False
+        self._ignore_wheel_event = False
         self.keep_icon = False
         self.search_text = None
         self.search_flags = 0
+        self.selection_enabled = False
         self.init_neighborlist()
+        self._set_bg_color()
         cfg = objreg.get('config')
         cfg.changed.connect(self.init_neighborlist)
         # For some reason, this signal doesn't get disconnected automatically
@@ -114,7 +118,6 @@ class WebView(QWebView):
         # See https://github.com/The-Compiler/qutebrowser/issues/390
         self.destroyed.connect(functools.partial(
             cfg.changed.disconnect, self.init_neighborlist))
-        self._cur_url = None
         self.cur_url = QUrl()
         self.progress = 0
         self.registry = objreg.ObjectRegistry()
@@ -156,11 +159,11 @@ class WebView(QWebView):
         return page
 
     def __repr__(self):
-        url = utils.elide(self.url().toDisplayString(), 50)
+        url = utils.elide(self.url().toDisplayString(QUrl.EncodeUnicode), 100)
         return utils.get_repr(self, tab_id=self.tab_id, url=url)
 
     def __del__(self):
-        # Explicitely releasing the page here seems to prevent some segfaults
+        # Explicitly releasing the page here seems to prevent some segfaults
         # when quitting.
         # Copied from:
         # https://code.google.com/p/webscraping/source/browse/webkit.py#325
@@ -180,6 +183,15 @@ class WebView(QWebView):
         self.load_status = val
         self.load_status_changed.emit(val.name)
 
+    def _set_bg_color(self):
+        """Set the webpage background color as configured."""
+        col = config.get('colors', 'webpage.bg')
+        palette = self.palette()
+        if col is None:
+            col = self.style().standardPalette().color(QPalette.Base)
+        palette.setColor(QPalette.Base, col)
+        self.setPalette(palette)
+
     @pyqtSlot(str, str)
     def on_config_changed(self, section, option):
         """Reinitialize the zoom neighborlist if related config changed."""
@@ -194,6 +206,8 @@ class WebView(QWebView):
                 self.setContextMenuPolicy(Qt.PreventContextMenu)
             else:
                 self.setContextMenuPolicy(Qt.DefaultContextMenu)
+        elif section == 'colors' and option == 'webpage.bg':
+            self._set_bg_color()
 
     def init_neighborlist(self):
         """Initialize the _zoom neighborlist."""
@@ -278,7 +292,7 @@ class WebView(QWebView):
         try:
             elem = webelem.focus_elem(self.page().currentFrame())
         except (webelem.IsNullError, RuntimeError):
-            log.mouse.warning("Element/page vanished!")
+            log.mouse.debug("Element/page vanished!")
             return
         if elem.is_editable():
             log.mouse.debug("Clicked editable element (delayed)!")
@@ -355,9 +369,8 @@ class WebView(QWebView):
         if fuzzyval:
             self._zoom.fuzzyval = int(perc)
         if perc < 0:
-            raise cmdexc.CommandError("Can't zoom {}%!".format(perc))
+            raise ValueError("Can't zoom {}%!".format(perc))
         self.setZoomFactor(float(perc) / 100)
-        message.info(self.win_id, "Zoom level: {}%".format(perc))
         self._default_zoom_changed = True
 
     def zoom(self, offset):
@@ -365,9 +378,13 @@ class WebView(QWebView):
 
         Args:
             offset: The offset in the zoom level list.
+
+        Return:
+            The new zoom percentage.
         """
         level = self._zoom.getitem(offset)
         self.zoom_perc(level, fuzzyval=False)
+        return level
 
     @pyqtSlot('QUrl')
     def on_url_changed(self, url):
@@ -378,6 +395,8 @@ class WebView(QWebView):
         if url.isValid():
             self.cur_url = url
             self.url_text_changed.emit(url.toDisplayString())
+            if not self.title():
+                self.titleChanged.emit(self.url().toDisplayString())
 
     @pyqtSlot('QMouseEvent')
     def on_mouse_event(self, evt):
@@ -396,7 +415,7 @@ class WebView(QWebView):
 
     @pyqtSlot()
     def on_load_finished(self):
-        """Handle auto-insert-mode after loading finished.
+        """Handle a finished page load.
 
         We don't take loadFinished's ok argument here as it always seems to be
         true when the QWebPage has an ErrorPageExtension implemented.
@@ -404,11 +423,21 @@ class WebView(QWebView):
         """
         ok = not self.page().error_occurred
         if ok and not self._has_ssl_errors:
-            self._set_load_status(LoadStatus.success)
+            if self.cur_url.scheme() == 'https':
+                self._set_load_status(LoadStatus.success_https)
+            else:
+                self._set_load_status(LoadStatus.success)
+
         elif ok:
             self._set_load_status(LoadStatus.warn)
         else:
             self._set_load_status(LoadStatus.error)
+        if not self.title():
+            self.titleChanged.emit(self.url().toDisplayString())
+        self._handle_auto_insert_mode(ok)
+
+    def _handle_auto_insert_mode(self, ok):
+        """Handle auto-insert-mode after loading finished."""
         if not config.get('input', 'auto-insert-mode'):
             return
         mode_manager = objreg.get('mode-manager', scope='window',
@@ -435,6 +464,25 @@ class WebView(QWebView):
             log.webview.debug("Ignoring focus because mode {} was "
                               "entered.".format(mode))
             self.setFocusPolicy(Qt.NoFocus)
+        elif mode == usertypes.KeyMode.caret:
+            settings = self.settings()
+            settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
+            self.selection_enabled = bool(self.page().selectedText())
+
+            if self.isVisible():
+                # Sometimes the caret isn't immediately visible, but unfocusing
+                # and refocusing it fixes that.
+                self.clearFocus()
+                self.setFocus(Qt.OtherFocusReason)
+
+                # Move the caret to the first element in the viewport if there
+                # isn't any text which is already selected.
+                #
+                # Note: We can't use hasSelection() here, as that's always
+                # true in caret mode.
+                if not self.page().selectedText():
+                    self.page().currentFrame().evaluateJavaScript(
+                        utils.read_file('javascript/position_caret.js'))
 
     @pyqtSlot(usertypes.KeyMode)
     def on_mode_left(self, mode):
@@ -443,6 +491,15 @@ class WebView(QWebView):
                     usertypes.KeyMode.yesno):
             log.webview.debug("Restoring focus policy because mode {} was "
                               "left.".format(mode))
+        elif mode == usertypes.KeyMode.caret:
+            settings = self.settings()
+            if settings.testAttribute(QWebSettings.CaretBrowsingEnabled):
+                if self.selection_enabled and self.hasSelection():
+                    # Remove selection if it exists
+                    self.triggerPageAction(QWebPage.MoveToNextChar)
+                settings.setAttribute(QWebSettings.CaretBrowsingEnabled, False)
+                self.selection_enabled = False
+
         self.setFocusPolicy(Qt.WheelFocus)
 
     def search(self, text, flags):
@@ -457,12 +514,25 @@ class WebView(QWebView):
         old_scroll_pos = self.scroll_pos
         flags = QWebPage.FindFlags(flags)
         found = self.findText(text, flags)
-        if not found and not flags & QWebPage.HighlightAllOccurrences and text:
-            message.error(self.win_id, "Text '{}' not found on "
-                          "page!".format(text), immediately=True)
-        else:
-            backward = int(flags) & QWebPage.FindBackward
+        backward = flags & QWebPage.FindBackward
 
+        if not found and not flags & QWebPage.HighlightAllOccurrences and text:
+            # User disabled wrapping; but findText() just returns False. If we
+            # have a selection, we know there's a match *somewhere* on the page
+            if (not flags & QWebPage.FindWrapsAroundDocument and
+                    self.hasSelection()):
+                if not backward:
+                    message.warning(self.win_id, "Search hit BOTTOM without "
+                                    "match for: {}".format(text),
+                                    immediately=True)
+                else:
+                    message.warning(self.win_id, "Search hit TOP without "
+                                    "match for: {}".format(text),
+                                    immediately=True)
+            else:
+                message.warning(self.win_id, "Text '{}' not found on "
+                                "page!".format(text), immediately=True)
+        else:
             def check_scroll_pos():
                 """Check if the scroll position got smaller and show info."""
                 if not backward and self.scroll_pos < old_scroll_pos:
@@ -551,6 +621,7 @@ class WebView(QWebView):
             return
         self._mousepress_insertmode(e)
         self._mousepress_opentarget(e)
+        self._ignore_wheel_event = True
         super().mousePressEvent(e)
 
     def mouseReleaseEvent(self, e):
@@ -564,6 +635,7 @@ class WebView(QWebView):
         """Save a reference to the context menu so we can close it."""
         menu = self.page().createStandardContextMenu()
         self.shutting_down.connect(menu.close)
+        modeman.instance(self.win_id).entered.connect(menu.close)
         menu.exec_(e.globalPos())
 
     def wheelEvent(self, e):
@@ -572,6 +644,10 @@ class WebView(QWebView):
         Args:
             e: The QWheelEvent.
         """
+        if self._ignore_wheel_event:
+            self._ignore_wheel_event = False
+            # See https://github.com/The-Compiler/qutebrowser/issues/395
+            return
         if e.modifiers() & Qt.ControlModifier:
             e.accept()
             divider = config.get('input', 'mouse-zoom-divider')

qutebrowser/commands/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/commands/argparser.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -38,7 +38,7 @@ class ArgumentParserError(Exception):
 
 class ArgumentParserExit(Exception):
 
-    """Exception raised when the argument parser exitted.
+    """Exception raised when the argument parser exited.
 
     Attributes:
         status: The exit status.
@@ -81,7 +81,7 @@ class ArgumentParser(argparse.ArgumentParser):
         raise ArgumentParserExit(status, msg)
 
     def error(self, msg):
-        raise ArgumentParserError(msg[0].upper() + msg[1:])
+        raise ArgumentParserError(msg.capitalize())
 
 
 def enum_getter(enum):
@@ -101,11 +101,11 @@ def enum_getter(enum):
     return _get_enum_item
 
 
-def multitype_conv(tpl):
+def multitype_conv(types):
     """Function factory to get a type converter for a choice of types."""
     def _convert(value):
         """Convert a value according to an iterable of possible arg types."""
-        for typ in set(tpl):
+        for typ in set(types):
             if isinstance(typ, str):
                 if value == typ:
                     return value
@@ -119,6 +119,8 @@ def multitype_conv(tpl):
                     return typ(value)
                 except (TypeError, ValueError):
                     pass
+            else:
+                raise ValueError("Unknown type {!r}!".format(typ))
         raise cmdexc.ArgumentTypeError('Invalid value {}.'.format(value))
 
     return _convert

qutebrowser/commands/cmdexc.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -42,13 +42,6 @@ class NoSuchCommandError(CommandMetaError):
     pass
 
 
-class ArgumentCountError(CommandMetaError):
-
-    """Raised when a command was called with an invalid count of arguments."""
-
-    pass
-
-
 class ArgumentTypeError(CommandMetaError):
 
     """Raised when an argument had an invalid type."""

qutebrowser/commands/cmdutils.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -21,6 +21,7 @@
 
 Module attributes:
     cmd_dict: A mapping from command-strings to command objects.
+    aliases: A list of all aliases, needed for doc generation.
 """
 
 from qutebrowser.utils import qtutils, log

qutebrowser/commands/command.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -29,6 +29,11 @@ from qutebrowser.utils import log, utils, message, docutils, objreg, usertypes
 from qutebrowser.utils import debug as debug_utils
 
 
+def arg_name(name):
+    """Get the name an argument should have based on its Python name."""
+    return name.rstrip('_').replace('_', '-')
+
+
 class Command:
 
     """Base skeleton for a command.
@@ -44,12 +49,11 @@ class Command:
         completion: Completions to use for arguments, as a list of strings.
         debug: Whether this is a debugging command (only shown with --debug).
         parser: The ArgumentParser to use to parse this command.
-        special_params: A dict with the names of the special parameters as
-                        values.
+        count_arg: The name of the count parameter, or None.
+        win_id_arg: The name of the win_id parameter, or None.
         flags_with_args: A list of flags which take an argument.
         no_cmd_split: If true, ';;' to split sub-commands is ignored.
         _type_conv: A mapping of conversion functions for arguments.
-        _name_conv: A mapping of argument names to parameter names.
         _needs_js: Whether the command needs javascript enabled
         _modes: The modes the command can be executed in.
         _not_modes: The modes the command can not be executed in.
@@ -62,15 +66,16 @@ class Command:
     """
 
     AnnotationInfo = collections.namedtuple('AnnotationInfo',
-                                            ['kwargs', 'type', 'name', 'flag',
-                                             'special'])
+                                            ['kwargs', 'type', 'flag', 'hide',
+                                             'metavar'])
 
     def __init__(self, *, handler, name, instance=None, maxsplit=None,
                  hide=False, completion=None, modes=None, not_modes=None,
                  needs_js=False, debug=False, ignore_args=False,
-                 deprecated=False, no_cmd_split=False, scope='global'):
+                 deprecated=False, no_cmd_split=False, scope='global',
+                 count=None, win_id=None):
         # I really don't know how to solve this in a better way, I tried.
-        # pylint: disable=too-many-arguments,too-many-locals
+        # pylint: disable=too-many-locals
         if modes is not None and not_modes is not None:
             raise ValueError("Only modes or not_modes can be given!")
         if modes is not None:
@@ -81,6 +86,9 @@ class Command:
             for m in not_modes:
                 if not isinstance(m, usertypes.KeyMode):
                     raise TypeError("Mode {} is no KeyMode member!".format(m))
+        if scope != 'global' and instance is None:
+            raise ValueError("Setting scope without setting instance makes "
+                             "no sense!")
         self.name = name
         self.maxsplit = maxsplit
         self.hide = hide
@@ -95,6 +103,8 @@ class Command:
         self.ignore_args = ignore_args
         self.handler = handler
         self.no_cmd_split = no_cmd_split
+        self.count_arg = count
+        self.win_id_arg = win_id
         self.docparser = docutils.DocstringParser(handler)
         self.parser = argparser.ArgumentParser(
             name, description=self.docparser.short_desc,
@@ -107,11 +117,9 @@ class Command:
         self.namespace = None
         self._count = None
         self.pos_args = []
-        self.special_params = {'count': None, 'win_id': None}
         self.desc = None
         self.flags_with_args = []
         self._type_conv = {}
-        self._name_conv = {}
         count = self._inspect_func()
         if self.completion is not None and len(self.completion) > count:
             raise ValueError("Got {} completions, but only {} "
@@ -153,7 +161,8 @@ class Command:
         elif 'self' not in signature.parameters and self._instance is not None:
             raise TypeError("{} is not a class method, but instance was "
                             "given!".format(self.name[0]))
-        elif inspect.getfullargspec(self.handler).varkw is not None:
+        elif any(param.kind == inspect.Parameter.VAR_KEYWORD
+                 for param in signature.parameters.values()):
             raise TypeError("{}: functions with varkw arguments are not "
                             "supported!".format(self.name[0]))
 
@@ -173,52 +182,22 @@ class Command:
             type_conv[param.name] = argparser.multitype_conv(typ)
         return type_conv
 
-    def _get_nameconv(self, param, annotation_info):
-        """Get a dict with a name conversion for the parameter.
-
-        Args:
-            param: The inspect.Parameter to handle.
-            annotation_info: The AnnotationInfo tuple for the parameter.
-        """
-        d = {}
-        if annotation_info.name is not None:
-            d[param.name] = annotation_info.name
-        return d
-
-    def _inspect_special_param(self, param, annotation_info):
+    def _inspect_special_param(self, param):
         """Check if the given parameter is a special one.
 
         Args:
             param: The inspect.Parameter to handle.
-            annotation_info: The AnnotationInfo tuple for the parameter.
 
         Return:
             True if the parameter is special, False otherwise.
         """
-        special = annotation_info.special
-        if special == 'count':
-            if self.special_params['count'] is not None:
-                raise ValueError("Registered multiple parameters ({}/{}) as "
-                                 "count!".format(self.special_params['count'],
-                                                 param.name))
+        if param.name == self.count_arg:
             if param.default is inspect.Parameter.empty:
                 raise TypeError("{}: handler has count parameter "
                                 "without default!".format(self.name))
-            self.special_params['count'] = param.name
             return True
-        elif special == 'win_id':
-            if self.special_params['win_id'] is not None:
-                raise ValueError("Registered multiple parameters ({}/{}) as "
-                                 "win_id!".format(
-                                     self.special_params['win_id'],
-                                     param.name))
-            self.special_params['win_id'] = param.name
+        elif param.name == self.win_id_arg:
             return True
-        elif special is None:
-            return False
-        else:
-            raise ValueError("{}: Invalid value '{}' for 'special' "
-                             "annotation!".format(self.name, special))
 
     def _inspect_func(self):
         """Inspect the function to get useful informations from it.
@@ -236,20 +215,28 @@ class Command:
             self.desc = doc.splitlines()[0].strip()
         else:
             self.desc = ""
+
+        if (self.count_arg is not None and
+                self.count_arg not in signature.parameters):
+            raise ValueError("count parameter {} does not exist!".format(
+                self.count_arg))
+        if (self.win_id_arg is not None and
+                self.win_id_arg not in signature.parameters):
+            raise ValueError("win_id parameter {} does not exist!".format(
+                self.win_id_arg))
+
         if not self.ignore_args:
             for param in signature.parameters.values():
                 annotation_info = self._parse_annotation(param)
                 if param.name == 'self':
                     continue
-                if self._inspect_special_param(param, annotation_info):
+                if self._inspect_special_param(param):
                     continue
                 arg_count += 1
                 typ = self._get_type(param, annotation_info)
                 kwargs = self._param_to_argparse_kwargs(param, annotation_info)
                 args = self._param_to_argparse_args(param, annotation_info)
                 self._type_conv.update(self._get_typeconv(param, typ))
-                self._name_conv.update(
-                    self._get_nameconv(param, annotation_info))
                 callsig = debug_utils.format_call(
                     self.parser.add_argument, args, kwargs,
                     full=False)
@@ -276,11 +263,13 @@ class Command:
         except KeyError:
             pass
 
+        kwargs['dest'] = param.name
+
         if isinstance(typ, tuple):
-            pass
+            kwargs['metavar'] = annotation_info.metavar or param.name
         elif utils.is_enum(typ):
-            kwargs['choices'] = [e.name.replace('_', '-') for e in typ]
-            kwargs['metavar'] = param.name
+            kwargs['choices'] = [arg_name(e.name) for e in typ]
+            kwargs['metavar'] = annotation_info.metavar or param.name
         elif typ is bool:
             kwargs['action'] = 'store_true'
         elif typ is not None:
@@ -307,8 +296,8 @@ class Command:
             A list of args.
         """
         args = []
-        name = annotation_info.name or param.name
-        shortname = annotation_info.flag or param.name[0]
+        name = arg_name(param.name)
+        shortname = annotation_info.flag or name[0]
         if len(shortname) != 1:
             raise ValueError("Flag '{}' of parameter {} (command {}) must be "
                              "exactly 1 char!".format(shortname, name,
@@ -323,8 +312,8 @@ class Command:
             if typ is not bool:
                 self.flags_with_args += [short_flag, long_flag]
         else:
-            args.append(name)
-            self.pos_args.append((param.name, name))
+            if not annotation_info.hide:
+                self.pos_args.append((param.name, name))
         return args
 
     def _parse_annotation(self, param):
@@ -341,12 +330,12 @@ class Command:
                 flag: The short name/flag if overridden.
                 name: The long name if overridden.
         """
-        info = {'kwargs': {}, 'type': None, 'flag': None, 'name': None,
-                'special': None}
+        info = {'kwargs': {}, 'type': None, 'flag': None, 'hide': False,
+                'metavar': None}
         if param.annotation is not inspect.Parameter.empty:
             log.commands.vdebug("Parsing annotation {}".format(
                 param.annotation))
-            for field in ('type', 'flag', 'name', 'special'):
+            for field in ('type', 'flag', 'name', 'hide', 'metavar'):
                 if field in param.annotation:
                     info[field] = param.annotation[field]
             if 'nargs' in param.annotation:
@@ -426,19 +415,18 @@ class Command:
             raise TypeError("{}: invalid parameter type {} for argument "
                             "{!r}!".format(self.name, param.kind, param.name))
 
-    def _get_param_name_and_value(self, param):
-        """Get the converted name and value for an inspect.Parameter."""
-        name = self._name_conv.get(param.name, param.name)
-        value = getattr(self.namespace, name)
+    def _get_param_value(self, param):
+        """Get the converted value for an inspect.Parameter."""
+        value = getattr(self.namespace, param.name)
         if param.name in self._type_conv:
             # We convert enum types after getting the values from
             # argparse, because argparse's choices argument is
             # processed after type conversation, which is not what we
             # want.
             value = self._type_conv[param.name](value)
-        return name, value
+        return value
 
-    def _get_call_args(self, win_id):  # noqa
+    def _get_call_args(self, win_id):
         """Get arguments for a function call.
 
         Args:
@@ -462,22 +450,22 @@ class Command:
                 # Special case for 'self'.
                 self._get_self_arg(win_id, param, args)
                 continue
-            elif param.name == self.special_params['count']:
+            elif param.name == self.count_arg:
                 # Special case for count parameter.
                 self._get_count_arg(param, args, kwargs)
                 continue
-            elif param.name == self.special_params['win_id']:
+            elif param.name == self.win_id_arg:
                 # Special case for win_id parameter.
                 self._get_win_id_arg(win_id, param, args, kwargs)
                 continue
-            name, value = self._get_param_name_and_value(param)
+            value = self._get_param_value(param)
             if param.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
                 args.append(value)
             elif param.kind == inspect.Parameter.VAR_POSITIONAL:
                 if value is not None:
                     args += value
             elif param.kind == inspect.Parameter.KEYWORD_ONLY:
-                kwargs[name] = value
+                kwargs[param.name] = value
             else:
                 raise TypeError("{}: Invalid parameter type {} for argument "
                                 "'{}'!".format(

qutebrowser/commands/runners.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -29,7 +29,8 @@ from qutebrowser.utils import message, log, objreg, qtutils
 from qutebrowser.misc import split
 
 
-ParseResult = collections.namedtuple('ParseResult', 'cmd, args, cmdline')
+ParseResult = collections.namedtuple('ParseResult', ['cmd', 'args', 'cmdline',
+                                                     'count'])
 
 
 def replace_variables(win_id, arglist):
@@ -117,6 +118,26 @@ class CommandRunner(QObject):
         for sub in sub_texts:
             yield self.parse(sub, *args, **kwargs)
 
+    def _parse_count(self, cmdstr):
+        """Split a count prefix off from a command for parse().
+
+        Args:
+            cmdstr: The command/args including the count.
+
+        Return:
+            A (count, cmdstr) tuple, with count being None or int.
+        """
+        if ':' not in cmdstr:
+            return (None, cmdstr)
+
+        count, cmdstr = cmdstr.split(':', maxsplit=1)
+        try:
+            count = int(count)
+        except ValueError:
+            # We just ignore invalid prefixes
+            count = None
+        return (count, cmdstr)
+
     def parse(self, text, *, aliases=True, fallback=False, keep=False):
         """Split the commandline text into command and arguments.
 
@@ -128,9 +149,11 @@ class CommandRunner(QObject):
             keep: Whether to keep special chars and whitespace
 
         Return:
-            A (cmd, args, cmdline) ParseResult tuple.
+            A ParseResult tuple.
         """
         cmdstr, sep, argstr = text.partition(' ')
+        count, cmdstr = self._parse_count(cmdstr)
+
         if not cmdstr and not fallback:
             raise cmdexc.NoSuchCommandError("No command given")
         if aliases:
@@ -161,7 +184,7 @@ class CommandRunner(QObject):
                 cmdline = [cmdstr, sep]
             else:
                 cmdline = [cmdstr] + args[:]
-        return ParseResult(cmd=cmd, args=args, cmdline=cmdline)
+        return ParseResult(cmd=cmd, args=args, cmdline=cmdline, count=count)
 
     def _split_args(self, cmd, argstr, keep):
         """Split the arguments from an arg string.
@@ -172,7 +195,7 @@ class CommandRunner(QObject):
             keep: Whether to keep special chars and whitespace
 
         Return:
-            A list containing the splitted strings.
+            A list containing the split strings.
         """
         if not argstr:
             return []
@@ -201,10 +224,10 @@ class CommandRunner(QObject):
                     maxsplit = i + cmd.maxsplit + flag_arg_count
                     return split.simple_split(argstr, keep=keep,
                                               maxsplit=maxsplit)
-            else:  # pylint: disable=useless-else-on-loop
-                # If there are only flags, we got it right on the first try
-                # already.
-                return split_args
+
+            # If there are only flags, we got it right on the first try
+            # already.
+            return split_args
 
     def run(self, text, count=None):
         """Parse a command from a line of text and run it.
@@ -216,7 +239,12 @@ class CommandRunner(QObject):
         for result in self.parse_all(text):
             args = replace_variables(self._win_id, result.args)
             if count is not None:
+                if result.count is not None:
+                    raise cmdexc.CommandMetaError("Got count via command and "
+                                                  "prefix!")
                 result.cmd.run(self._win_id, args, count=count)
+            elif result.count is not None:
+                result.cmd.run(self._win_id, args, count=result.count)
             else:
                 result.cmd.run(self._win_id, args)
 

qutebrowser/commands/userscripts.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -17,23 +17,32 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Functions to execute an userscript."""
+"""Functions to execute a userscript."""
 
 import os
 import os.path
 import tempfile
 
-from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QSocketNotifier,
-                          QProcessEnvironment, QProcess)
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QSocketNotifier
 
 from qutebrowser.utils import message, log, objreg, standarddir
 from qutebrowser.commands import runners, cmdexc
 from qutebrowser.config import config
+from qutebrowser.misc import guiprocess
 
 
 class _QtFIFOReader(QObject):
 
-    """A FIFO reader based on a QSocketNotifier."""
+    """A FIFO reader based on a QSocketNotifier.
+
+    Attributes:
+        _filepath: The path to the opened FIFO.
+        _fifo: The Python file object for the FIFO.
+        _notifier: The QSocketNotifier used.
+
+    Signals:
+        got_line: Emitted when a whole line arrived.
+    """
 
     got_line = pyqtSignal(str)
 
@@ -44,9 +53,9 @@ class _QtFIFOReader(QObject):
         # See http://www.outflux.net/blog/archives/2008/03/09/using-select-on-a-fifo/
         # We also use os.open and os.fdopen rather than built-in open so we
         # can add O_NONBLOCK.
-        fd = os.open(filepath, os.O_RDWR |
-                     os.O_NONBLOCK)  # pylint: disable=no-member
-        self.fifo = os.fdopen(fd, 'r')
+        # pylint: disable=no-member,useless-suppression
+        fd = os.open(filepath, os.O_RDWR | os.O_NONBLOCK)
+        self._fifo = os.fdopen(fd, 'r')
         self._notifier = QSocketNotifier(fd, QSocketNotifier.Read, self)
         self._notifier.activated.connect(self.read_line)
 
@@ -55,13 +64,14 @@ class _QtFIFOReader(QObject):
         """(Try to) read a line from the FIFO."""
         log.procs.debug("QSocketNotifier triggered!")
         self._notifier.setEnabled(False)
-        for line in self.fifo:
+        for line in self._fifo:
             self.got_line.emit(line.rstrip('\r\n'))
         self._notifier.setEnabled(True)
 
     def cleanup(self):
         """Clean up so the FIFO can be closed."""
         self._notifier.setEnabled(False)
+        self._fifo.close()
 
 
 class _BaseUserscriptRunner(QObject):
@@ -70,13 +80,9 @@ class _BaseUserscriptRunner(QObject):
 
     Attributes:
         _filepath: The path of the file/FIFO which is being read.
-        _proc: The QProcess which is being executed.
+        _proc: The GUIProcess which is being executed.
         _win_id: The window ID this runner is associated with.
 
-    Class attributes:
-        PROCESS_MESSAGES: A mapping of QProcess::ProcessError members to
-                          human-readable error strings.
-
     Signals:
         got_cmd: Emitted when a new command arrived and should be executed.
         finished: Emitted when the userscript finished running.
@@ -85,83 +91,72 @@ class _BaseUserscriptRunner(QObject):
     got_cmd = pyqtSignal(str)
     finished = pyqtSignal()
 
-    PROCESS_MESSAGES = {
-        QProcess.FailedToStart: "The process failed to start.",
-        QProcess.Crashed: "The process crashed.",
-        QProcess.Timedout: "The last waitFor...() function timed out.",
-        QProcess.WriteError: ("An error occurred when attempting to write to "
-                              "the process."),
-        QProcess.ReadError: ("An error occurred when attempting to read from "
-                             "the process."),
-        QProcess.UnknownError: "An unknown error occurred.",
-    }
-
     def __init__(self, win_id, parent=None):
         super().__init__(parent)
         self._win_id = win_id
         self._filepath = None
         self._proc = None
+        self._env = None
 
-    def _run_process(self, cmd, *args, env):
-        """Start the given command via QProcess.
+    def _run_process(self, cmd, *args, env, verbose):
+        """Start the given command.
 
         Args:
             cmd: The command to be started.
             *args: The arguments to hand to the command
             env: A dictionary of environment variables to add.
+            verbose: Show notifications when the command started/exited.
         """
-        self._proc = QProcess(self)
-        procenv = QProcessEnvironment.systemEnvironment()
-        procenv.insert('QUTE_FIFO', self._filepath)
+        self._env = {'QUTE_FIFO': self._filepath}
         if env is not None:
-            for k, v in env.items():
-                procenv.insert(k, v)
-        self._proc.setProcessEnvironment(procenv)
-        self._proc.error.connect(self.on_proc_error)
+            self._env.update(env)
+        self._proc = guiprocess.GUIProcess(self._win_id, 'userscript',
+                                           additional_env=self._env,
+                                           verbose=verbose, parent=self)
         self._proc.finished.connect(self.on_proc_finished)
         self._proc.start(cmd, args)
 
     def _cleanup(self):
-        """Clean up the temporary file."""
-        log.procs.debug("Deleting temporary file {}.".format(self._filepath))
-        try:
-            os.remove(self._filepath)
-        except OSError as e:
-            # NOTE: Do not replace this with "raise CommandError" as it's
-            # executed async.
-            message.error(self._win_id,
-                          "Failed to delete tempfile... ({})".format(e))
+        """Clean up temporary files."""
+        tempfiles = [self._filepath]
+        if 'QUTE_HTML' in self._env:
+            tempfiles.append(self._env['QUTE_HTML'])
+        if 'QUTE_TEXT' in self._env:
+            tempfiles.append(self._env['QUTE_TEXT'])
+        for fn in tempfiles:
+            log.procs.debug("Deleting temporary file {}.".format(fn))
+            try:
+                os.remove(fn)
+            except OSError as e:
+                # NOTE: Do not replace this with "raise CommandError" as it's
+                # executed async.
+                message.error(
+                    self._win_id, "Failed to delete tempfile {} ({})!".format(
+                        fn, e))
         self._filepath = None
         self._proc = None
+        self._env = None
 
-    def run(self, cmd, *args, env=None):
+    def run(self, cmd, *args, env=None, verbose=False):
         """Run the userscript given.
 
-        Needs to be overridden by superclasses.
+        Needs to be overridden by subclasses.
 
         Args:
             cmd: The command to be started.
             *args: The arguments to hand to the command
             env: A dictionary of environment variables to add.
+            verbose: Show notifications when the command started/exited.
         """
         raise NotImplementedError
 
     def on_proc_finished(self):
         """Called when the process has finished.
 
-        Needs to be overridden by superclasses.
+        Needs to be overridden by subclasses.
         """
         raise NotImplementedError
 
-    def on_proc_error(self, error):
-        """Called when the process encountered an error."""
-        msg = self.PROCESS_MESSAGES[error]
-        # NOTE: Do not replace this with "raise CommandError" as it's
-        # executed async.
-        message.error(self._win_id,
-                      "Error while calling userscript: {}".format(msg))
-        log.procs.debug("Userscript process error: {} - {}".format(error, msg))
-
 
 class _POSIXUserscriptRunner(_BaseUserscriptRunner):
 
@@ -177,7 +172,7 @@ class _POSIXUserscriptRunner(_BaseUserscriptRunner):
         super().__init__(win_id, parent)
         self._reader = None
 
-    def run(self, cmd, *args, env=None):
+    def run(self, cmd, *args, env=None, verbose=False):
         try:
             # tempfile.mktemp is deprecated and discouraged, but we use it here
             # to create a FIFO since the only other alternative would be to
@@ -186,7 +181,8 @@ class _POSIXUserscriptRunner(_BaseUserscriptRunner):
             # exist, it shouldn't be a big issue.
             self._filepath = tempfile.mktemp(prefix='qutebrowser-userscript-',
                                              dir=standarddir.runtime())
-            os.mkfifo(self._filepath)  # pylint: disable=no-member
+            # pylint: disable=no-member,useless-suppression
+            os.mkfifo(self._filepath)
         except OSError as e:
             message.error(self._win_id, "Error while creating FIFO: {}".format(
                 e))
@@ -195,23 +191,16 @@ class _POSIXUserscriptRunner(_BaseUserscriptRunner):
         self._reader = _QtFIFOReader(self._filepath)
         self._reader.got_line.connect(self.got_cmd)
 
-        self._run_process(cmd, *args, env=env)
+        self._run_process(cmd, *args, env=env, verbose=verbose)
 
     def on_proc_finished(self):
         """Interrupt the reader when the process finished."""
-        log.procs.debug("Userscript process finished.")
-        self.finish()
-
-    def on_proc_error(self, error):
-        """Interrupt the reader when the process had an error."""
-        super().on_proc_error(error)
         self.finish()
 
     def finish(self):
         """Quit the thread and clean up when the reader finished."""
         log.procs.debug("Cleaning up")
         self._reader.cleanup()
-        self._reader.fifo.close()
         self._reader.deleteLater()
         self._reader = None
         super()._cleanup()
@@ -249,7 +238,6 @@ class _WindowsUserscriptRunner(_BaseUserscriptRunner):
 
     def on_proc_finished(self):
         """Read back the commands when the process finished."""
-        log.procs.debug("Userscript process finished.")
         try:
             with open(self._filepath, 'r', encoding='utf-8') as f:
                 for line in f:
@@ -259,23 +247,17 @@ class _WindowsUserscriptRunner(_BaseUserscriptRunner):
         self._cleanup()
         self.finished.emit()
 
-    def on_proc_error(self, error):
-        """Clean up when the process had an error."""
-        super().on_proc_error(error)
-        self._cleanup()
-        self.finished.emit()
-
-    def run(self, cmd, *args, env=None):
+    def run(self, cmd, *args, env=None, verbose=False):
         try:
             self._oshandle, self._filepath = tempfile.mkstemp(text=True)
         except OSError as e:
             message.error(self._win_id, "Error while creating tempfile: "
                                         "{}".format(e))
             return
-        self._run_process(cmd, *args, env=env)
+        self._run_process(cmd, *args, env=env, verbose=verbose)
 
 
-class _DummyUserscriptRunner:
+class _DummyUserscriptRunner(QObject):
 
     """Simple dummy runner which displays an error when using userscripts.
 
@@ -288,8 +270,13 @@ class _DummyUserscriptRunner:
 
     finished = pyqtSignal()
 
-    def run(self, _cmd, *_args, _env=None):
+    def __init__(self, win_id, parent=None):
+        # pylint: disable=unused-argument
+        super().__init__(parent)
+
+    def run(self, cmd, *args, env=None, verbose=False):
         """Print an error as userscripts are not supported."""
+        # pylint: disable=unused-argument,unused-variable
         self.finished.emit()
         raise cmdexc.CommandError(
             "Userscripts are not supported on this platform!")
@@ -299,20 +286,52 @@ class _DummyUserscriptRunner:
 # right thing depending on the platform.
 if os.name == 'posix':
     UserscriptRunner = _POSIXUserscriptRunner
-elif os.name == 'nt':
+elif os.name == 'nt':  # pragma: no cover
     UserscriptRunner = _WindowsUserscriptRunner
-else:
+else:  # pragma: no cover
     UserscriptRunner = _DummyUserscriptRunner
 
 
-def run(cmd, *args, win_id, env):
-    """Convenience method to run an userscript.
+def store_source(frame):
+    """Store HTML/plaintext in files.
+
+    This writes files containing the HTML/plaintext source of the page, and
+    returns a dict with the paths as QUTE_HTML/QUTE_TEXT.
+
+    Args:
+        frame: The QWebFrame to get the info from, or None to do nothing.
+
+    Return:
+        A dictionary with the needed environment variables.
+
+    Warning:
+        The caller is responsible to delete the files after using them!
+    """
+    if frame is None:
+        return {}
+    env = {}
+    with tempfile.NamedTemporaryFile(mode='w', encoding='utf-8',
+                                     suffix='.html',
+                                     delete=False) as html_file:
+        html_file.write(frame.toHtml())
+        env['QUTE_HTML'] = html_file.name
+    with tempfile.NamedTemporaryFile(mode='w', encoding='utf-8',
+                                     suffix='.txt',
+                                     delete=False) as txt_file:
+        txt_file.write(frame.toPlainText())
+        env['QUTE_TEXT'] = txt_file.name
+    return env
+
+
+def run(cmd, *args, win_id, env, verbose=False):
+    """Convenience method to run a userscript.
 
     Args:
         cmd: The userscript binary to run.
         *args: The arguments to pass to the userscript.
         win_id: The window id the userscript is executed in.
         env: A dictionary of variables to add to the process environment.
+        verbose: Show notifications when the command started/exited.
     """
     tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                 window=win_id)
@@ -325,6 +344,14 @@ def run(cmd, *args, win_id, env):
     user_agent = config.get('network', 'user-agent')
     if user_agent is not None:
         env['QUTE_USER_AGENT'] = user_agent
-    runner.run(cmd, *args, env=env)
+    cmd = os.path.expanduser(cmd)
+
+    # if cmd is not given as an absolute path, look it up
+    # ~/.local/share/qutebrowser/userscripts (or $XDG_DATA_DIR)
+    if not os.path.isabs(cmd):
+        log.misc.debug("{} is no absolute path".format(cmd))
+        cmd = os.path.join(standarddir.data(), "userscripts", cmd)
+
+    runner.run(cmd, *args, env=env, verbose=verbose)
     runner.finished.connect(commandrunner.deleteLater)
     runner.finished.connect(runner.deleteLater)

qutebrowser/completion/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/completion/completer.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -19,12 +19,12 @@
 
 """Completer attached to a CompletionView."""
 
-from PyQt5.QtCore import pyqtSlot, QObject, QTimer
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QTimer
 
 from qutebrowser.config import config
-from qutebrowser.commands import cmdutils, runners
+from qutebrowser.commands import cmdexc, cmdutils, runners
 from qutebrowser.utils import usertypes, log, objreg, utils
-from qutebrowser.completion.models import instances
+from qutebrowser.completion.models import instances, sortfilter
 
 
 class Completer(QObject):
@@ -40,14 +40,22 @@ class Completer(QObject):
         _last_cursor_pos: The old cursor position so we avoid double completion
                           updates.
         _last_text: The old command text so we avoid double completion updates.
+        _signals_connected: Whether the signals are connected to update the
+                            completion when the command widget requests that.
+
+    Signals:
+        next_prev_item: Emitted to select the next/previous item in the
+                        completion.
+                        arg0: True for the previous item, False for the next.
     """
 
+    next_prev_item = pyqtSignal(bool)
+
     def __init__(self, cmd, win_id, parent=None):
         super().__init__(parent)
         self._win_id = win_id
         self._cmd = cmd
-        self._cmd.update_completion.connect(self.schedule_completion_update)
-        self._cmd.textEdited.connect(self.on_text_edited)
+        self._signals_connected = False
         self._ignore_change = False
         self._empty_item_idx = None
         self._timer = QTimer()
@@ -58,11 +66,65 @@ class Completer(QObject):
         self._last_cursor_pos = None
         self._last_text = None
 
+        objreg.get('config').changed.connect(self.on_auto_open_changed)
+        self.handle_signal_connections()
+        self._cmd.clear_completion_selection.connect(
+            self.handle_signal_connections)
+
     def __repr__(self):
         return utils.get_repr(self)
 
+    @config.change_filter('completion', 'auto-open')
+    def on_auto_open_changed(self):
+        self.handle_signal_connections()
+
+    @pyqtSlot()
+    def handle_signal_connections(self):
+        self._connect_signals(config.get('completion', 'auto-open'))
+
+    def _connect_signals(self, connect=True):
+        """Connect or disconnect the completion signals.
+
+        Args:
+            connect: Whether to connect (True) or disconnect (False) the
+                     signals.
+
+        Return:
+            True if the signals were connected (connect=True and aren't
+            connected yet) - otherwise False.
+        """
+        connections = [
+            (self._cmd.update_completion, self.schedule_completion_update),
+            (self._cmd.textChanged, self.on_text_edited),
+        ]
+
+        if connect and not self._signals_connected:
+            for sender, receiver in connections:
+                sender.connect(receiver)
+            self._signals_connected = True
+            return True
+        elif not connect:
+            for sender, receiver in connections:
+                try:
+                    sender.disconnect(receiver)
+                except TypeError:
+                    # Don't fail if not connected
+                    pass
+            self._signals_connected = False
+        return False
+
+    def _open_completion_if_needed(self):
+        """If auto-open is false, temporarily connect signals.
+
+        Also opens the completion.
+        """
+        if not config.get('completion', 'auto-open'):
+            connected = self._connect_signals(True)
+            if connected:
+                self.update_completion()
+
     def _model(self):
-        """Convienience method to get the current completion model."""
+        """Convenience method to get the current completion model."""
         completion = objreg.get('completion', scope='window',
                                 window=self._win_id)
         return completion.model()
@@ -71,12 +133,12 @@ class Completer(QObject):
         """Get a completion model based on an enum member.
 
         Args:
-            completion: An usertypes.Completion member.
+            completion: A usertypes.Completion member.
             parts: The parts currently in the commandline.
             cursor_part: The part the cursor is in.
 
         Return:
-            A completion model.
+            A completion model or None.
         """
         if completion == usertypes.Completion.option:
             section = parts[cursor_part - 1]
@@ -91,7 +153,11 @@ class Completer(QObject):
                 model = None
         else:
             model = instances.get(completion)
-        return model
+
+        if model is None:
+            return None
+        else:
+            return sortfilter.CompletionFilterModel(source=model, parent=self)
 
     def _filter_cmdline_parts(self, parts, cursor_part):
         """Filter a list of commandline parts to exclude flags.
@@ -140,7 +206,8 @@ class Completer(QObject):
                              "{}".format(parts, cursor_part))
         if cursor_part == 0:
             # '|' or 'set|'
-            return instances.get(usertypes.Completion.command)
+            model = instances.get(usertypes.Completion.command)
+            return sortfilter.CompletionFilterModel(source=model, parent=self)
         # delegate completion to command
         try:
             completions = cmdutils.cmd_dict[parts[0]].completion
@@ -187,7 +254,7 @@ class Completer(QObject):
 
         Args:
             selected: New selection.
-            _delected: Previous selection.
+            _deselected: Previous selection.
         """
         indexes = selected.indexes()
         if not indexes:
@@ -272,7 +339,7 @@ class Completer(QObject):
             pattern = parts[self._cursor_part].strip()
         except IndexError:
             pattern = ''
-        self._model().set_pattern(pattern)
+        completion.set_pattern(pattern)
 
         log.completion.debug(
             "New completion for {}: {}, with pattern '{}'".format(
@@ -316,10 +383,7 @@ class Completer(QObject):
         """Get the part index of the commandline where the cursor is over."""
         cursor_pos = self._cmd.cursorPosition()
         snippet = slice(cursor_pos - 1, cursor_pos + 1)
-        if self._cmd.text()[snippet] == '  ':
-            spaces = True
-        else:
-            spaces = False
+        spaces = self._cmd.text()[snippet] == '  '
         cursor_pos -= len(self._cmd.prefix())
         parts = self.split(keep=True)
         log.completion.vdebug(
@@ -328,7 +392,7 @@ class Completer(QObject):
                         cursor_pos))
         skip = 0
         for i, part in enumerate(parts):
-            log.completion.vdebug("Checking part {}: {}".format(i, parts[i]))
+            log.completion.vdebug("Checking part {}: {!r}".format(i, parts[i]))
             if not part:
                 skip += 1
                 continue
@@ -350,7 +414,11 @@ class Completer(QObject):
                 "Removing len({!r}) -> {} from cursor_pos -> {}".format(
                     part, len(part), cursor_pos))
         else:
-            self._cursor_part = i - skip
+            if i == 0:
+                # Initial `:` press without any text.
+                self._cursor_part = 0
+            else:
+                self._cursor_part = i - skip
             if spaces:
                 self._empty_item_idx = i - skip
             else:
@@ -401,3 +469,30 @@ class Completer(QObject):
         # We also want to update the cursor part and emit update_completion
         # here, but that's already done for us by cursorPositionChanged
         # anyways, so we don't need to do it twice.
+
+    @cmdutils.register(instance='completer', hide=True,
+                       modes=[usertypes.KeyMode.command], scope='window')
+    def completion_item_prev(self):
+        """Select the previous completion item."""
+        self._open_completion_if_needed()
+        self.next_prev_item.emit(True)
+
+    @cmdutils.register(instance='completer', hide=True,
+                       modes=[usertypes.KeyMode.command], scope='window')
+    def completion_item_next(self):
+        """Select the next completion item."""
+        self._open_completion_if_needed()
+        self.next_prev_item.emit(False)
+
+    @cmdutils.register(instance='completion', hide=True,
+                       modes=[usertypes.KeyMode.command], scope='window')
+    def completion_item_del(self):
+        """Delete the current completion item."""
+        completion = objreg.get('completion', scope='window',
+                                window=self._win_id)
+        if not completion.currentIndex().isValid():
+            raise cmdexc.CommandError("No item selected!")
+        try:
+            self.model().srcmodel.delete_cur_item(completion)
+        except NotImplementedError:
+            raise cmdexc.CommandError("Cannot delete this item.")

qutebrowser/completion/completiondelegate.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -145,7 +145,6 @@ class CompletionItemDelegate(QStyledItemDelegate):
             rect: The QRect to clip the drawing to.
         """
         # We can't use drawContents because then the color would be ignored.
-        # See: https://qt-project.org/forums/viewthread/21492
         clip = QRectF(0, 0, rect.width(), rect.height())
         self._painter.save()
         if self._opt.state & QStyle.State_Selected:
@@ -189,14 +188,15 @@ class CompletionItemDelegate(QStyledItemDelegate):
         self._doc.setDefaultTextOption(text_option)
         self._doc.setDefaultStyleSheet(style.get_stylesheet("""
             .highlight {
-                {{ color['completion.match.fg'] }}
+                color: {{ color['completion.match.fg'] }};
             }
         """))
         self._doc.setDocumentMargin(2)
 
         if index.parent().isValid():
             pattern = index.model().pattern
-            if index.column() == 0 and pattern:
+            columns_to_filter = index.model().srcmodel.columns_to_filter
+            if index.column() in columns_to_filter and pattern:
                 repl = r'<span class="highlight">\g<0></span>'
                 text = re.sub(re.escape(pattern), repl, self._opt.text,
                               flags=re.IGNORECASE)

qutebrowser/completion/completionwidget.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -26,10 +26,10 @@ subclasses to provide completions.
 from PyQt5.QtWidgets import QStyle, QTreeView, QSizePolicy
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QItemSelectionModel
 
-from qutebrowser.commands import cmdutils
 from qutebrowser.config import config, style
 from qutebrowser.completion import completiondelegate, completer
-from qutebrowser.utils import usertypes, qtutils, objreg, utils
+from qutebrowser.completion.models import base
+from qutebrowser.utils import qtutils, objreg, utils
 
 
 class CompletionView(QTreeView):
@@ -39,15 +39,13 @@ class CompletionView(QTreeView):
     Based on QTreeView but heavily customized so root elements show as category
     headers, and children show as flat list.
 
-    Class attributes:
-        COLUMN_WIDTHS: A list of column widths, in percent.
-
     Attributes:
         enabled: Whether showing the CompletionView is enabled.
         _win_id: The ID of the window this CompletionView is associated with.
         _height: The height to use for the CompletionView.
         _height_perc: Either None or a percentage if height should be relative.
         _delegate: The item delegate used.
+        _column_widths: A list of column widths, in percent.
 
     Signals:
         resize_completion: Emitted when the completion should be resized.
@@ -57,14 +55,15 @@ class CompletionView(QTreeView):
     # don't define that in this stylesheet.
     STYLESHEET = """
         QTreeView {
-            {{ font['completion'] }}
-            {{ color['completion.bg'] }}
+            font: {{ font['completion'] }};
+            background-color: {{ color['completion.bg'] }};
             alternate-background-color: {{ color['completion.alternate-bg'] }};
             outline: 0;
+            border: 0px;
         }
 
         QTreeView::item:disabled {
-            {{ color['completion.category.bg'] }}
+            background-color: {{ color['completion.category.bg'] }};
             border-top: 1px solid
                 {{ color['completion.category.border.top'] }};
             border-bottom: 1px solid
@@ -76,17 +75,30 @@ class CompletionView(QTreeView):
                 {{ color['completion.item.selected.border.top'] }};
             border-bottom: 1px solid
                 {{ color['completion.item.selected.border.bottom'] }};
-            {{ color['completion.item.selected.bg'] }}
+            background-color: {{ color['completion.item.selected.bg'] }};
         }
 
         QTreeView:item::hover {
             border: 0px;
         }
-    """
-    COLUMN_WIDTHS = (20, 70, 10)
 
-    # FIXME style scrollbar
-    # https://github.com/The-Compiler/qutebrowser/issues/117
+        QTreeView QScrollBar {
+            width: {{ config.get('completion', 'scrollbar-width') }}px;
+            background: {{ color['completion.scrollbar.bg'] }};
+        }
+
+        QTreeView QScrollBar::handle {
+            background: {{ color['completion.scrollbar.fg'] }};
+            border: {{ config.get('completion', 'scrollbar-padding') }}px solid
+                    {{ color['completion.scrollbar.bg'] }};
+            min-height: 10px;
+        }
+
+        QTreeView QScrollBar::sub-line, QScrollBar::add-line {
+            border: none;
+            background: none;
+        }
+    """
 
     resize_completion = pyqtSignal()
 
@@ -96,12 +108,15 @@ class CompletionView(QTreeView):
         objreg.register('completion', self, scope='window', window=win_id)
         cmd = objreg.get('status-command', scope='window', window=win_id)
         completer_obj = completer.Completer(cmd, win_id, self)
+        completer_obj.next_prev_item.connect(self.on_next_prev_item)
         objreg.register('completer', completer_obj, scope='window',
                         window=win_id)
         self.enabled = config.get('completion', 'show')
         objreg.get('config').changed.connect(self.set_enabled)
         # FIXME handle new aliases.
-        #objreg.get('config').changed.connect(self.init_command_completion)
+        # objreg.get('config').changed.connect(self.init_command_completion)
+
+        self._column_widths = base.BaseCompletionModel.COLUMN_WIDTHS
 
         self._delegate = completiondelegate.CompletionItemDelegate(self)
         self.setItemDelegate(self._delegate)
@@ -128,9 +143,9 @@ class CompletionView(QTreeView):
         return utils.get_repr(self)
 
     def _resize_columns(self):
-        """Resize the completion columns based on COLUMN_WIDTHS."""
+        """Resize the completion columns based on column_widths."""
         width = self.size().width()
-        pixel_widths = [(width * perc // 100) for perc in self.COLUMN_WIDTHS]
+        pixel_widths = [(width * perc // 100) for perc in self._column_widths]
         if self.verticalScrollBar().isVisible():
             pixel_widths[-1] -= self.style().pixelMetric(
                 QStyle.PM_ScrollBarExtent) + 5
@@ -168,12 +183,15 @@ class CompletionView(QTreeView):
                 # Item is a real item, not a category header -> success
                 return idx
 
-    def _next_prev_item(self, prev):
+    @pyqtSlot(bool)
+    def on_next_prev_item(self, prev):
         """Handle a tab press for the CompletionView.
 
         Select the previous/next item and write the new text to the
         statusbar.
 
+        Called from the Completer's next_prev_item signal.
+
         Args:
             prev: True for prev item, False for next one.
         """
@@ -194,15 +212,32 @@ class CompletionView(QTreeView):
         Args:
             model: The model to use.
         """
+        old_model = self.model()
         sel_model = self.selectionModel()
+
         self.setModel(model)
+
         if sel_model is not None:
             sel_model.deleteLater()
+        if old_model is not None:
+            old_model.deleteLater()
+
         for i in range(model.rowCount()):
             self.expand(model.index(i, 0))
+
+        self._column_widths = model.srcmodel.COLUMN_WIDTHS
         self._resize_columns()
-        model.rowsRemoved.connect(self.maybe_resize_completion)
-        model.rowsInserted.connect(self.maybe_resize_completion)
+        self.maybe_resize_completion()
+
+    def set_pattern(self, pattern):
+        """Set the completion pattern for the current model.
+
+        Called from on_update_completion().
+
+        Args:
+            pattern: The filter pattern to set (what the user entered).
+        """
+        self.model().set_pattern(pattern)
         self.maybe_resize_completion()
 
     @pyqtSlot()
@@ -224,18 +259,6 @@ class CompletionView(QTreeView):
             selmod.clearSelection()
             selmod.clearCurrentIndex()
 
-    @cmdutils.register(instance='completion', hide=True,
-                       modes=[usertypes.KeyMode.command], scope='window')
-    def completion_item_prev(self):
-        """Select the previous completion item."""
-        self._next_prev_item(prev=True)
-
-    @cmdutils.register(instance='completion', hide=True,
-                       modes=[usertypes.KeyMode.command], scope='window')
-    def completion_item_next(self):
-        """Select the next completion item."""
-        self._next_prev_item(prev=False)
-
     def selectionChanged(self, selected, deselected):
         """Extend selectionChanged to call completers selection_changed."""
         super().selectionChanged(selected, deselected)

qutebrowser/completion/models/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/completion/models/base.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -39,11 +39,20 @@ class BaseCompletionModel(QStandardItemModel):
 
     Used for showing completions later in the CompletionView. Supports setting
     marks and adding new categories/items easily.
+
+    Class Attributes:
+        COLUMN_WIDTHS: The width percentages of the columns used in the
+                        completion view.
+        DUMB_SORT: the dumb sorting used by the model
     """
 
+    COLUMN_WIDTHS = (30, 70, 0)
+    DUMB_SORT = None
+
     def __init__(self, parent=None):
         super().__init__(parent)
         self.setColumnCount(3)
+        self.columns_to_filter = [0]
 
     def new_category(self, name, sort=None):
         """Add a new category to the model.
@@ -79,22 +88,25 @@ class BaseCompletionModel(QStandardItemModel):
         assert not isinstance(name, int)
         assert not isinstance(desc, int)
         assert not isinstance(misc, int)
+
         nameitem = QStandardItem(name)
         descitem = QStandardItem(desc)
         if misc is None:
             miscitem = QStandardItem()
         else:
             miscitem = QStandardItem(misc)
-        idx = cat.rowCount()
-        cat.setChild(idx, 0, nameitem)
-        cat.setChild(idx, 1, descitem)
-        cat.setChild(idx, 2, miscitem)
+
+        cat.appendRow([nameitem, descitem, miscitem])
         if sort is not None:
             nameitem.setData(sort, Role.sort)
         if userdata is not None:
             nameitem.setData(userdata, Role.userdata)
         return nameitem, descitem, miscitem
 
+    def delete_cur_item(self, win_id):
+        """Delete the selected item."""
+        raise NotImplementedError
+
     def flags(self, index):
         """Return the item flags for index.
 
@@ -109,7 +121,8 @@ class BaseCompletionModel(QStandardItemModel):
         qtutils.ensure_valid(index)
         if index.parent().isValid():
             # item
-            return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+            return (Qt.ItemIsEnabled | Qt.ItemIsSelectable |
+                    Qt.ItemNeverHasChildren)
         else:
             # category
             return Qt.NoItemFlags
@@ -120,3 +133,13 @@ class BaseCompletionModel(QStandardItemModel):
         Override QAbstractItemModel::sort.
         """
         raise NotImplementedError
+
+    def custom_filter(self, pattern, row, parent):
+        """Custom filter.
+
+        Args:
+            pattern: The current filter pattern.
+            row: The row to accept or reject in the filter.
+            parent: The parent item QModelIndex.
+        """
+        raise NotImplementedError

qutebrowser/completion/models/configmodel.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -30,12 +30,15 @@ class SettingSectionCompletionModel(base.BaseCompletionModel):
 
     """A CompletionModel filled with settings sections."""
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
+    COLUMN_WIDTHS = (20, 70, 10)
+
     def __init__(self, parent=None):
         super().__init__(parent)
         cat = self.new_category("Sections")
-        for name in configdata.DATA.keys():
+        for name in configdata.DATA:
             desc = configdata.SECTION_DESC[name].splitlines()[0].strip()
             self.new_item(cat, name, desc)
 
@@ -49,8 +52,11 @@ class SettingOptionCompletionModel(base.BaseCompletionModel):
         _section: The config section this model shows.
     """
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
+    COLUMN_WIDTHS = (20, 70, 10)
+
     def __init__(self, section, parent=None):
         super().__init__(parent)
         cat = self.new_category(section)
@@ -58,7 +64,7 @@ class SettingOptionCompletionModel(base.BaseCompletionModel):
         self._misc_items = {}
         self._section = section
         objreg.get('config').changed.connect(self.update_misc_column)
-        for name in sectdata.keys():
+        for name in sectdata:
             try:
                 desc = sectdata.descriptions[name]
             except (KeyError, AttributeError):
@@ -102,8 +108,11 @@ class SettingValueCompletionModel(base.BaseCompletionModel):
         _option: The config option this model shows.
     """
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
+    COLUMN_WIDTHS = (20, 70, 10)
+
     def __init__(self, section, option, parent=None):
         super().__init__(parent)
         self._section = section

qutebrowser/completion/models/instances.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -27,10 +27,9 @@ Module attributes:
 
 import functools
 
-from PyQt5.QtCore import pyqtSlot, Qt
+from PyQt5.QtCore import pyqtSlot
 
 from qutebrowser.completion.models import miscmodels, urlmodel, configmodel
-from qutebrowser.completion.models.sortfilter import CompletionFilterModel
 from qutebrowser.utils import objreg, usertypes, log, debug
 from qutebrowser.config import configdata
 
@@ -38,31 +37,17 @@ from qutebrowser.config import configdata
 _instances = {}
 
 
-def _init_model(klass, *args, dumb_sort=None, **kwargs):
-    """Helper to initialize a model.
-
-    Args:
-        klass: The class of the model to initialize.
-        *args: Arguments to pass to the model.
-        **kwargs: Keyword arguments to pass to the model.
-        dumb_sort: Passed to CompletionFilterModel.
-    """
-    app = objreg.get('app')
-    return CompletionFilterModel(klass(*args, parent=app, **kwargs),
-                                 dumb_sort=dumb_sort, parent=app)
-
-
 def _init_command_completion():
     """Initialize the command completion model."""
     log.completion.debug("Initializing command completion.")
-    model = _init_model(miscmodels.CommandCompletionModel)
+    model = miscmodels.CommandCompletionModel()
     _instances[usertypes.Completion.command] = model
 
 
 def _init_helptopic_completion():
     """Initialize the helptopic completion model."""
     log.completion.debug("Initializing helptopic completion.")
-    model = _init_model(miscmodels.HelpCompletionModel)
+    model = miscmodels.HelpCompletionModel()
     _instances[usertypes.Completion.helptopic] = model
 
 
@@ -70,26 +55,24 @@ def _init_url_completion():
     """Initialize the URL completion model."""
     log.completion.debug("Initializing URL completion.")
     with debug.log_time(log.completion, 'URL completion init'):
-        model = _init_model(urlmodel.UrlCompletionModel,
-                            dumb_sort=Qt.DescendingOrder)
+        model = urlmodel.UrlCompletionModel()
         _instances[usertypes.Completion.url] = model
 
 
 def _init_setting_completions():
     """Initialize setting completion models."""
     log.completion.debug("Initializing setting completion.")
-    _instances[usertypes.Completion.section] = _init_model(
-        configmodel.SettingSectionCompletionModel)
+    _instances[usertypes.Completion.section] = (
+        configmodel.SettingSectionCompletionModel())
     _instances[usertypes.Completion.option] = {}
     _instances[usertypes.Completion.value] = {}
     for sectname in configdata.DATA:
-        model = _init_model(configmodel.SettingOptionCompletionModel, sectname)
-        _instances[usertypes.Completion.option][sectname] = model
+        opt_model = configmodel.SettingOptionCompletionModel(sectname)
+        _instances[usertypes.Completion.option][sectname] = opt_model
         _instances[usertypes.Completion.value][sectname] = {}
-        for opt in configdata.DATA[sectname].keys():
-            model = _init_model(configmodel.SettingValueCompletionModel,
-                                sectname, opt)
-            _instances[usertypes.Completion.value][sectname][opt] = model
+        for opt in configdata.DATA[sectname]:
+            val_model = configmodel.SettingValueCompletionModel(sectname, opt)
+            _instances[usertypes.Completion.value][sectname][opt] = val_model
 
 
 @pyqtSlot()
@@ -97,16 +80,25 @@ def init_quickmark_completions():
     """Initialize quickmark completion models."""
     log.completion.debug("Initializing quickmark completion.")
     try:
-        _instances[usertypes.Completion.quickmark_by_url].deleteLater()
         _instances[usertypes.Completion.quickmark_by_name].deleteLater()
     except KeyError:
         pass
-    model = _init_model(miscmodels.QuickmarkCompletionModel, 'url')
-    _instances[usertypes.Completion.quickmark_by_url] = model
-    model = _init_model(miscmodels.QuickmarkCompletionModel, 'name')
+    model = miscmodels.QuickmarkCompletionModel()
     _instances[usertypes.Completion.quickmark_by_name] = model
 
 
+@pyqtSlot()
+def init_bookmark_completions():
+    """Initialize bookmark completion models."""
+    log.completion.debug("Initializing bookmark completion.")
+    try:
+        _instances[usertypes.Completion.bookmark_by_url].deleteLater()
+    except KeyError:
+        pass
+    model = miscmodels.BookmarkCompletionModel()
+    _instances[usertypes.Completion.bookmark_by_url] = model
+
+
 @pyqtSlot()
 def init_session_completion():
     """Initialize session completion model."""
@@ -115,7 +107,7 @@ def init_session_completion():
         _instances[usertypes.Completion.sessions].deleteLater()
     except KeyError:
         pass
-    model = _init_model(miscmodels.SessionCompletionModel)
+    model = miscmodels.SessionCompletionModel()
     _instances[usertypes.Completion.sessions] = model
 
 
@@ -126,8 +118,8 @@ INITIALIZERS = {
     usertypes.Completion.section: _init_setting_completions,
     usertypes.Completion.option: _init_setting_completions,
     usertypes.Completion.value: _init_setting_completions,
-    usertypes.Completion.quickmark_by_url: init_quickmark_completions,
     usertypes.Completion.quickmark_by_name: init_quickmark_completions,
+    usertypes.Completion.bookmark_by_url: init_bookmark_completions,
     usertypes.Completion.sessions: init_session_completion,
 }
 
@@ -163,8 +155,16 @@ def init():
     """Initialize completions. Note this only connects signals."""
     quickmark_manager = objreg.get('quickmark-manager')
     quickmark_manager.changed.connect(
-        functools.partial(update, [usertypes.Completion.quickmark_by_url,
-                                   usertypes.Completion.quickmark_by_name]))
+        functools.partial(update, [usertypes.Completion.quickmark_by_name]))
+
+    bookmark_manager = objreg.get('bookmark-manager')
+    bookmark_manager.changed.connect(
+        functools.partial(update, [usertypes.Completion.bookmark_by_url]))
+
     session_manager = objreg.get('session-manager')
     session_manager.update_completion.connect(
         functools.partial(update, [usertypes.Completion.sessions]))
+
+    history = objreg.get('web-history')
+    history.async_read_done.connect(
+        functools.partial(update, [usertypes.Completion.url]))

qutebrowser/completion/models/miscmodels.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -29,6 +29,7 @@ class CommandCompletionModel(base.BaseCompletionModel):
 
     """A CompletionModel filled with all commands and descriptions."""
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
     def __init__(self, parent=None):
@@ -52,6 +53,7 @@ class HelpCompletionModel(base.BaseCompletionModel):
 
     """A CompletionModel filled with help topics."""
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
     def __init__(self, parent=None):
@@ -77,7 +79,7 @@ class HelpCompletionModel(base.BaseCompletionModel):
         """Fill completion with section->option entries."""
         cat = self.new_category("Settings")
         for sectname, sectdata in configdata.DATA.items():
-            for optname in sectdata.keys():
+            for optname in sectdata:
                 try:
                     desc = sectdata.descriptions[optname]
                 except (KeyError, AttributeError):
@@ -94,27 +96,37 @@ class QuickmarkCompletionModel(base.BaseCompletionModel):
 
     """A CompletionModel filled with all quickmarks."""
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
-    def __init__(self, match_field='url', parent=None):
+    def __init__(self, parent=None):
         super().__init__(parent)
         cat = self.new_category("Quickmarks")
         quickmarks = objreg.get('quickmark-manager').marks.items()
-        if match_field == 'url':
-            for qm_name, qm_url in quickmarks:
-                self.new_item(cat, qm_url, qm_name)
-        elif match_field == 'name':
-            for qm_name, qm_url in quickmarks:
-                self.new_item(cat, qm_name, qm_url)
-        else:
-            raise ValueError("Invalid value '{}' for match_field!".format(
-                match_field))
+        for qm_name, qm_url in quickmarks:
+            self.new_item(cat, qm_name, qm_url)
+
+
+class BookmarkCompletionModel(base.BaseCompletionModel):
+
+    """A CompletionModel filled with all bookmarks."""
+
+    # https://github.com/The-Compiler/qutebrowser/issues/545
+    # pylint: disable=abstract-method
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        cat = self.new_category("Bookmarks")
+        bookmarks = objreg.get('bookmark-manager').marks.items()
+        for bm_url, bm_title in bookmarks:
+            self.new_item(cat, bm_url, bm_title)
 
 
 class SessionCompletionModel(base.BaseCompletionModel):
 
     """A CompletionModel filled with session names."""
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
     def __init__(self, parent=None):

qutebrowser/completion/models/sortfilter.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -41,11 +41,13 @@ class CompletionFilterModel(QSortFilterProxyModel):
         _sort_order: The order to use for sorting if using dumb_sort.
     """
 
-    def __init__(self, source, parent=None, *, dumb_sort=None):
+    def __init__(self, source, parent=None):
         super().__init__(parent)
         super().setSourceModel(source)
         self.srcmodel = source
         self.pattern = ''
+
+        dumb_sort = self.srcmodel.DUMB_SORT
         if dumb_sort is None:
             # pylint: disable=invalid-name
             self.lessThan = self.intelligentLessThan
@@ -130,19 +132,23 @@ class CompletionFilterModel(QSortFilterProxyModel):
             True if self.pattern is contained in item, or if it's a root item
             (category). False in all other cases
         """
-        if parent == QModelIndex():
+        if parent == QModelIndex() or not self.pattern:
             return True
-        idx = self.srcmodel.index(row, 0, parent)
-        if not idx.isValid():
-            # No entries in parent model
+
+        try:
+            return self.srcmodel.custom_filter(self.pattern, row, parent)
+        except NotImplementedError:
+            for col in self.srcmodel.columns_to_filter:
+                idx = self.srcmodel.index(row, col, parent)
+                if not idx.isValid():
+                    # No entries in parent model
+                    continue
+                data = self.srcmodel.data(idx)
+                if not data:
+                    continue
+                elif self.pattern.casefold() in data.casefold():
+                    return True
             return False
-        data = self.srcmodel.data(idx)
-        # TODO more sophisticated filtering
-        if not self.pattern:
-            return True
-        if not data:
-            return False
-        return self.pattern.casefold() in data.casefold()
 
     def intelligentLessThan(self, lindex, rindex):
         """Custom sorting implementation.

qutebrowser/completion/models/urlmodel.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -23,38 +23,58 @@ import datetime
 
 from PyQt5.QtCore import pyqtSlot, Qt
 
-from qutebrowser.utils import objreg, utils
+from qutebrowser.utils import objreg, utils, qtutils, log
 from qutebrowser.completion.models import base
 from qutebrowser.config import config
 
 
 class UrlCompletionModel(base.BaseCompletionModel):
 
-    """A model which combines quickmarks and web history URLs.
+    """A model which combines bookmarks, quickmarks and web history URLs.
 
     Used for the `open` command."""
 
+    # https://github.com/The-Compiler/qutebrowser/issues/545
     # pylint: disable=abstract-method
 
+    URL_COLUMN = 0
+    TEXT_COLUMN = 1
+    TIME_COLUMN = 2
+
+    COLUMN_WIDTHS = (40, 50, 10)
+    DUMB_SORT = Qt.DescendingOrder
+
     def __init__(self, parent=None):
         super().__init__(parent)
 
+        self.columns_to_filter = [self.URL_COLUMN, self.TEXT_COLUMN]
+
         self._quickmark_cat = self.new_category("Quickmarks")
+        self._bookmark_cat = self.new_category("Bookmarks")
         self._history_cat = self.new_category("History")
 
         quickmark_manager = objreg.get('quickmark-manager')
         quickmarks = quickmark_manager.marks.items()
         for qm_name, qm_url in quickmarks:
-            self._add_quickmark_entry(qm_name, qm_url)
-        quickmark_manager.added.connect(self.on_quickmark_added)
+            self.new_item(self._quickmark_cat, qm_url, qm_name)
+        quickmark_manager.added.connect(
+            lambda name, url: self.new_item(self._quickmark_cat, url, name))
         quickmark_manager.removed.connect(self.on_quickmark_removed)
 
+        bookmark_manager = objreg.get('bookmark-manager')
+        bookmarks = bookmark_manager.marks.items()
+        for bm_url, bm_title in bookmarks:
+            self.new_item(self._bookmark_cat, bm_url, bm_title)
+        bookmark_manager.added.connect(
+            lambda name, url: self.new_item(self._bookmark_cat, url, name))
+        bookmark_manager.removed.connect(self.on_bookmark_removed)
+
         self._history = objreg.get('web-history')
-        max_history = config.get('completion', 'web-history-max-items')
-        history = utils.newest_slice(self._history, max_history)
+        self._max_history = config.get('completion', 'web-history-max-items')
+        history = utils.newest_slice(self._history, self._max_history)
         for entry in history:
             self._add_history_entry(entry)
-        self._history.item_about_to_be_added.connect(
+        self._history.add_completion_item.connect(
             self.on_history_item_added)
 
         objreg.get('config').changed.connect(self.reformat_timestamps)
@@ -64,7 +84,18 @@ class UrlCompletionModel(base.BaseCompletionModel):
         fmt = config.get('completion', 'timestamp-format')
         if fmt is None:
             return ''
-        return datetime.datetime.fromtimestamp(atime).strftime(fmt)
+        try:
+            dt = datetime.datetime.fromtimestamp(atime)
+        except (ValueError, OSError, OverflowError):
+            # Different errors which can occur for too large values...
+            log.misc.error("Got invalid timestamp {}!".format(atime))
+            return '(invalid)'
+        else:
+            return dt.strftime(fmt)
+
+    def _remove_oldest_history(self):
+        """Remove the oldest history entry."""
+        self._history_cat.removeRow(0)
 
     def _add_history_entry(self, entry):
         """Add a new history entry to the completion."""
@@ -72,47 +103,46 @@ class UrlCompletionModel(base.BaseCompletionModel):
                       self._fmt_atime(entry.atime), sort=int(entry.atime),
                       userdata=entry.url)
 
-    def _add_quickmark_entry(self, name, url):
-        """Add a new quickmark entry to the completion.
-
-        Args:
-            name: The name of the new quickmark.
-            url: The URL of the new quickmark.
-        """
-        self.new_item(self._quickmark_cat, url, name)
+        if (self._max_history != -1 and
+                self._history_cat.rowCount() > self._max_history):
+            self._remove_oldest_history()
 
     @config.change_filter('completion', 'timestamp-format')
     def reformat_timestamps(self):
         """Reformat the timestamps if the config option was changed."""
         for i in range(self._history_cat.rowCount()):
-            name_item = self._history_cat.child(i, 0)
-            atime_item = self._history_cat.child(i, 2)
-            atime = name_item.data(base.Role.sort)
+            url_item = self._history_cat.child(i, self.URL_COLUMN)
+            atime_item = self._history_cat.child(i, self.TIME_COLUMN)
+            atime = url_item.data(base.Role.sort)
             atime_item.setText(self._fmt_atime(atime))
 
     @pyqtSlot(object)
     def on_history_item_added(self, entry):
         """Slot called when a new history item was added."""
         for i in range(self._history_cat.rowCount()):
-            name_item = self._history_cat.child(i, 0)
-            atime_item = self._history_cat.child(i, 2)
-            url = name_item.data(base.Role.userdata)
+            url_item = self._history_cat.child(i, self.URL_COLUMN)
+            atime_item = self._history_cat.child(i, self.TIME_COLUMN)
+            url = url_item.data(base.Role.userdata)
             if url == entry.url:
                 atime_item.setText(self._fmt_atime(entry.atime))
-                name_item.setData(int(entry.atime), base.Role.sort)
+                url_item.setData(int(entry.atime), base.Role.sort)
                 break
         else:
             self._add_history_entry(entry)
 
-    @pyqtSlot(str, str)
-    def on_quickmark_added(self, name, url):
-        """Called when a quickmark has been added by the user.
+    def _remove_item(self, data, category, column):
+        """Helper function for on_quickmark_removed and on_bookmark_removed.
 
         Args:
-            name: The name of the new quickmark.
-            url: The url of the new quickmark, as string.
+            data: The item to search for.
+            category: The category to search in.
+            column: The column to use for matching.
         """
-        self._add_quickmark_entry(name, url)
+        for i in range(category.rowCount()):
+            item = category.child(i, column)
+            if item.data(Qt.DisplayRole) == data:
+                category.removeRow(i)
+                break
 
     @pyqtSlot(str)
     def on_quickmark_removed(self, name):
@@ -121,8 +151,36 @@ class UrlCompletionModel(base.BaseCompletionModel):
         Args:
             name: The name of the quickmark which has been removed.
         """
-        for i in range(self._quickmark_cat.rowCount()):
-            name_item = self._quickmark_cat.child(i, 1)
-            if name_item.data(Qt.DisplayRole) == name:
-                self._quickmark_cat.removeRow(i)
-                break
+        self._remove_item(name, self._quickmark_cat, self.TEXT_COLUMN)
+
+    @pyqtSlot(str)
+    def on_bookmark_removed(self, url):
+        """Called when a bookmark has been removed by the user.
+
+        Args:
+            url: The url of the bookmark which has been removed.
+        """
+        self._remove_item(url, self._bookmark_cat, self.URL_COLUMN)
+
+    def delete_cur_item(self, completion):
+        """Delete the selected item.
+
+        Args:
+            completion: The Completion object to use.
+        """
+        index = completion.currentIndex()
+        qtutils.ensure_valid(index)
+        category = index.parent()
+        index = category.child(index.row(), self.URL_COLUMN)
+        url = index.data()
+        qtutils.ensure_valid(category)
+
+        if category.data() == 'Bookmarks':
+            bookmark_manager = objreg.get('bookmark-manager')
+            bookmark_manager.delete(url)
+        elif category.data() == 'Quickmarks':
+            quickmark_manager = objreg.get('quickmark-manager')
+            sibling = index.sibling(index.row(), self.TEXT_COLUMN)
+            qtutils.ensure_valid(sibling)
+            name = sibling.data()
+            quickmark_manager.quickmark_del(name)

qutebrowser/config/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/config/config.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -29,19 +29,23 @@ import sys
 import os.path
 import functools
 import configparser
+import contextlib
 import collections
 import collections.abc
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl, QSettings
-from PyQt5.QtWidgets import QMessageBox
 
 from qutebrowser.config import configdata, configexc, textwrapper
 from qutebrowser.config.parsers import ini, keyconf
 from qutebrowser.commands import cmdexc, cmdutils
-from qutebrowser.utils import message, objreg, utils, standarddir, log, qtutils
+from qutebrowser.utils import (message, objreg, utils, standarddir, log,
+                               qtutils, error, usertypes)
 from qutebrowser.utils.usertypes import Completion
 
 
+UNSET = object()
+
+
 class change_filter:  # pylint: disable=invalid-name
 
     """Decorator to filter calls based on a config section/option matching.
@@ -52,9 +56,10 @@ class change_filter:  # pylint: disable=invalid-name
     Attributes:
         _sectname: The section to be filtered.
         _optname: The option to be filtered.
+        _function: Whether a function rather than a method is decorated.
     """
 
-    def __init__(self, sectname, optname=None):
+    def __init__(self, sectname, optname=None, function=False):
         """Save decorator arguments.
 
         Gets called on parse-time with the decorator arguments.
@@ -62,6 +67,7 @@ class change_filter:  # pylint: disable=invalid-name
         Args:
             sectname: The section to be filtered.
             optname: The option to be filtered.
+            function: Whether a function rather than a method is decorated.
         """
         if sectname not in configdata.DATA:
             raise configexc.NoSectionError(sectname)
@@ -69,6 +75,7 @@ class change_filter:  # pylint: disable=invalid-name
             raise configexc.NoOptionError(optname, sectname)
         self._sectname = sectname
         self._optname = optname
+        self._function = function
 
     def __call__(self, func):
         """Filter calls to the decorated function.
@@ -86,19 +93,32 @@ class change_filter:  # pylint: disable=invalid-name
         Return:
             The decorated function.
         """
-        @pyqtSlot(str, str)
-        @functools.wraps(func)
-        def wrapper(wrapper_self, sectname=None, optname=None):
-            # pylint: disable=missing-docstring
-            if sectname is None and optname is None:
-                # Called directly, not from a config change event.
-                return func(wrapper_self)
-            elif sectname != self._sectname:
-                return
-            elif self._optname is not None and optname != self._optname:
-                return
-            else:
-                return func(wrapper_self)
+        if self._function:
+            @pyqtSlot(str, str)
+            @functools.wraps(func)
+            def wrapper(sectname=None, optname=None):
+                if sectname is None and optname is None:
+                    # Called directly, not from a config change event.
+                    return func()
+                elif sectname != self._sectname:
+                    return
+                elif self._optname is not None and optname != self._optname:
+                    return
+                else:
+                    return func()
+        else:
+            @pyqtSlot(str, str)
+            @functools.wraps(func)
+            def wrapper(wrapper_self, sectname=None, optname=None):
+                if sectname is None and optname is None:
+                    # Called directly, not from a config change event.
+                    return func(wrapper_self)
+                elif sectname != self._sectname:
+                    return
+                elif self._optname is not None and optname != self._optname:
+                    return
+                else:
+                    return func(wrapper_self)
 
         return wrapper
 
@@ -119,24 +139,24 @@ def _init_main_config(parent=None):
     Args:
         parent: The parent to pass to ConfigManager.
     """
+    args = objreg.get('args')
+    config_obj = ConfigManager(parent=parent)
     try:
-        args = objreg.get('args')
-        config_obj = ConfigManager(standarddir.config(), 'qutebrowser.conf',
-                                   args.relaxed_config, parent=parent)
+        config_obj.read(standarddir.config(), 'qutebrowser.conf',
+                        relaxed=args.relaxed_config)
     except (configexc.Error, configparser.Error, UnicodeDecodeError) as e:
         log.init.exception(e)
         errstr = "Error while reading config:"
         try:
             errstr += "\n\n{} -> {}:".format(
-                e.section, e.option)  # pylint: disable=no-member
+                e.section, e.option)
         except AttributeError:
             pass
-        errstr += "\n{}".format(e)
-        msgbox = QMessageBox(QMessageBox.Critical,
-                             "Error while reading config!", errstr)
-        msgbox.exec_()
+        errstr += "\n"
+        error.handle_fatal_exc(e, args, "Error while reading config!",
+                               pre_text=errstr)
         # We didn't really initialize much so far, so we just quit hard.
-        sys.exit(1)
+        sys.exit(usertypes.Exit.err_config)
     else:
         objreg.register('config', config_obj)
         if standarddir.config() is not None:
@@ -160,20 +180,20 @@ def _init_key_config(parent):
     Args:
         parent: The parent to use for the KeyConfigParser.
     """
+    args = objreg.get('args')
     try:
         key_config = keyconf.KeyConfigParser(standarddir.config(), 'keys.conf',
+                                             args.relaxed_config,
                                              parent=parent)
     except (keyconf.KeyConfigError, UnicodeDecodeError) as e:
         log.init.exception(e)
         errstr = "Error while reading key config:\n"
         if e.lineno is not None:
             errstr += "In line {}: ".format(e.lineno)
-        errstr += str(e)
-        msgbox = QMessageBox(QMessageBox.Critical,
-                             "Error while reading key config!", errstr)
-        msgbox.exec_()
+        error.handle_fatal_exc(e, args, "Error while reading key config!",
+                               pre_text=errstr)
         # We didn't really initialize much so far, so we just quit hard.
-        sys.exit(1)
+        sys.exit(usertypes.Exit.err_key_config)
     else:
         objreg.register('key-config', key_config)
         if standarddir.config() is not None:
@@ -235,6 +255,38 @@ def init(parent=None):
     _init_misc()
 
 
+def _get_value_transformer(mapping):
+    """Get a function which transforms a value for CHANGED_OPTIONS.
+
+    Args:
+        mapping: A dictionary mapping old values to new values. Value is not
+                 transformed if the supplied value doesn't match the old value.
+
+    Return:
+        A function which takes a value and transforms it.
+    """
+    def transformer(val):
+        try:
+            return mapping[val]
+        except KeyError:
+            return val
+    return transformer
+
+
+def _transform_position(val):
+    """Transformer for position values."""
+    mapping = {
+        'north': 'top',
+        'south': 'bottom',
+        'west': 'left',
+        'east': 'right',
+    }
+    try:
+        return mapping[val]
+    except KeyError:
+        return val
+
+
 class ConfigManager(QObject):
 
     """Configuration manager for qutebrowser.
@@ -246,6 +298,10 @@ class ConfigManager(QObject):
         RENAMED_SECTIONS: A mapping of renamed sections, {'oldname': 'newname'}
         RENAMED_OPTIONS: A mapping of renamed options,
                          {('section', 'oldname'): 'newname'}
+        CHANGED_OPTIONS: A mapping of arbitrarily changed options,
+                         {('section', 'option'): callable}.
+                         The callable takes the old value and returns the new
+                         one.
         DELETED_OPTIONS: A (section, option) list of deleted options.
 
     Attributes:
@@ -270,45 +326,53 @@ class ConfigManager(QObject):
     RENAMED_OPTIONS = {
         ('colors', 'tab.fg.odd'): 'tabs.fg.odd',
         ('colors', 'tab.fg.even'): 'tabs.fg.even',
-        ('colors', 'tab.fg.selected'): 'tabs.fg.selected',
+        ('colors', 'tab.fg.selected'): 'tabs.fg.selected.odd',
+        ('colors', 'tabs.fg.selected'): 'tabs.fg.selected.odd',
         ('colors', 'tab.bg.odd'): 'tabs.bg.odd',
         ('colors', 'tab.bg.even'): 'tabs.bg.even',
-        ('colors', 'tab.bg.selected'): 'tabs.bg.selected',
+        ('colors', 'tab.bg.selected'): 'tabs.bg.selected.odd',
+        ('colors', 'tabs.bg.selected'): 'tabs.bg.selected.odd',
         ('colors', 'tab.bg.bar'): 'tabs.bg.bar',
         ('colors', 'tab.indicator.start'): 'tabs.indicator.start',
         ('colors', 'tab.indicator.stop'): 'tabs.indicator.stop',
         ('colors', 'tab.indicator.error'): 'tabs.indicator.error',
         ('colors', 'tab.indicator.system'): 'tabs.indicator.system',
-        ('tabs', 'auto-hide'): 'hide-auto',
         ('completion', 'history-length'): 'cmd-history-max-items',
+        ('colors', 'downloads.fg'): 'downloads.fg.start',
     }
     DELETED_OPTIONS = [
         ('colors', 'tab.separator'),
         ('colors', 'tabs.separator'),
         ('colors', 'completion.item.bg'),
+        ('tabs', 'indicator-space'),
+        ('tabs', 'hide-auto'),
+        ('tabs', 'auto-hide'),
+        ('tabs', 'hide-always'),
     ]
+    CHANGED_OPTIONS = {
+        ('content', 'cookies-accept'):
+            _get_value_transformer({'default': 'no-3rdparty'}),
+        ('tabs', 'position'): _transform_position,
+        ('ui', 'downloads-position'): _transform_position,
+        ('ui', 'remove-finished-downloads'):
+            _get_value_transformer({'false': '-1', 'true': '1000'}),
+        ('general', 'log-javascript-console'):
+            _get_value_transformer({'false': 'none', 'true': 'debug'}),
+    }
 
     changed = pyqtSignal(str, str)
     style_changed = pyqtSignal(str, str)
 
-    def __init__(self, configdir, fname, relaxed=False, parent=None):
+    def __init__(self, parent=None):
         super().__init__(parent)
         self._initialized = False
+        self._configdir = None
+        self._fname = None
         self.sections = configdata.data()
         self._interpolation = configparser.ExtendedInterpolation()
         self._proxies = {}
-        for sectname in self.sections.keys():
+        for sectname in self.sections:
             self._proxies[sectname] = SectionProxy(self, sectname)
-        self._fname = fname
-        if configdir is None:
-            self._configdir = None
-            self._initialized = True
-        else:
-            self._configdir = configdir
-            parser = ini.ReadConfigParser(configdir, fname)
-            self._from_cp(parser, relaxed)
-            self._initialized = True
-            self._validate_all()
 
     def __getitem__(self, key):
         """Get a section from the config."""
@@ -346,13 +410,13 @@ class ConfigManager(QObject):
         lines = []
         if not getattr(sect, 'descriptions', None):
             return lines
+
         for optname, option in sect.items():
+
             lines.append('#')
-            if option.typ.typestr is None:
-                typestr = ''
-            else:
-                typestr = ' ({})'.format(option.typ.typestr)
+            typestr = ' ({})'.format(option.typ.__class__.__name__)
             lines.append("# {}{}:".format(optname, typestr))
+
             try:
                 desc = self.sections[sectname].descriptions[optname]
             except KeyError:
@@ -445,10 +509,15 @@ class ConfigManager(QObject):
         for k, v in cp[real_sectname].items():
             if k.startswith(self.ESCAPE_CHAR):
                 k = k[1:]
+
             if (sectname, k) in self.DELETED_OPTIONS:
                 return
-            elif (sectname, k) in self.RENAMED_OPTIONS:
+            if (sectname, k) in self.RENAMED_OPTIONS:
                 k = self.RENAMED_OPTIONS[sectname, k]
+            if (sectname, k) in self.CHANGED_OPTIONS:
+                func = self.CHANGED_OPTIONS[(sectname, k)]
+                v = func(v)
+
             try:
                 self.set('conf', sectname, k, v, validate=False)
             except configexc.NoOptionError:
@@ -481,7 +550,8 @@ class ConfigManager(QObject):
 
     def _after_set(self, changed_sect, changed_opt):
         """Clean up caches and emit signals after an option has been set."""
-        self.get.cache_clear()
+        # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/659/
+        self.get.cache_clear()  # pylint: disable=no-member
         self._changed(changed_sect, changed_opt)
         # Options in the same section and ${optname} interpolation.
         for optname, option in self.sections[changed_sect].items():
@@ -494,6 +564,19 @@ class ConfigManager(QObject):
                         option.value()):
                     self._changed(sectname, optname)
 
+    def read(self, configdir, fname, relaxed=False):
+        """Read the config from the given directory/file."""
+        self._fname = fname
+        if configdir is None:
+            self._configdir = None
+            self._initialized = True
+        else:
+            self._configdir = configdir
+            parser = ini.ReadConfigParser(configdir, fname)
+            self._from_cp(parser, relaxed)
+            self._initialized = True
+            self._validate_all()
+
     def items(self, sectname, raw=True):
         """Get a list of (optname, value) tuples for a section.
 
@@ -542,14 +625,19 @@ class ConfigManager(QObject):
         optname = self.optionxform(optname)
         existed = optname in sectdict
         if existed:
-            del sectdict[optname]
-            self.get.cache_clear()
+            sectdict.delete(optname)
+            # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/659/
+            self.get.cache_clear()  # pylint: disable=no-member
         return existed
 
     @functools.lru_cache()
-    def get(self, sectname, optname, raw=False, transformed=True):
+    def get(self, sectname, optname, raw=False, transformed=True,
+            fallback=UNSET):
         """Get the value from a section/option.
 
+        We don't support the vars argument from configparser.get as it's not
+        hashable.
+
         Args:
             sectname: The section to get the option from.
             optname: The option name
@@ -562,13 +650,18 @@ class ConfigManager(QObject):
         if not self._initialized:
             raise Exception("get got called before initialization was "
                             "complete!")
+
         try:
             sect = self.sections[sectname]
         except KeyError:
+            if fallback is not UNSET:
+                return fallback
             raise configexc.NoSectionError(sectname)
         try:
             val = sect[optname]
         except KeyError:
+            if fallback is not UNSET:
+                return fallback
             raise configexc.NoOptionError(optname, sectname)
         if raw:
             return val.value()
@@ -579,13 +672,23 @@ class ConfigManager(QObject):
             newval = val.typ.transform(newval)
         return newval
 
-    @cmdutils.register(name='set', instance='config',
+    @contextlib.contextmanager
+    def _handle_config_error(self):
+        """Catch errors in set_command and raise CommandError."""
+        try:
+            yield
+        except (configexc.NoOptionError, configexc.NoSectionError,
+                configexc.ValidationError) as e:
+            raise cmdexc.CommandError("set: {}".format(e))
+        except (configexc.Error, configparser.Error) as e:
+            raise cmdexc.CommandError("set: {} - {}".format(
+                e.__class__.__name__, e))
+
+    @cmdutils.register(name='set', instance='config', win_id='win_id',
                        completion=[Completion.section, Completion.option,
                                    Completion.value])
-    def set_command(self, win_id: {'special': 'win_id'},
-                    sectname: {'name': 'section'}=None,
-                    optname: {'name': 'option'}=None, value=None, temp=False,
-                    print_val: {'name': 'print'}=False):
+    def set_command(self, win_id, section_=None, option=None, value=None,
+                    temp=False, print_=False):
         """Set an option.
 
         If the option name ends with '?', the value of the option is shown
@@ -598,49 +701,48 @@ class ConfigManager(QObject):
         Wrapper for self.set() to output exceptions in the status bar.
 
         Args:
-            sectname: The section where the option is in.
-            optname: The name of the option.
+            section_: The section where the option is in.
+            option: The name of the option.
             value: The value to set.
             temp: Set value temporarily.
-            print_val: Print the value after setting.
+            print_: Print the value after setting.
         """
-        if sectname is not None and optname is None:
+        if section_ is not None and option is None:
             raise cmdexc.CommandError(
                 "set: Either both section and option have to be given, or "
                 "neither!")
-        if sectname is None and optname is None:
+        if section_ is None and option is None:
             tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                         window=win_id)
             tabbed_browser.openurl(QUrl('qute:settings'), newtab=False)
             return
 
-        if optname.endswith('?'):
-            optname = optname[:-1]
-            print_val = True
+        if option.endswith('?') and option != '?':
+            option = option[:-1]
+            print_ = True
         else:
-            try:
-                if optname.endswith('!') and value is None:
-                    val = self.get(sectname, optname[:-1])
+            with self._handle_config_error():
+                if option.endswith('!') and option != '!' and value is None:
+                    option = option[:-1]
+                    val = self.get(section_, option)
                     layer = 'temp' if temp else 'conf'
                     if isinstance(val, bool):
-                        self.set(layer, sectname, optname[:-1], str(not val))
+                        self.set(layer, section_, option, str(not val))
                     else:
                         raise cmdexc.CommandError(
                             "set: Attempted inversion of non-boolean value.")
                 elif value is not None:
                     layer = 'temp' if temp else 'conf'
-                    self.set(layer, sectname, optname, value)
+                    self.set(layer, section_, option, value)
                 else:
                     raise cmdexc.CommandError("set: The following arguments "
                                               "are required: value")
-            except (configexc.Error, configparser.Error) as e:
-                raise cmdexc.CommandError("set: {} - {}".format(
-                    e.__class__.__name__, e))
 
-        if print_val:
-            val = self.get(sectname, optname, transformed=False)
+        if print_:
+            with self._handle_config_error():
+                val = self.get(section_, option, transformed=False)
             message.info(win_id, "{} {} = {}".format(
-                sectname, optname, val), immediately=True)
+                section_, option, val), immediately=True)
 
     def set(self, layer, sectname, optname, value, validate=True):
         """Set an option.

qutebrowser/config/configdata.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -100,9 +100,13 @@ SECTION_DESC = {
         " * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or "
         "percentages)\n"
         " * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359)\n"
-        " * A gradient as explained in http://qt-project.org/doc/qt-4.8/"
+        " * A gradient as explained in http://doc.qt.io/qt-5/"
         "stylesheet-reference.html#list-of-property-types[the Qt "
         "documentation] under ``Gradient''.\n\n"
+        "A *.system value determines the color system to use for color "
+        "interpolation between similarly-named *.start and *.stop entries, "
+        "regardless of how they are defined in the options. "
+        "Valid values are 'rgb', 'hsv', and 'hsl'.\n\n"
         "The `hints.*` values are a special case as they're real CSS "
         "colors, not Qt-CSS colors. There, for a gradient, you need to use "
         "`-webkit-gradient`, see https://www.webkit.org/blog/175/introducing-"
@@ -136,7 +140,7 @@ def data(readonly=False):
              "end."),
 
             ('startpage',
-             SettingValue(typ.List(), 'https://www.duckduckgo.com'),
+             SettingValue(typ.List(), 'https://duckduckgo.com'),
              "The default page(s) to open at the start, separated by commas."),
 
             ('default-page',
@@ -161,8 +165,9 @@ def data(readonly=False):
              SettingValue(typ.ShellCommand(placeholder=True), 'gvim -f "{}"'),
              "The editor (and arguments) to use for the `open-editor` "
              "command.\n\n"
-             "Use `{}` for the filename. The value gets split like in a "
-             "shell, so you can use `\"` or `'` to quote arguments."),
+             "The arguments get split like in a shell, so you can use `\"` or "
+             "`'` to quote them.\n"
+             "`{}` gets replaced by the filename of the file to be edited."),
 
             ('editor-encoding',
              SettingValue(typ.Encoding(), 'utf-8'),
@@ -204,13 +209,33 @@ def data(readonly=False):
              "be used."),
 
             ('new-instance-open-target',
-             SettingValue(typ.NewInstanceOpenTarget(), 'window'),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('tab', "Open a new tab in the existing "
+                      "window and activate the window."),
+                     ('tab-bg', "Open a new background tab in the "
+                      "existing window and activate the "
+                      "window."),
+                     ('tab-silent', "Open a new tab in the existing "
+                      "window without activating "
+                      "the window."),
+                     ('tab-bg-silent', "Open a new background tab "
+                      "in the existing window "
+                      "without activating the "
+                      "window."),
+                     ('window', "Open in a new window.")
+                 )), 'tab'),
              "How to open links in an existing instance if a new one is "
              "launched."),
 
             ('log-javascript-console',
-             SettingValue(typ.Bool(), 'false'),
-             "Whether to log javascript console messages."),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('none', "Don't log messages."),
+                     ('debug', "Log messages with debug level."),
+                     ('info', "Log messages with info level.")
+                 )), 'debug'),
+             "How to log javascript console messages."),
 
             ('save-session',
              SettingValue(typ.Bool(), 'false'),
@@ -221,6 +246,14 @@ def data(readonly=False):
              "The name of the session to save by default, or empty for the "
              "last loaded session."),
 
+            ('url-incdec-segments',
+             SettingValue(
+                 typ.FlagList(valid_values=typ.ValidValues(
+                     'host', 'path', 'query', 'anchor')),
+                 'path,query'),
+             "The URL segments where `:navigate increment/decrement` will "
+             "search for a number."),
+
             readonly=readonly
         )),
 
@@ -236,7 +269,7 @@ def data(readonly=False):
              "The default zoom level."),
 
             ('downloads-position',
-             SettingValue(typ.VerticalPosition(), 'north'),
+             SettingValue(typ.VerticalPosition(), 'top'),
              "Where to show the downloaded files."),
 
             ('message-timeout',
@@ -267,26 +300,37 @@ def data(readonly=False):
              "page."),
 
             ('user-stylesheet',
-             SettingValue(typ.UserStyleSheet(),
+             SettingValue(typ.UserStyleSheet(none_ok=True),
                           '::-webkit-scrollbar { width: 0px; height: 0px; }'),
-             "User stylesheet to use (absolute filename or CSS string). Will "
-             "expand environment variables."),
+             "User stylesheet to use (absolute filename, filename relative to "
+             "the config directory or CSS string). Will expand environment "
+             "variables."),
 
             ('css-media-type',
              SettingValue(typ.String(none_ok=True), ''),
              "Set the CSS media type."),
 
-            ('remove-finished-downloads',
+            ('smooth-scrolling',
              SettingValue(typ.Bool(), 'false'),
-             "Whether to remove finished downloads automatically."),
+             "Whether to enable smooth scrolling for webpages."),
+
+            ('remove-finished-downloads',
+             SettingValue(typ.Int(minval=-1), '-1'),
+             "Number of milliseconds to wait before removing finished "
+             "downloads. Will not be removed if value is -1."),
 
             ('hide-statusbar',
              SettingValue(typ.Bool(), 'false'),
              "Whether to hide the statusbar unless a message is shown."),
 
+            ('statusbar-padding',
+             SettingValue(typ.Padding(), '1,1,0,0'),
+             "Padding for statusbar (top, bottom, left, right)."),
+
             ('window-title-format',
              SettingValue(typ.FormatString(fields=['perc', 'perc_raw', 'title',
-                                                   'title_sep', 'id']),
+                                                   'title_sep', 'id',
+                                                   'scroll_pos']),
                           '{perc}{title}{title_sep}qutebrowser'),
              "The format to use for the window title. The following "
              "placeholders are defined:\n\n"
@@ -295,12 +339,22 @@ def data(readonly=False):
              "* `{title}`: The title of the current web page\n"
              "* `{title_sep}`: The string ` - ` if a title is set, empty "
              "otherwise.\n"
-             "* `{id}`: The internal window ID of this window."),
+             "* `{id}`: The internal window ID of this window.\n"
+             "* `{scroll_pos}`: The page scroll position."),
 
             ('hide-mouse-cursor',
              SettingValue(typ.Bool(), 'false'),
              "Whether to hide the mouse cursor."),
 
+            ('modal-js-dialog',
+             SettingValue(typ.Bool(), 'false'),
+             "Use standard JavaScript modal dialog for alert() and confirm()"),
+
+            ('hide-wayland-decoration',
+             SettingValue(typ.Bool(), 'false'),
+             "Hide the window decoration when using wayland "
+             "(requires restart)"),
+
             readonly=readonly
         )),
 
@@ -313,6 +367,18 @@ def data(readonly=False):
              SettingValue(typ.String(none_ok=True), 'en-US,en'),
              "Value to send in the `accept-language` header."),
 
+            ('referer-header',
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('always', "Always send."),
+                     ('never', "Never send; this is not recommended,"
+                      " as some sites may break."),
+                     ('same-domain', "Only send for the same domain."
+                      " This will still protect your privacy, but"
+                      " shouldn't break any sites.")
+                 )), 'same-domain'),
+             "Send the Referer header"),
+
             ('user-agent',
              SettingValue(typ.UserAgent(none_ok=True), ''),
              "User agent to send. Empty to send the default."),
@@ -339,12 +405,21 @@ def data(readonly=False):
         )),
 
         ('completion', sect.KeyValue(
+            ('auto-open',
+             SettingValue(typ.Bool(), 'true'),
+             "Automatically open completion when typing."),
+
             ('download-path-suggestion',
-             SettingValue(typ.DownloadPathSuggestion(), 'path'),
+             SettingValue(
+                 typ.String(valid_values=typ.ValidValues(
+                     ('path', "Show only the download path."),
+                     ('filename', "Show only download filename."),
+                     ('both', "Show download path and filename."))),
+                 'path'),
              "What to display in the download filename input."),
 
             ('timestamp-format',
-             SettingValue(typ.String(none_ok=True), '%Y-%m-%d'),
+             SettingValue(typ.TimestampTemplate(none_ok=True), '%Y-%m-%d'),
              "How to format timestamps (e.g. for history)"),
 
             ('show',
@@ -377,6 +452,14 @@ def data(readonly=False):
              "Whether to shrink the completion to be smaller than the "
              "configured size if there are no scrollbars."),
 
+            ('scrollbar-width',
+             SettingValue(typ.Int(minval=0), '12'),
+             "Width of the scrollbar in the completion window (in px)."),
+
+            ('scrollbar-padding',
+             SettingValue(typ.Int(minval=0), '2'),
+             "Padding of scrollbar handle in completion window (in px)."),
+
             readonly=readonly
         )),
 
@@ -405,12 +488,18 @@ def data(readonly=False):
              "element is focused after page load."),
 
             ('forward-unbound-keys',
-             SettingValue(typ.ForwardUnboundKeys(), 'auto'),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('all', "Forward all unbound keys."),
+                     ('auto', "Forward unbound non-alphanumeric "
+                      "keys."),
+                     ('none', "Don't forward any keys.")
+                 )), 'auto'),
              "Whether to forward unbound keys to the webview in normal mode."),
 
             ('spatial-navigation',
              SettingValue(typ.Bool(), 'false'),
-             "Enables or disables the Spatial Navigation feature\n\n"
+             "Enables or disables the Spatial Navigation feature.\n\n"
              "Spatial navigation consists in the ability to navigate between "
              "focusable elements in a Web page, such as hyperlinks and form "
              "controls, by using Left, Right, Up and Down arrow keys. For "
@@ -455,16 +544,32 @@ def data(readonly=False):
              "How new tabs opened explicitly are positioned."),
 
             ('last-close',
-             SettingValue(typ.LastClose(), 'ignore'),
-             "Behaviour when the last tab is closed."),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('ignore', "Don't do anything."),
+                     ('blank', "Load a blank page."),
+                     ('startpage', "Load the start page."),
+                     ('default-page', "Load the default page."),
+                     ('close', "Close the window.")
+                 )), 'ignore'),
+             "Behavior when the last tab is closed."),
 
-            ('hide-auto',
-             SettingValue(typ.Bool(), 'false'),
-             "Hide the tab bar if only one tab is open."),
+            ('show',
+             SettingValue(
+                 typ.String(valid_values=typ.ValidValues(
+                     ('always', "Always show the tab bar."),
+                     ('never', "Always hide the tab bar."),
+                     ('multiple', "Hide the tab bar if only one tab "
+                      "is open."),
+                     ('switching', "Show the tab bar when switching "
+                      "tabs.")
+                 )), 'always'),
+             "When to show the tab bar"),
 
-            ('hide-always',
-             SettingValue(typ.Bool(), 'false'),
-             "Always hide the tab bar."),
+            ('show-switching-delay',
+             SettingValue(typ.Int(), '800'),
+             "Time to show the tab bar before hiding it when tabs->show is "
+             "set to 'switching'."),
 
             ('wrap',
              SettingValue(typ.Bool(), 'true'),
@@ -475,11 +580,16 @@ def data(readonly=False):
              "Whether tabs should be movable."),
 
             ('close-mouse-button',
-             SettingValue(typ.CloseButton(), 'middle'),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('right', "Close tabs on right-click."),
+                     ('middle', "Close tabs on middle-click."),
+                     ('none', "Don't close tabs using the mouse.")
+                 )), 'middle'),
              "On which mouse button to close tabs."),
 
             ('position',
-             SettingValue(typ.Position(), 'north'),
+             SettingValue(typ.Position(), 'top'),
              "The position of the tab bar."),
 
             ('show-favicons',
@@ -496,10 +606,6 @@ def data(readonly=False):
              SettingValue(typ.Int(minval=0), '3'),
              "Width of the progress indicator (0 to disable)."),
 
-            ('indicator-space',
-             SettingValue(typ.Int(minval=0), '3'),
-             "Spacing between tab edge and indicator."),
-
             ('tabs-are-windows',
              SettingValue(typ.Bool(), 'false'),
              "Whether to open windows instead of tabs."),
@@ -507,7 +613,7 @@ def data(readonly=False):
             ('title-format',
              SettingValue(typ.FormatString(
                  fields=['perc', 'perc_raw', 'title', 'title_sep', 'index',
-                         'id']), '{index}: {title}'),
+                         'id', 'scroll_pos']), '{index}: {title}'),
              "The format to use for the tab title. The following placeholders "
              "are defined:\n\n"
              "* `{perc}`: The percentage as a string like `[10%]`.\n"
@@ -516,7 +622,24 @@ def data(readonly=False):
              "* `{title_sep}`: The string ` - ` if a title is set, empty "
              "otherwise.\n"
              "* `{index}`: The index of this tab.\n"
-             "* `{id}`: The internal tab ID of this tab."),
+             "* `{id}`: The internal tab ID of this tab.\n"
+             "* `{scroll_pos}`: The page scroll position."),
+
+            ('title-alignment',
+             SettingValue(typ.TextAlignment(), 'left'),
+             "Alignment of the text inside of tabs"),
+
+            ('mousewheel-tab-switching',
+             SettingValue(typ.Bool(), 'true'),
+             "Switch between tabs using the mouse wheel."),
+
+            ('padding',
+             SettingValue(typ.Padding(), '0,0,5,5'),
+             "Padding for tabs (top, bottom, left, right)."),
+
+            ('indicator-padding',
+             SettingValue(typ.Padding(), '2,2,0,4'),
+             "Padding for indicators (top, bottom, left, right)."),
 
             readonly=readonly
         )),
@@ -528,6 +651,15 @@ def data(readonly=False):
              "sensible os-specific default. Will expand environment "
              "variables."),
 
+            ('prompt-download-directory',
+             SettingValue(typ.Bool(), 'true'),
+             "Whether to prompt the user for the download location.\n"
+             "If set to false, 'download-directory' will be used."),
+
+            ('remember-download-directory',
+             SettingValue(typ.Bool(), 'true'),
+             "Whether to remember the last used download directory."),
+
             ('maximum-pages-in-cache',
              SettingValue(
                  typ.Int(none_ok=True, minval=0, maxval=MAXVALS['int']), ''),
@@ -541,7 +673,8 @@ def data(readonly=False):
 
             ('object-cache-capacities',
              SettingValue(
-                 typ.WebKitBytesList(length=3, maxsize=MAXVALS['int']), ''),
+                 typ.WebKitBytesList(length=3, maxsize=MAXVALS['int'],
+                                     none_ok=True), ''),
              "The capacities for the global memory cache for dead objects "
              "such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, "
              "cacheMaxDead, totalCapacity.\n\n"
@@ -554,11 +687,13 @@ def data(readonly=False):
              "that the cache should consume *overall*."),
 
             ('offline-storage-default-quota',
-             SettingValue(typ.WebKitBytes(maxsize=MAXVALS['int64']), ''),
+             SettingValue(typ.WebKitBytes(maxsize=MAXVALS['int64'],
+                                          none_ok=True), ''),
              "Default quota for new offline storage databases."),
 
             ('offline-web-application-cache-quota',
-             SettingValue(typ.WebKitBytes(maxsize=MAXVALS['int64']), ''),
+             SettingValue(typ.WebKitBytes(maxsize=MAXVALS['int64'],
+                                          none_ok=True), ''),
              "Quota for the offline web application cache."),
 
             ('offline-storage-database',
@@ -605,12 +740,24 @@ def data(readonly=False):
              'Qt plugins with a mimetype such as "application/x-qt-plugin" '
              "are not affected by this setting."),
 
+            ('webgl',
+             SettingValue(typ.Bool(), 'true'),
+             "Enables or disables WebGL."),
+
+            ('css-regions',
+             SettingValue(typ.Bool(), 'true'),
+             "Enable or disable support for CSS regions."),
+
+            ('hyperlink-auditing',
+             SettingValue(typ.Bool(), 'false'),
+             "Enable or disable hyperlink auditing (<a ping>)."),
+
             ('geolocation',
-             SettingValue(typ.NoAsk(), 'ask'),
+             SettingValue(typ.BoolAsk(), 'ask'),
              "Allow websites to request geolocations."),
 
             ('notifications',
-             SettingValue(typ.NoAsk(), 'ask'),
+             SettingValue(typ.BoolAsk(), 'ask'),
              "Allow websites to show notifications."),
 
             #('allow-java',
@@ -650,8 +797,17 @@ def data(readonly=False):
              "local urls."),
 
             ('cookies-accept',
-             SettingValue(typ.AcceptCookies(), 'default'),
-             "Whether to accept cookies."),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('all', "Accept all cookies."),
+                     ('no-3rdparty', "Accept cookies from the same"
+                      " origin only."),
+                     ('no-unknown-3rdparty', "Accept cookies from "
+                      "the same origin only, unless a cookie is "
+                      "already set for the domain."),
+                     ('never', "Don't accept cookies at all.")
+                 )), 'no-3rdparty'),
+             "Control which cookies to accept."),
 
             ('cookies-store',
              SettingValue(typ.Bool(), 'true'),
@@ -677,6 +833,19 @@ def data(readonly=False):
              SettingValue(typ.Bool(), 'true'),
              "Whether host blocking is enabled."),
 
+            ('host-blocking-whitelist',
+             SettingValue(typ.List(none_ok=True), 'piwik.org'),
+             "List of domains that should always be loaded, despite being "
+             "ad-blocked.\n\n"
+             "Domains may contain * and ? wildcards and are otherwise "
+             "required to exactly match the requested domain.\n\n"
+             "Local domains are always exempt from hostblocking."),
+
+            ('enable-pdfjs', SettingValue(typ.Bool(), 'false'),
+             "Enable pdf.js to view PDF files in the browser.\n\n"
+             "Note that the files can still be downloaded by clicking"
+             " the download button in the pdf.js viewer."),
+
             readonly=readonly
         )),
 
@@ -690,16 +859,25 @@ def data(readonly=False):
              "Opacity for hints."),
 
             ('mode',
-             SettingValue(typ.HintMode(), 'letter'),
+             SettingValue(typ.String(
+                 valid_values=typ.ValidValues(
+                     ('number', "Use numeric hints."),
+                     ('letter', "Use the chars in the hints -> "
+                      "chars setting.")
+                 )), 'letter'),
              "Mode to use for hints."),
 
             ('chars',
-             SettingValue(typ.String(minlen=2), 'asdfghjkl'),
+             SettingValue(typ.String(minlen=2, completions=[
+                 ('asdfghjkl', "Home row"),
+                 ('dhtnaoeu', "Home row (Dvorak)"),
+                 ('abcdefghijklmnopqrstuvwxyz', "All letters"),
+             ]), 'asdfghjkl'),
              "Chars used for hint strings."),
 
             ('min-chars',
              SettingValue(typ.Int(minval=1), '1'),
-             "Mininum number of chars used for hint strings."),
+             "Minimum number of chars used for hint strings."),
 
             ('scatter',
              SettingValue(typ.Bool(), 'true'),
@@ -716,7 +894,8 @@ def data(readonly=False):
 
             ('next-regexes',
              SettingValue(typ.RegexList(flags=re.IGNORECASE),
-                          r'\bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b'),
+                          r'\bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,'
+                          r'\bcontinue\b'),
              "A comma-separated list of regexes to use for 'next' links."),
 
             ('prev-regexes',
@@ -792,30 +971,80 @@ def data(readonly=False):
              SettingValue(typ.QssColor(), '#ff4444'),
              "Foreground color of the matched text in the completion."),
 
-            ('statusbar.bg',
-             SettingValue(typ.QssColor(), 'black'),
-             "Foreground color of the statusbar."),
+            ('completion.scrollbar.fg',
+             SettingValue(typ.QssColor(), '${completion.fg}'),
+             "Color of the scrollbar handle in completion view."),
+
+            ('completion.scrollbar.bg',
+             SettingValue(typ.QssColor(), '${completion.bg}'),
+             "Color of the scrollbar in completion view"),
 
             ('statusbar.fg',
              SettingValue(typ.QssColor(), 'white'),
              "Foreground color of the statusbar."),
 
+            ('statusbar.bg',
+             SettingValue(typ.QssColor(), 'black'),
+             "Background color of the statusbar."),
+
+            ('statusbar.fg.error',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar if there was an error."),
+
             ('statusbar.bg.error',
              SettingValue(typ.QssColor(), 'red'),
              "Background color of the statusbar if there was an error."),
 
+            ('statusbar.fg.warning',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar if there is a warning."),
+
             ('statusbar.bg.warning',
              SettingValue(typ.QssColor(), 'darkorange'),
              "Background color of the statusbar if there is a warning."),
 
+            ('statusbar.fg.prompt',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar if there is a prompt."),
+
             ('statusbar.bg.prompt',
              SettingValue(typ.QssColor(), 'darkblue'),
              "Background color of the statusbar if there is a prompt."),
 
+            ('statusbar.fg.insert',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar in insert mode."),
+
             ('statusbar.bg.insert',
              SettingValue(typ.QssColor(), 'darkgreen'),
              "Background color of the statusbar in insert mode."),
 
+            ('statusbar.fg.command',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar in command mode."),
+
+            ('statusbar.bg.command',
+             SettingValue(typ.QssColor(), '${statusbar.bg}'),
+             "Background color of the statusbar in command mode."),
+
+            ('statusbar.fg.caret',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar in caret mode."),
+
+            ('statusbar.bg.caret',
+             SettingValue(typ.QssColor(), 'purple'),
+             "Background color of the statusbar in caret mode."),
+
+            ('statusbar.fg.caret-selection',
+             SettingValue(typ.QssColor(), '${statusbar.fg}'),
+             "Foreground color of the statusbar in caret mode with a "
+             "selection"),
+
+            ('statusbar.bg.caret-selection',
+             SettingValue(typ.QssColor(), '#a12dff'),
+             "Background color of the statusbar in caret mode with a "
+             "selection"),
+
             ('statusbar.progress.bg',
              SettingValue(typ.QssColor(), 'white'),
              "Background color of the progress bar."),
@@ -825,9 +1054,14 @@ def data(readonly=False):
              "Default foreground color of the URL in the statusbar."),
 
             ('statusbar.url.fg.success',
+             SettingValue(typ.QssColor(), 'white'),
+             "Foreground color of the URL in the statusbar on successful "
+             "load (http)."),
+
+            ('statusbar.url.fg.success.https',
              SettingValue(typ.QssColor(), 'lime'),
              "Foreground color of the URL in the statusbar on successful "
-             "load."),
+             "load (https)."),
 
             ('statusbar.url.fg.error',
              SettingValue(typ.QssColor(), 'orange'),
@@ -847,25 +1081,33 @@ def data(readonly=False):
              SettingValue(typ.QtColor(), 'white'),
              "Foreground color of unselected odd tabs."),
 
-            ('tabs.fg.even',
-             SettingValue(typ.QtColor(), 'white'),
-             "Foreground color of unselected even tabs."),
-
-            ('tabs.fg.selected',
-             SettingValue(typ.QtColor(), 'white'),
-             "Foreground color of selected tabs."),
-
             ('tabs.bg.odd',
              SettingValue(typ.QtColor(), 'grey'),
              "Background color of unselected odd tabs."),
 
+            ('tabs.fg.even',
+             SettingValue(typ.QtColor(), 'white'),
+             "Foreground color of unselected even tabs."),
+
             ('tabs.bg.even',
              SettingValue(typ.QtColor(), 'darkgrey'),
              "Background color of unselected even tabs."),
 
-            ('tabs.bg.selected',
+            ('tabs.fg.selected.odd',
+             SettingValue(typ.QtColor(), 'white'),
+             "Foreground color of selected odd tabs."),
+
+            ('tabs.bg.selected.odd',
              SettingValue(typ.QtColor(), 'black'),
-             "Background color of selected tabs."),
+             "Background color of selected odd tabs."),
+
+            ('tabs.fg.selected.even',
+             SettingValue(typ.QtColor(), '${tabs.fg.selected.odd}'),
+             "Foreground color of selected even tabs."),
+
+            ('tabs.bg.selected.even',
+             SettingValue(typ.QtColor(), '${tabs.bg.selected.odd}'),
+             "Background color of selected even tabs."),
 
             ('tabs.bg.bar',
              SettingValue(typ.QtColor(), '#555555'),
@@ -891,10 +1133,6 @@ def data(readonly=False):
              SettingValue(typ.CssColor(), 'black'),
              "Font color for hints."),
 
-            ('hints.fg.match',
-             SettingValue(typ.CssColor(), 'green'),
-             "Font color for the matched part of hints."),
-
             ('hints.bg',
              SettingValue(
                  typ.CssColor(), '-webkit-gradient(linear, left top, '
@@ -902,30 +1140,51 @@ def data(readonly=False):
                  'color-stop(100%,#FFC542))'),
              "Background color for hints."),
 
-            ('downloads.fg',
-             SettingValue(typ.QtColor(), '#ffffff'),
-             "Foreground color for downloads."),
+            ('hints.fg.match',
+             SettingValue(typ.CssColor(), 'green'),
+             "Font color for the matched part of hints."),
 
             ('downloads.bg.bar',
              SettingValue(typ.QssColor(), 'black'),
              "Background color for the download bar."),
 
+            ('downloads.fg.start',
+             SettingValue(typ.QtColor(), 'white'),
+             "Color gradient start for download text."),
+
             ('downloads.bg.start',
              SettingValue(typ.QtColor(), '#0000aa'),
-             "Color gradient start for downloads."),
+             "Color gradient start for download backgrounds."),
+
+            ('downloads.fg.stop',
+             SettingValue(typ.QtColor(), '${downloads.fg.start}'),
+             "Color gradient end for download text."),
 
             ('downloads.bg.stop',
              SettingValue(typ.QtColor(), '#00aa00'),
-             "Color gradient end for downloads."),
+             "Color gradient stop for download backgrounds."),
+
+            ('downloads.fg.system',
+             SettingValue(typ.ColorSystem(), 'rgb'),
+             "Color gradient interpolation system for download text."),
 
             ('downloads.bg.system',
              SettingValue(typ.ColorSystem(), 'rgb'),
-             "Color gradient interpolation system for downloads."),
+             "Color gradient interpolation system for download backgrounds."),
+
+            ('downloads.fg.error',
+             SettingValue(typ.QtColor(), 'white'),
+             "Foreground color for downloads with errors."),
 
             ('downloads.bg.error',
              SettingValue(typ.QtColor(), 'red'),
              "Background color for downloads with errors."),
 
+            ('webpage.bg',
+             SettingValue(typ.QtColor(none_ok=True), 'white'),
+             "Background color for webpages if unset (or empty to use the "
+             "theme's color)"),
+
             readonly=readonly
         )),
 
@@ -955,7 +1214,7 @@ def data(readonly=False):
              "Font used for the downloadbar."),
 
             ('hints',
-             SettingValue(typ.Font(), 'bold 12px Monospace'),
+             SettingValue(typ.Font(), 'bold 13px Monospace'),
              "Font used for the hints."),
 
             ('debug-console',
@@ -1047,6 +1306,14 @@ KEY_FIRST_COMMENT = """
 # with Shift. For special keys (with `<>`-signs), you need to explicitly add
 # `Shift-` to match a key pressed with shift.  You can bind multiple commands
 # by separating them with `;;`.
+#
+# Note that default keybindings are always bound, and need to be explicitly
+# unbound if you wish to remove them:
+#
+# <unbound>
+#   keychain
+#   keychain2
+#   ...
 """
 
 KEY_SECTION_DESC = {
@@ -1088,16 +1355,24 @@ KEY_SECTION_DESC = {
         " * `prompt-accept`: Confirm the entered value.\n"
         " * `prompt-yes`: Answer yes to a yes/no question.\n"
         " * `prompt-no`: Answer no to a yes/no question."),
+    'caret': (
+        ""),
 }
 
+# Keys which are similar to Return and should be bound by default where Return
+# is bound.
+
+RETURN_KEYS = ['<Return>', '<Ctrl-M>', '<Ctrl-J>', '<Shift-Return>', '<Enter>',
+               '<Shift-Enter>']
+
 
 KEY_DATA = collections.OrderedDict([
     ('!normal', collections.OrderedDict([
-        ('leave-mode', ['<Escape>', '<Ctrl-[>']),
+        ('clear-keychain ;; leave-mode', ['<Escape>', '<Ctrl-[>']),
     ])),
 
     ('normal', collections.OrderedDict([
-        ('search ""', ['<Escape>']),
+        ('clear-keychain ;; search', ['<Escape>']),
         ('set-cmd-text -s :open', ['o']),
         ('set-cmd-text :open {url}', ['go']),
         ('set-cmd-text -s :open -t', ['O']),
@@ -1114,12 +1389,12 @@ KEY_DATA = collections.OrderedDict([
         ('tab-move', ['gm']),
         ('tab-move -', ['gl']),
         ('tab-move +', ['gr']),
-        ('tab-next', ['J', 'gt']),
+        ('tab-focus', ['J', 'gt']),
         ('tab-prev', ['K', 'gT']),
         ('tab-clone', ['gC']),
         ('reload', ['r']),
         ('reload -f', ['R']),
-        ('back', ['H', '<Backspace>']),
+        ('back', ['H']),
         ('back -t', ['th']),
         ('back -w', ['wh']),
         ('forward', ['L']),
@@ -1130,6 +1405,7 @@ KEY_DATA = collections.OrderedDict([
         ('hint all tab', ['F']),
         ('hint all window', ['wf']),
         ('hint all tab-bg', [';b']),
+        ('hint all tab-fg', [';f']),
         ('hint all hover', [';h']),
         ('hint images', [';i']),
         ('hint images tab', [';I']),
@@ -1139,23 +1415,26 @@ KEY_DATA = collections.OrderedDict([
         ('hint links fill ":open -b {hint-url}"', ['.o']),
         ('hint links yank', [';y']),
         ('hint links yank-primary', [';Y']),
-        ('hint links rapid', [';r']),
-        ('hint links rapid-win', [';R']),
+        ('hint --rapid links tab-bg', [';r']),
+        ('hint --rapid links window', [';R']),
         ('hint links download', [';d']),
-        ('scroll -50 0', ['h']),
-        ('scroll 0 50', ['j']),
-        ('scroll 0 -50', ['k']),
-        ('scroll 50 0', ['l']),
+        ('scroll left', ['h']),
+        ('scroll down', ['j']),
+        ('scroll up', ['k']),
+        ('scroll right', ['l']),
         ('undo', ['u', '<Ctrl-Shift-T>']),
         ('scroll-perc 0', ['gg']),
         ('scroll-perc', ['G']),
         ('search-next', ['n']),
         ('search-prev', ['N']),
         ('enter-mode insert', ['i']),
+        ('enter-mode caret', ['v']),
         ('yank', ['yy']),
         ('yank -s', ['yY']),
         ('yank -t', ['yt']),
         ('yank -ts', ['yT']),
+        ('yank -d', ['yd']),
+        ('yank -ds', ['yD']),
         ('paste', ['pp']),
         ('paste -s', ['pP']),
         ('paste -t', ['Pp']),
@@ -1166,6 +1445,10 @@ KEY_DATA = collections.OrderedDict([
         ('set-cmd-text -s :quickmark-load', ['b']),
         ('set-cmd-text -s :quickmark-load -t', ['B']),
         ('set-cmd-text -s :quickmark-load -w', ['wb']),
+        ('bookmark-add', ['M']),
+        ('set-cmd-text -s :bookmark-load', ['gb']),
+        ('set-cmd-text -s :bookmark-load -t', ['gB']),
+        ('set-cmd-text -s :bookmark-load -w', ['wB']),
         ('save', ['sf']),
         ('set-cmd-text -s :set', ['ss']),
         ('set-cmd-text -s :set -t', ['sl']),
@@ -1184,7 +1467,7 @@ KEY_DATA = collections.OrderedDict([
         ('inspector', ['wi']),
         ('download', ['gd']),
         ('download-cancel', ['ad']),
-        ('download-remove --all', ['cd']),
+        ('download-clear', ['cd']),
         ('view-source', ['gf']),
         ('tab-focus last', ['<Ctrl-Tab>']),
         ('enter-mode passthrough', ['<Ctrl-V>']),
@@ -1206,6 +1489,8 @@ KEY_DATA = collections.OrderedDict([
         ('stop', ['<Ctrl-s>']),
         ('print', ['<Ctrl-Alt-p>']),
         ('open qute:settings', ['Ss']),
+        ('follow-selected', RETURN_KEYS),
+        ('follow-selected -t', ['<Ctrl-Return>', '<Ctrl-Enter>']),
     ])),
 
     ('insert', collections.OrderedDict([
@@ -1213,7 +1498,10 @@ KEY_DATA = collections.OrderedDict([
     ])),
 
     ('hint', collections.OrderedDict([
-        ('follow-hint', ['<Return>']),
+        ('follow-hint', RETURN_KEYS),
+        ('hint --rapid links tab-bg', ['<Ctrl-R>']),
+        ('hint links', ['<Ctrl-F>']),
+        ('hint all tab-bg', ['<Ctrl-B>']),
     ])),
 
     ('passthrough', {}),
@@ -1223,11 +1511,12 @@ KEY_DATA = collections.OrderedDict([
         ('command-history-next', ['<Ctrl-N>']),
         ('completion-item-prev', ['<Shift-Tab>', '<Up>']),
         ('completion-item-next', ['<Tab>', '<Down>']),
-        ('command-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>']),
+        ('completion-item-del', ['<Ctrl-D>']),
+        ('command-accept', RETURN_KEYS),
     ])),
 
     ('prompt', collections.OrderedDict([
-        ('prompt-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>']),
+        ('prompt-accept', RETURN_KEYS),
         ('prompt-yes', ['y']),
         ('prompt-no', ['n']),
     ])),
@@ -1242,11 +1531,38 @@ KEY_DATA = collections.OrderedDict([
         ('rl-unix-line-discard', ['<Ctrl-U>']),
         ('rl-kill-line', ['<Ctrl-K>']),
         ('rl-kill-word', ['<Alt-D>']),
-        ('rl-unix-word-rubout', ['<Ctrl-W>']),
+        ('rl-unix-word-rubout', ['<Ctrl-W>', '<Alt-Backspace>']),
         ('rl-yank', ['<Ctrl-Y>']),
         ('rl-delete-char', ['<Ctrl-?>']),
         ('rl-backward-delete-char', ['<Ctrl-H>']),
     ])),
+
+    ('caret', collections.OrderedDict([
+        ('toggle-selection', ['v', '<Space>']),
+        ('drop-selection', ['<Ctrl-Space>']),
+        ('enter-mode normal', ['c']),
+        ('move-to-next-line', ['j']),
+        ('move-to-prev-line', ['k']),
+        ('move-to-next-char', ['l']),
+        ('move-to-prev-char', ['h']),
+        ('move-to-end-of-word', ['e']),
+        ('move-to-next-word', ['w']),
+        ('move-to-prev-word', ['b']),
+        ('move-to-start-of-next-block', [']']),
+        ('move-to-start-of-prev-block', ['[']),
+        ('move-to-end-of-next-block', ['}']),
+        ('move-to-end-of-prev-block', ['{']),
+        ('move-to-start-of-line', ['0']),
+        ('move-to-end-of-line', ['$']),
+        ('move-to-start-of-document', ['gg']),
+        ('move-to-end-of-document', ['G']),
+        ('yank-selected -p', ['Y']),
+        ('yank-selected', ['y'] + RETURN_KEYS),
+        ('scroll left', ['H']),
+        ('scroll down', ['J']),
+        ('scroll up', ['K']),
+        ('scroll right', ['L']),
+    ])),
 ])
 
 
@@ -1254,10 +1570,27 @@ KEY_DATA = collections.OrderedDict([
 
 CHANGED_KEY_COMMANDS = [
     (re.compile(r'^open -([twb]) about:blank$'), r'open -\1'),
+
     (re.compile(r'^download-page$'), r'download'),
     (re.compile(r'^cancel-download$'), r'download-cancel'),
-    (re.compile(r'^search ""$'), r'search'),
-    (re.compile(r"^search ''$"), r'search'),
+
+    (re.compile(r"""^search (''|"")$"""), r'clear-keychain ;; search'),
+    (re.compile(r'^search$'), r'clear-keychain ;; search'),
+
     (re.compile(r"""^set-cmd-text ['"](.*) ['"]$"""), r'set-cmd-text -s \1'),
     (re.compile(r"""^set-cmd-text ['"](.*)['"]$"""), r'set-cmd-text \1'),
+
+    (re.compile(r"^hint links rapid$"), r'hint --rapid links tab-bg'),
+    (re.compile(r"^hint links rapid-win$"), r'hint --rapid links window'),
+
+    (re.compile(r'^scroll -50 0$'), r'scroll left'),
+    (re.compile(r'^scroll 0 50$'), r'scroll down'),
+    (re.compile(r'^scroll 0 -50$'), r'scroll up'),
+    (re.compile(r'^scroll 50 0$'), r'scroll right'),
+    (re.compile(r'^scroll ([-\d]+ [-\d]+)$'), r'scroll-px \1'),
+
+    (re.compile(r'^search *;; *clear-keychain$'), r'clear-keychain ;; search'),
+    (re.compile(r'^leave-mode$'), r'clear-keychain ;; leave-mode'),
+
+    (re.compile(r'^download-remove --all$'), r'download-clear'),
 ]

qutebrowser/config/configexc.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -57,7 +57,7 @@ class NoOptionError(Error):
     """Raised when an option was not found."""
 
     def __init__(self, option, section):
-        super().__init__("No option {!r} in section: {!r}".format(
+        super().__init__("No option {!r} in section {!r}".format(
             option, section))
         self.option = option
         self.section = section

qutebrowser/config/parsers/__init__.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

qutebrowser/config/parsers/ini.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -47,11 +47,15 @@ class ReadConfigParser(configparser.ConfigParser):
         self.optionxform = lambda opt: opt  # be case-insensitive
         self._configdir = configdir
         self._fname = fname
+        if self._configdir is None:
+            self._configfile = None
+            return
         self._configfile = os.path.join(self._configdir, fname)
         if not os.path.isfile(self._configfile):
             return
         log.init.debug("Reading config from {}".format(self._configfile))
-        self.read(self._configfile, encoding='utf-8')
+        if self._configfile is not None:
+            self.read(self._configfile, encoding='utf-8')
 
     def __repr__(self):
         return utils.get_repr(self, constructor=True,
@@ -64,6 +68,8 @@ class ReadWriteConfigParser(ReadConfigParser):
 
     def save(self):
         """Save the config file."""
+        if self._configdir is None:
+            return
         if not os.path.exists(self._configdir):
             os.makedirs(self._configdir, 0o755)
         log.destroy.debug("Saving config to {}".format(self._configfile))

qutebrowser/config/parsers/keyconf.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -75,12 +75,13 @@ class KeyConfigParser(QObject):
     config_dirty = pyqtSignal()
     UNBOUND_COMMAND = '<unbound>'
 
-    def __init__(self, configdir, fname, parent=None):
+    def __init__(self, configdir, fname, relaxed=False, parent=None):
         """Constructor.
 
         Args:
             configdir: The directory to save the configs in.
             fname: The filename of the config.
+            relaxed: If given, unknown commands are ignored.
         """
         super().__init__(parent)
         self.is_dirty = False
@@ -95,7 +96,7 @@ class KeyConfigParser(QObject):
         if self._configfile is None or not os.path.exists(self._configfile):
             self._load_default()
         else:
-            self._read()
+            self._read(relaxed)
             self._load_default(only_new=True)
         log.init.debug("Loaded bindings: {}".format(self.keybindings))
 
@@ -236,36 +237,51 @@ class KeyConfigParser(QObject):
             only_new: If set, only keybindings which are completely unused
                       (same command/key not bound) are added.
         """
+        # {'sectname': {'keychain1': 'command', 'keychain2': 'command'}, ...}
+        bindings_to_add = collections.OrderedDict()
+
         for sectname, sect in configdata.KEY_DATA.items():
             sectname = self._normalize_sectname(sectname)
+            bindings_to_add[sectname] = collections.OrderedDict()
+            for command, keychains in sect.items():
+                for e in keychains:
+                    if not only_new or self._is_new(sectname, command, e):
+                        assert e not in bindings_to_add[sectname]
+                        bindings_to_add[sectname][e] = command
+
+        for sectname, sect in bindings_to_add.items():
             if not sect:
                 if not only_new:
                     self.keybindings[sectname] = collections.OrderedDict()
-                    self._mark_config_dirty()
             else:
-                for command, keychains in sect.items():
-                    for e in keychains:
-                        if not only_new or self._is_new(sectname, command, e):
-                            self._add_binding(sectname, e, command)
-                            self._mark_config_dirty()
+                for keychain, command in sect.items():
+                    self._add_binding(sectname, keychain, command)
             self.changed.emit(sectname)
 
+        if bindings_to_add:
+            self._mark_config_dirty()
+
     def _is_new(self, sectname, command, keychain):
         """Check if a given binding is new.
 
         A binding is considered new if both the command is not bound to any key
         yet, and the key isn't used anywhere else in the same section.
         """
-        bindings = self.keybindings[sectname]
+        try:
+            bindings = self.keybindings[sectname]
+        except KeyError:
+            return True
         if keychain in bindings:
             return False
-        elif command in bindings.values():
-            return False
         else:
-            return True
+            return command not in bindings.values()
 
-    def _read(self):
-        """Read the config file from disk and parse it."""
+    def _read(self, relaxed=False):
+        """Read the config file from disk and parse it.
+
+        Args:
+            relaxed: Ignore unknown commands.
+        """
         try:
             with open(self._configfile, 'r', encoding='utf-8') as f:
                 for i, line in enumerate(f):
@@ -284,8 +300,11 @@ class KeyConfigParser(QObject):
                             line = line.strip()
                             self._read_command(line)
                     except KeyConfigError as e:
-                        e.lineno = i
-                        raise
+                        if relaxed:
+                            continue
+                        else:
+                            e.lineno = i
+                            raise
         except OSError:
             log.keyboard.exception("Failed to read key bindings!")
         for sectname in self.keybindings:
@@ -343,7 +362,7 @@ class KeyConfigParser(QObject):
 
     def _add_binding(self, sectname, keychain, command, *, force=False):
         """Add a new binding from keychain to command in section sectname."""
-        log.keyboard.debug("Adding binding {} -> {} in mode {}.".format(
+        log.keyboard.vdebug("Adding binding {} -> {} in mode {}.".format(
             keychain, command, sectname))
         if sectname not in self.keybindings:
             self.keybindings[sectname] = collections.OrderedDict()

qutebrowser/config/sections.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -72,6 +72,10 @@ class Section:
         """Get value keys."""
         return self.values.keys()
 
+    def delete(self, key):
+        """Delete item with given key."""
+        del self.values[key]
+
     def setv(self, layer, key, value, interpolated):
         """Set the value on a layer.
 

qutebrowser/config/style.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -20,6 +20,7 @@
 """Utilities related to the look&feel of qutebrowser."""
 
 import functools
+import collections
 
 import jinja2
 import sip
@@ -40,9 +41,8 @@ def get_stylesheet(template_str):
         The formatted template as string.
     """
     colordict = ColorDict(config.section('colors'))
-    fontdict = FontDict(config.section('fonts'))
     template = jinja2.Template(template_str)
-    return template.render(color=colordict, font=fontdict,
+    return template.render(color=colordict, font=config.section('fonts'),
                            config=objreg.get('config'))
 
 
@@ -69,7 +69,7 @@ def update_stylesheet(obj):
         obj.setStyleSheet(get_stylesheet(obj.STYLESHEET))
 
 
-class ColorDict(dict):
+class ColorDict(collections.UserDict):
 
     """A dict aimed at Qt stylesheet colors."""
 
@@ -83,48 +83,17 @@ class ColorDict(dict):
             If a value wasn't found, return an empty string.
             (Color not defined, so no output in the stylesheet)
 
-            If the key has a .fg. element in it, return  color: X;.
-            If the key has a .bg. element in it, return  background-color: X;.
-
-            In all other cases, return the plain value.
+            else, return the plain value.
         """
         try:
-            val = super().__getitem__(key)
+            val = self.data[key]
         except KeyError:
-            log.config.exception("No color defined for {}!")
+            log.config.exception("No color defined for {}!".format(key))
             return ''
         if isinstance(val, QColor):
             # This could happen when accidentally declaring something as
             # QtColor instead of Color in the config, and it'd go unnoticed as
             # the CSS is invalid then.
             raise TypeError("QColor passed to ColorDict!")
-        if 'fg' in key.split('.'):
-            return 'color: {};'.format(val)
-        elif 'bg' in key.split('.'):
-            return 'background-color: {};'.format(val)
         else:
             return val
-
-
-class FontDict(dict):
-
-    """A dict aimed at Qt stylesheet fonts."""
-
-    def __getitem__(self, key):
-        """Override dict __getitem__.
-
-        Args:
-            key: The key to get from the dict.
-
-        Return:
-            If a value wasn't found, return an empty string.
-            (Color not defined, so no output in the stylesheet)
-
-            In all other cases, return font: <value>.
-        """
-        try:
-            val = super().__getitem__(key)
-        except KeyError:
-            return ''
-        else:
-            return 'font: {};'.format(val)

qutebrowser/config/textwrapper.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -26,7 +26,7 @@ class TextWrapper(textwrap.TextWrapper):
 
     """Text wrapper customized to be used in configs."""
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         kw = {
             'width': 72,
             'replace_whitespace': False,
@@ -36,4 +36,4 @@ class TextWrapper(textwrap.TextWrapper):
             'subsequent_indent': '# ',
         }
         kw.update(kwargs)
-        super().__init__(*args, **kw)
+        super().__init__(**kw)

qutebrowser/config/value.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -78,9 +78,7 @@ class SettingValue:
         for val in d.values():
             if val is not None:
                 return val
-        else:  # pylint: disable=useless-else-on-loop
-            # https://bitbucket.org/logilab/pylint/issue/489/
-            raise ValueError("No valid config value found!")
+        raise ValueError("No valid config value found!")
 
     def transformed(self):
         """Get the transformed value."""

qutebrowser/config/websettings.py

@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -84,8 +84,8 @@ class Base:
             qws: The QWebSettings instance to use, or None to use the global
                  instance.
         """
-        log.config.vdebug("Restoring default {!r}.".format(self._default))
         if self._default is not UNSET:
+            log.config.vdebug("Restoring default {!r}.".format(self._default))
             self._set(self._default, qws=qws)
 
     def get(self, qws=None):
@@ -238,6 +238,25 @@ class GlobalSetter(Setter):
         self._setter(*args)
 
 
+class CookiePolicy(Base):
+
+    """The ThirdPartyCookiePolicy setting is different from other settings."""
+
+    MAPPING = {
+        'all': QWebSettings.AlwaysAllowThirdPartyCookies,
+        'no-3rdparty': QWebSettings.AlwaysBlockThirdPartyCookies,
+        'never': QWebSettings.AlwaysBlockThirdPartyCookies,
+        'no-unknown-3rdparty': QWebSettings.AllowThirdPartyWithExistingCookies,
+    }
+
+    def get(self, qws=None):
+        return config.get('content', 'cookies-accept')
+
+    def _set(self, value, qws=None):
+        QWebSettings.globalSettings().setThirdPartyCookiePolicy(
+            self.MAPPING[value])
+
+
 MAPPINGS = {
     'content': {
         'allow-images':
@@ -254,10 +273,18 @@ MAPPINGS = {
         #   Attribute(QWebSettings.JavaEnabled),
         'allow-plugins':
             Attribute(QWebSettings.PluginsEnabled),
+        'webgl':
+            Attribute(QWebSettings.WebGLEnabled),
+        'css-regions':
+            Attribute(QWebSettings.CSSRegionsEnabled),
+        'hyperlink-auditing':
+            Attribute(QWebSettings.HyperlinkAuditingEnabled),
         'local-content-can-access-remote-urls':
             Attribute(QWebSettings.LocalContentCanAccessRemoteUrls),
         'local-content-can-access-file-urls':
             Attribute(QWebSettings.LocalContentCanAccessFileUrls),
+        'cookies-accept':
+            CookiePolicy(),
     },
     'network': {
         'dns-prefetch':
@@ -322,6 +349,8 @@ MAPPINGS = {
         'css-media-type':
             NullStringSetter(getter=QWebSettings.cssMediaType,
                              setter=QWebSettings.setCSSMediaType),
+        'smooth-scrolling':
+            Attribute(QWebSettings.ScrollAnimatorEnabled),
         #'accelerated-compositing':
         #   Attribute(QWebSettings.AcceleratedCompositingEnabled),
         #'tiled-backing-store':
@@ -369,16 +398,20 @@ MAPPINGS = {
 
 def init():
     """Initialize the global QWebSettings."""
-    if config.get('general', 'private-browsing'):
+    cache_path = standarddir.cache()
+    data_path = standarddir.data()
+    if config.get('general', 'private-browsing') or cache_path is None:
         QWebSettings.setIconDatabasePath('')
     else:
-        QWebSettings.setIconDatabasePath(standarddir.cache())
-    QWebSettings.setOfflineWebApplicationCachePath(
-        os.path.join(standarddir.cache(), 'application-cache'))
-    QWebSettings.globalSettings().setLocalStoragePath(
-        os.path.join(standarddir.data(), 'local-storage'))
-    QWebSettings.setOfflineStoragePath(
-        os.path.join(standarddir.data(), 'offline-storage'))
+        QWebSettings.setIconDatabasePath(cache_path)
+    if cache_path is not None:
+        QWebSettings.setOfflineWebApplicationCachePath(
+            os.path.join(cache_path, 'application-cache'))
+    if data_path is not None:
+        QWebSettings.globalSettings().setLocalStoragePath(
+            os.path.join(data_path, 'local-storage'))
+        QWebSettings.setOfflineStoragePath(
+            os.path.join(data_path, 'offline-storage'))
 
     for sectname, section in MAPPINGS.items():
         for optname, mapping in section.items():
@@ -394,11 +427,12 @@ def init():
 
 def update_settings(section, option):
     """Update global settings when qwebsettings changed."""
+    cache_path = standarddir.cache()
     if (section, option) == ('general', 'private-browsing'):
-        if config.get('general', 'private-browsing'):
+        if config.get('general', 'private-browsing') or cache_path is None:
             QWebSettings.setIconDatabasePath('')
         else:
-            QWebSettings.setIconDatabasePath(standarddir.cache())
+            QWebSettings.setIconDatabasePath(cache_path)
     else:
         try:
             mapping = MAPPINGS[section][option]

qutebrowser/html/dirbrowser.html

@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% block style %}
+{{ super() }}
+#dirbrowserContainer {
+    background: #fff;
+    min-width: 35em;
+    max-width: 35em;
+    position: absolute;
+    top: 2em;
+    left: 1em;
+    padding: 10px;
+    border: 2px solid #eee;
+    -webkit-border-radius: 5px;
+}
+
+#dirbrowserTitleText {
+    font-size: 118%;
+    font-weight: bold;
+}
+
+ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+ul > li {
+    background-repeat: no-repeat;
+    background-size: 22px;
+    line-height: 22px;
+    padding-left: 25px;
+}
+
+ul > li {
+    background-image: url('{{ resource_url('img/folder.svg') }}');
+}
+
+ul.files > li {
+    background-image: url('{{ resource_url('img/file.svg') }}');
+}
+{% endblock %}
+
+{% block content %}
+    <div id="dirbrowserContainer">
+        <div id="dirbrowserTitle">
+            <p id="dirbrowserTitleText">Browse directory: {{url}}</p>
+        </div>
+
+        {% if parent %}
+            <ul class="parent">
+                <li><a href="{{parent}}">..</a></li>
+            </ul>
+        {% endif %}
+
+        <ul class="folders">
+            {% for item in directories %}
+                <li><a href="file://{{item.absname}}">{{item.name}}</a></li>
+            {% endfor %}
+        </ul>
+
+        <ul class="files">
+            {% for item in files %}
+                <li><a href="file://{{item.absname}}">{{item.name}}</a></li>
+            {% endfor %}
+        </ul>
+    </div>
+{% endblock %}

qutebrowser/html/error.html

@@ -1,25 +1,59 @@
 {% extends "base.html" %}
 {% block style %}
 {{ super() }}
-#errorContainer {
-    background: #fff;
-    min-width: 35em;
-    max-width: 35em;
-    position: absolute;
-    top: 2em;
-    left: 1em;
-    padding: 10px;
-    border: 2px solid #eee;
-    -webkit-border-radius: 5px;
+* {
+	margin: 0px 0px;
+	padding: 0px 0px;
 }
 
-#errorTitleText {
-    font-size: 118%;
-    font-weight: bold;
+body {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	-webkit-text-size-adjust: none;
+	color: #333333;
+	background-color: #EEEEEE;
+	font-size: 1.2em;
 }
 
-#errorMessageText {
-    font-size: 80%;
+#error-container {
+	margin-left: 20px;
+	margin-right: 20px;
+	margin-top: 20px;
+	border: 1px solid #CCCCCC;
+	box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.20);
+	border-radius: 5px;
+	background-color: #FFFFFF;
+	padding: 20px 20px;
+}
+
+#header {
+	border-bottom: 1px solid #CCC;
+}
+
+.qutebrowser-broken {
+	display: block;
+	width: 100%;
+}
+
+td {
+	margin-top: 20px;
+	color: #555;
+}
+
+h1 {
+	font-weight: normal;
+	color: #1e89c6;
+	margin-bottom: 10px;
+}
+
+ul {
+	margin-left: 20px;
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+li {
+	margin-top: 10px;
+	margin-bottom: 10px;
 }
 {% endblock %}
 
@@ -35,19 +69,22 @@ function searchFor(uri) {
 {% endblock %}
 
 {% block content %}
-<div id="errorContainer">
-    <div id="errorTitle">
-        <p id="errorTitleText">Unable to load page</p>
-    </div>
-    <div id="errorMessage">
-        <p>Problem occurred while loading the URL {{ url }}</p>
-        <p id="errorMessageText">{{ error }}</p>
-    </p>
-    </div>
-
-    <form name="bl">
-        <input type="button" value="Try again" onclick="javascript:tryagain()" />
-        <!--<input type="button" value="Search" style="visibility:%s" onclick="javascript:searchFor('%s')" />-->
-    </form>
+<div id="error-container">
+	<table>
+		<tr>
+			<td style="width: 10%; vertical-align: top;">
+				<img style="width: 100%; display: block; max-width: 256px;" src="{{ resource_url('img/broken_qutebrowser_logo.png') }}" />
+			</td>
+			<td style="padding-left: 40px;">
+				<h1>Unable to load page</h1>
+				Error while opening {{ url }}: <br>
+				<p id="error-message-text" style="color: #a31a1a;">{{ error }}</p><br><br>
+				
+				<form name="bl">
+					<input type="button" value="Try again" onclick="javascript:tryagain()" />
+				</form>
+			</td>
+		</tr>
+	</table>
 </div>
 {% endblock %}

qutebrowser/html/no_pdfjs.html

@@ -0,0 +1,129 @@
+{% extends "base.html" %}
+{% block style %}
+{{ super() }}
+* {
+  margin: 0px 0px;
+  padding: 0px 0px;
+}
+
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  -webkit-text-size-adjust: none;
+  color: #333333;
+  background-color: #EEEEEE;
+  font-size: 1.2em;
+}
+
+#error-container {
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 20px;
+  border: 1px solid #CCCCCC;
+  box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.20);
+  border-radius: 5px;
+  background-color: #FFFFFF;
+  padding: 20px 20px;
+}
+
+#header {
+  border-bottom: 1px solid #CCC;
+}
+
+.qutebrowser-broken {
+  display: block;
+  width: 100%;
+}
+
+span.warning {
+  text-weigth: bold;
+  color: red;
+}
+
+td {
+  margin-top: 20px;
+  color: #555;
+}
+
+h1, h2 {
+  font-weight: normal;
+  color: #1e89c6;
+  margin-bottom: 10px;
+}
+
+ul {
+  margin-left: 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+
+li {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+{% endblock %}
+
+{% block content %}
+<div id="error-container">
+  <table>
+    <tr>
+      <td style="width: 10%; vertical-align: top;">
+        <img style="width: 100%; display: block; max-width: 256px;" src="{{ resource_url('img/broken_qutebrowser_logo.png') }}" />
+      </td>
+      <td style="padding-left: 40px;">
+        <h1>No pdf.js installation found</h1>
+        <p>Error while opening {{ url }}: <br>
+        <p id="error-message-text" style="color: #a31a1a;">qutebrowser can't find a suitable pdf.js installation</p></p>
+
+        <p>It looks like you set <code>content -> enable-pdfjs</code>
+          to <em>true</em> but qutebrowser can't find the required files.</p>
+
+        <br>
+
+        <h2>Possible fixes</h2>
+        <ul>
+          <li>
+            Disable <code>content -> enable-pdfjs</code> and reload the page.
+            You will need to download the pdf-file and open it with an external
+            tool instead.
+          </li>
+
+          <li>
+            If you have installed a packaged version of qutebrowser, make sure
+            the required packages for pdf.js are also installed.
+          </li>
+
+          <li>
+            If you have installed a pdf.js package and qutebrowser still can't
+            find it, please send us a report with your system and the package
+            name, so we can add it to the list of supported packages.
+          </li>
+
+          <li>
+            If you're running a self-built version or the source version, make
+            sure you have pdf.js in <code>qutebrowser/3rdparty/pdfjs</code>.
+            You can use the <code>scripts/dev/update_3rdparty.py</code> script
+            to download the latest version.
+          </li>
+
+          <li>
+            You can manually download the pdf.js archive
+            <a href="https://mozilla.github.io/pdf.js/getting_started/#download">here</a>
+            and extract it to <code>~/.local/share/qutebrowser/pdfjs</code>
+            <br>
+            <span class="warning">Warning:</span> Using this method you are
+            responsible for yourself to keep the installation updated! If a
+            vulnerability is found in pdf.js, neither qutebrowser nor your
+            system's package manager will update your pdf.js installation.
+            Use it at your own risk!
+          </li>
+        </ul>
+
+        <p>
+          If none of these fixes work for you, please send us a bug report so
+          we can fix the issue.
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+{% endblock %}

qutebrowser/html/settings.html

@@ -14,10 +14,12 @@ pre { margin: 2px; }
 th, td { border: 1px solid grey; padding: 0px 5px; }
 th { background: lightgrey; }
 th pre { color: grey; text-align: left; }
+.noscript, .noscript-text { color:red; }
+.noscript-text { margin-bottom: 5cm; }
 {% endblock %}
 
 {% block content %}
-<noscript><h1>View Only</h1><p>Changing settings requires javascript to be enabled</p></noscript>
+<noscript><h1 class="noscript">View Only</h1><p class="noscript-text">Changing settings requires javascript to be enabled!</p></noscript>
 <header><h1>{{ title }}</h1></header>
 <table>
 {% for section in config.DATA %}

qutebrowser/html/version.html

@@ -21,6 +21,6 @@ GNU General Public License for more details.
 <p>
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <a href="http://www.gnu.org/licenses/">
-http://www.gnu.org/licenses/</a> or open <a href="qute:gpl">qute:gpl</a>.
+http://www.gnu.org/licenses/</a> or open <a href="qute://gpl">qute://gpl</a>.
 </p>
 {% endblock %}

qutebrowser/img/file.svg

@@ -0,0 +1,548 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="240.00000"
+   inkscape:export-xdpi="240.00000"
+   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+   sodipodi:docname="text-x-generic.svg"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/mimetypes"
+   inkscape:version="0.46"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective78" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4542">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4544" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4546" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       id="aigrd3"
+       cx="20.8921"
+       cy="64.5679"
+       r="5.257"
+       fx="20.8921"
+       fy="64.5679"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15573" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15575" />
+    </radialGradient>
+    <radialGradient
+       id="aigrd2"
+       cx="20.8921"
+       cy="114.5684"
+       r="5.256"
+       fx="20.8921"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15566" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15568" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1.0000000"
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       r="5.256"
+       fy="114.5684"
+       fx="20.8921"
+       cy="114.5684"
+       cx="20.8921"
+       gradientTransform="matrix(0.229703,0.000000,0.000000,0.229703,4.613529,3.979808)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2283"
+       xlink:href="#aigrd2"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5.257"
+       fy="64.5679"
+       fx="20.8921"
+       cy="64.5679"
+       cx="20.8921"
+       gradientTransform="matrix(0.229703,0.000000,0.000000,0.229703,4.613529,3.979808)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2285"
+       xlink:href="#aigrd3"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4542"
+       id="radialGradient4548"
+       cx="24.306795"
+       cy="42.07798"
+       fx="24.306795"
+       fy="42.07798"
+       r="15.821514"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="160"
+     inkscape:window-x="343"
+     inkscape:window-height="688"
+     inkscape:window-width="872"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer6"
+     inkscape:cy="24.318443"
+     inkscape:cx="25.938708"
+     inkscape:zoom="5.6568542"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Generic Text</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>text</rdf:li>
+            <rdf:li>plaintext</rdf:li>
+            <rdf:li>regular</rdf:li>
+            <rdf:li>document</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       transform="matrix(2.105461e-2,0,0,2.086758e-2,42.85172,41.1536)"
+       id="g6707">
+      <rect
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect6709"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" />
+      <path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         id="path6711"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6713"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <rect
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       id="rect15391"
+       width="34.875000"
+       height="40.920494"
+       x="6.6035528"
+       y="3.6464462"
+       ry="1.1490486" />
+    <rect
+       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       id="rect15660"
+       width="32.775887"
+       height="38.946384"
+       x="7.6660538"
+       y="4.5839462"
+       ry="0.14904857"
+       rx="0.14904857" />
+    <g
+       transform="translate(0.646447,-3.798933e-2)"
+       id="g2270">
+      <g
+         id="g1440"
+         style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4.0000000"
+         transform="matrix(0.229703,0.000000,0.000000,0.229703,4.967081,4.244972)">
+        <radialGradient
+           id="radialGradient1442"
+           cx="20.892099"
+           cy="114.56840"
+           r="5.2560000"
+           fx="20.892099"
+           fy="114.56840"
+           gradientUnits="userSpaceOnUse">
+          <stop
+             offset="0"
+             style="stop-color:#F0F0F0"
+             id="stop1444" />
+          <stop
+             offset="1"
+             style="stop-color:#474747"
+             id="stop1446" />
+        </radialGradient>
+        <path
+           style="stroke:none"
+           d="M 23.428000,113.07000 C 23.428000,115.04300 21.828000,116.64200 19.855000,116.64200 C 17.881000,116.64200 16.282000,115.04200 16.282000,113.07000 C 16.282000,111.09600 17.882000,109.49700 19.855000,109.49700 C 21.828000,109.49700 23.428000,111.09700 23.428000,113.07000 z "
+           id="path1448" />
+        <radialGradient
+           id="radialGradient1450"
+           cx="20.892099"
+           cy="64.567902"
+           r="5.2570000"
+           fx="20.892099"
+           fy="64.567902"
+           gradientUnits="userSpaceOnUse">
+          <stop
+             offset="0"
+             style="stop-color:#F0F0F0"
+             id="stop1452" />
+          <stop
+             offset="1"
+             style="stop-color:#474747"
+             id="stop1454" />
+        </radialGradient>
+        <path
+           style="stroke:none"
+           d="M 23.428000,63.070000 C 23.428000,65.043000 21.828000,66.643000 19.855000,66.643000 C 17.881000,66.643000 16.282000,65.043000 16.282000,63.070000 C 16.282000,61.096000 17.882000,59.497000 19.855000,59.497000 C 21.828000,59.497000 23.428000,61.097000 23.428000,63.070000 z "
+           id="path1456" />
+      </g>
+      <path
+         style="fill:url(#radialGradient2283);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
+         d="M 9.9950109,29.952326 C 9.9950109,30.405530 9.6274861,30.772825 9.1742821,30.772825 C 8.7208483,30.772825 8.3535532,30.405301 8.3535532,29.952326 C 8.3535532,29.498892 8.7210780,29.131597 9.1742821,29.131597 C 9.6274861,29.131597 9.9950109,29.499122 9.9950109,29.952326 z "
+         id="path15570" />
+      <path
+         style="fill:url(#radialGradient2285);fill-rule:nonzero;stroke:none;stroke-miterlimit:4.0000000"
+         d="M 9.9950109,18.467176 C 9.9950109,18.920380 9.6274861,19.287905 9.1742821,19.287905 C 8.7208483,19.287905 8.3535532,18.920380 8.3535532,18.467176 C 8.3535532,18.013742 8.7210780,17.646447 9.1742821,17.646447 C 9.6274861,17.646447 9.9950109,18.013972 9.9950109,18.467176 z "
+         id="path15577" />
+    </g>
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
+       d="M 11.505723,5.4942766 L 11.505723,43.400869"
+       id="path15672"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
+       d="M 12.500000,5.0205154 L 12.500000,43.038228"
+       id="path15674"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       transform="matrix(0.909091,0.000000,0.000000,1.000000,2.363628,0.000000)"
+       id="g2253">
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15686"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="9.0000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15688"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="11.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15690"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="13.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15692"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="15.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15694"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="17.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15696"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="19.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15698"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="21.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15700"
+         width="22.000004"
+         height="1.0000000"
+         x="15.000002"
+         y="23.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15732"
+         width="9.9000053"
+         height="1.0000000"
+         x="14.999992"
+         y="25.000000"
+         rx="0.068204239"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15736"
+         width="22.000004"
+         height="1.0000000"
+         x="14.999992"
+         y="29.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15738"
+         width="22.000004"
+         height="1.0000000"
+         x="14.999992"
+         y="31.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15740"
+         width="22.000004"
+         height="1.0000000"
+         x="14.999992"
+         y="33.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15742"
+         width="22.000004"
+         height="1.0000000"
+         x="14.999992"
+         y="35.000000"
+         rx="0.15156493"
+         ry="0.065390877" />
+      <rect
+         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+         id="rect15744"
+         width="15.400014"
+         height="1.0000000"
+         x="14.999992"
+         y="37.000000"
+         rx="0.10609552"
+         ry="0.065390877" />
+    </g>
+  </g>
+</svg>

qutebrowser/img/folder.svg

@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48.000000px"
+   height="48.000000px"
+   id="svg97"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/places"
+   sodipodi:docname="folder.svg"
+   inkscape:export-filename="/home/jimmac/Desktop/horlander-style3.png"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-ydpi="90.000000"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective68" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9806">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop9808" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop9810" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9766">
+      <stop
+         style="stop-color:#6194cb;stop-opacity:1;"
+         offset="0"
+         id="stop9768" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop9770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3096">
+      <stop
+         id="stop3098"
+         offset="0"
+         style="stop-color:#424242;stop-opacity:1;" />
+      <stop
+         id="stop3100"
+         offset="1.0000000"
+         style="stop-color:#777777;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient319"
+       inkscape:collect="always">
+      <stop
+         id="stop320"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop321"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1789">
+      <stop
+         style="stop-color:#202020;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop1790" />
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop1791" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1789"
+       id="radialGradient238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.055022,-2.734504e-2,0.177703,1.190929,-3.572177,-7.125301)"
+       cx="20.706017"
+       cy="37.517986"
+       fx="20.706017"
+       fy="37.517986"
+       r="30.905205" />
+    <linearGradient
+       id="linearGradient3983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.87628865;"
+         offset="0.0000000"
+         id="stop3984" />
+      <stop
+         style="stop-color:#fffffe;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop3985" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3983"
+       id="linearGradient491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.516844,0.000000,0.000000,0.708978,-0.879573,-1.318166)"
+       x1="6.2297964"
+       y1="13.773066"
+       x2="9.8980894"
+       y2="66.834053" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="46.689312"
+       x2="12.853771"
+       y1="32.567184"
+       x1="13.035696"
+       gradientTransform="matrix(1.317489,0.000000,0.000000,0.816256,-0.879573,-1.318166)"
+       id="linearGradient322"
+       xlink:href="#linearGradient319"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="6.1802502"
+       x2="15.514889"
+       y1="31.367750"
+       x1="18.112709"
+       id="linearGradient3104"
+       xlink:href="#linearGradient3096"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9766"
+       id="linearGradient9772"
+       x1="22.175976"
+       y1="36.987999"
+       x2="22.065331"
+       y2="32.050499"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9806"
+       id="radialGradient9812"
+       cx="24.35099"
+       cy="41.591846"
+       fx="24.35099"
+       fy="41.591846"
+       r="19.136078"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.242494,1.565588e-16,31.50606)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     fill="#729fcf"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.10196078"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="54.359127"
+     inkscape:cy="-13.803699"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1026"
+     inkscape:window-height="818"
+     inkscape:window-x="169"
+     inkscape:window-y="30"
+     inkscape:showpageshadow="false"
+     stroke="#3465a4" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Folder Icon</dc:title>
+        <dc:date />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>folder</rdf:li>
+            <rdf:li>directory</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Folder"
+     inkscape:groupmode="layer">
+    <g
+       style="display:inline"
+       transform="matrix(2.262383e-2,0,0,2.086758e-2,43.38343,36.36962)"
+       id="g6707">
+      <rect
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect6709"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" />
+      <path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         id="path6711"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6713"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       d="M 4.5217805,38.687417 C 4.5435766,39.103721 4.9816854,39.520026 5.3979900,39.520026 L 36.725011,39.520026 C 37.141313,39.520026 37.535823,39.103721 37.514027,38.687417 L 36.577584,11.460682 C 36.555788,11.044379 36.117687,10.628066 35.701383,10.628066 L 22.430510,10.628066 C 21.945453,10.628066 21.196037,10.312477 21.028866,9.5214338 L 20.417475,6.6283628 C 20.262006,5.8926895 19.535261,5.5904766 19.118957,5.5904766 L 4.3400975,5.5904766 C 3.9237847,5.5904766 3.5292767,6.0067807 3.5510726,6.4230849 L 4.5217805,38.687417 z "
+       id="path216"
+       style="fill:url(#radialGradient238);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient3104);stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       sodipodi:nodetypes="ccccccssssccc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9788"
+       d="M 5.2265927,22.5625 L 35.492173,22.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9784"
+       d="M 5.0421736,18.5625 L 35.489104,18.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 4.9806965,12.5625 L 35.488057,12.5625"
+       id="path9778"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.3861577,32.5625 L 35.494881,32.5625"
+       id="path9798"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9800"
+       d="M 5.5091398,34.5625 L 35.496893,34.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.0421736,16.5625 L 35.489104,16.5625"
+       id="path9782"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9780"
+       d="M 5.0114345,14.5625 L 35.48858,14.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9776"
+       d="M 4.9220969,10.5625 L 20.202912,10.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 4.8737534,8.5624999 L 19.657487,8.5624999"
+       id="path9774"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.3246666,28.5625 L 35.493876,28.5625"
+       id="path9794"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9792"
+       d="M 5.2880638,26.5625 L 35.493184,26.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.2265927,24.5625 L 35.492173,24.5625"
+       id="path9790"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.1958537,20.5625 L 35.491649,20.5625"
+       id="path9786"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path9796"
+       d="M 5.3246666,30.5625 L 35.493876,30.5625"
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.11363633;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 5.5091398,36.5625 L 35.496893,36.5625"
+       id="path9802"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient491);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2138050;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible;opacity:0.45142857"
+       d="M 6.0683430,38.864023 C 6.0846856,39.176251 5.8874317,39.384402 5.5697582,39.280326 L 5.5697582,39.280326 C 5.2520766,39.176251 5.0330270,38.968099 5.0166756,38.655870 L 4.0689560,6.5913839 C 4.0526131,6.2791558 4.2341418,6.0906134 4.5463699,6.0906134 L 18.968420,6.0429196 C 19.280648,6.0429196 19.900363,6.3433923 20.101356,7.3651014 L 20.674845,10.180636 C 20.247791,9.7153790 20.255652,9.7010175 20.037287,9.0239299 L 19.631192,7.7647478 C 19.412142,7.0371009 18.932991,6.9328477 18.620763,6.9328477 L 5.7329889,6.9328477 C 5.4207613,6.9328477 5.2235075,7.1409999 5.2398583,7.4532364 L 6.1778636,38.968099 L 6.0683430,38.864023 z "
+       id="path219"
+       sodipodi:nodetypes="cccccccccscccccc" />
+    <g
+       style="stroke-miterlimit:4.0000000;stroke-width:0.99946535;stroke:none;fill-rule:nonzero;fill-opacity:0.75706214;fill:#ffffff"
+       id="g220"
+       transform="matrix(1.040764,0.000000,5.449252e-2,1.040764,-8.670199,2.670594)"
+       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
+       inkscape:export-xdpi="74.800003"
+       inkscape:export-ydpi="74.800003">
+      <path
+         style="fill-opacity:0.50847459;fill:#ffffff"
+         d="M 42.417183,8.5151772 C 42.422267,8.4180642 42.289022,8.2681890 42.182066,8.2681716 L 29.150665,8.2660527 C 29.150665,8.2660527 30.062379,8.8540072 31.352477,8.8622963 L 42.405974,8.9333167 C 42.417060,8.7215889 42.408695,8.6772845 42.417183,8.5151772 z "
+         id="path221"
+         sodipodi:nodetypes="cscscs" />
+    </g>
+    <path
+       style="color:#000000;fill:url(#linearGradient9772);fill-opacity:1.0;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:block"
+       d="M 39.783532,39.510620 C 40.927426,39.466556 41.746608,38.414321 41.830567,37.189615 C 42.622354,25.640928 43.489927,15.957666 43.489927,15.957666 C 43.562082,15.710182 43.322016,15.462699 43.009787,15.462699 L 8.6386304,15.462699 C 8.6386304,15.462699 6.7883113,37.329591 6.7883113,37.329591 C 6.6737562,38.311657 6.3223038,39.134309 5.2384755,39.513304 L 39.783532,39.510620 z "
+       id="path233"
+       sodipodi:nodetypes="cscccscc"
+       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/gnome-fs-directory.png"
+       inkscape:export-xdpi="74.800003"
+       inkscape:export-ydpi="74.800003" />
+    <path
+       sodipodi:nodetypes="ccsscsc"
+       id="path304"
+       d="M 9.6202444,16.463921 L 42.411343,16.528735 L 40.837297,36.530714 C 40.752975,37.602225 40.386619,37.958929 38.964641,37.958929 C 37.093139,37.958929 10.286673,37.926522 7.569899,37.926522 C 7.8034973,37.605711 7.9036547,36.937899 7.9049953,36.92191 L 9.6202444,16.463921 z "
+       style="opacity:0.46590909;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient322);stroke-width:0.99999970px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path323"
+       d="M 9.6202481,16.223182 L 8.4536014,31.866453 C 8.4536014,31.866453 16.749756,27.718375 27.119949,27.718375 C 37.490142,27.718375 42.675239,16.223182 42.675239,16.223182 L 9.6202481,16.223182 z "
+       style="fill:#ffffff;fill-opacity:0.089285679;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="pattern" />
+</svg>

qutebrowser/javascript/position_caret.js

@@ -0,0 +1,110 @@
+/**
+* Copyright 2015 Artur Shaik <ashaihullin@gmail.com>
+* Copyright 2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+*
+* This file is part of qutebrowser.
+*
+* qutebrowser is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* qutebrowser is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* eslint-disable max-len */
+
+/**
+ * Snippet to position caret at top of the page when caret mode is enabled.
+ * Some code was borrowed from:
+ *
+ * https://github.com/1995eaton/chromium-vim/blob/master/content_scripts/dom.js
+ * https://github.com/1995eaton/chromium-vim/blob/master/content_scripts/visual.js
+ */
+
+/* eslint-enable max-len */
+
+"use strict";
+
+function isElementInViewport(node) {
+    var i;
+    var boundingRect = (node.getClientRects()[0] ||
+            node.getBoundingClientRect());
+    if (boundingRect.width <= 1 && boundingRect.height <= 1) {
+        var rects = node.getClientRects();
+        for (i = 0; i < rects.length; i++) {
+            if (rects[i].width > rects[0].height &&
+                    rects[i].height > rects[0].height) {
+                boundingRect = rects[i];
+            }
+        }
+    }
+    if (boundingRect === undefined) {
+        return null;
+    }
+    if (boundingRect.top > innerHeight || boundingRect.left > innerWidth) {
+        return null;
+    }
+    if (boundingRect.width <= 1 || boundingRect.height <= 1) {
+        var children = node.children;
+        var visibleChildNode = false;
+        var l = children.length;
+        for (i = 0; i < l; ++i) {
+            boundingRect = (children[i].getClientRects()[0] ||
+                            children[i].getBoundingClientRect());
+            if (boundingRect.width > 1 && boundingRect.height > 1) {
+                visibleChildNode = true;
+                break;
+            }
+        }
+        if (visibleChildNode === false) {
+            return null;
+        }
+    }
+    if (boundingRect.top + boundingRect.height < 10 ||
+            boundingRect.left + boundingRect.width < -10) {
+        return null;
+    }
+    var computedStyle = window.getComputedStyle(node, null);
+    if (computedStyle.visibility !== 'visible' ||
+            computedStyle.display === 'none' ||
+            node.hasAttribute('disabled') ||
+            parseInt(computedStyle.width, 10) === 0 ||
+            parseInt(computedStyle.height, 10) === 0) {
+        return null;
+    }
+    return boundingRect.top >= -20;
+}
+
+(function() {
+    var walker = document.createTreeWalker(document.body, 4, null);
+    var node;
+    var textNodes = [];
+    var el;
+    while ((node = walker.nextNode())) {
+        if (node.nodeType === 3 && node.data.trim() !== '') {
+            textNodes.push(node);
+        }
+    }
+    for (var i = 0; i < textNodes.length; i++) {
+        var element = textNodes[i].parentElement;
+        if (isElementInViewport(element.parentElement)) {
+            el = element;
+            break;
+        }
+    }
+    if (el !== undefined) {
+        var range = document.createRange();
+        range.setStart(el, 0);
+        range.setEnd(el, 0);
+        var sel = window.getSelection();
+        sel.removeAllRanges();
+        sel.addRange(range);
+    }
+})();