Release v0.7.0

When setting self._orig_url by hand, sometimes on redirects the wrong
URL was picked up.

.appveyor.yml

@@ -4,15 +4,14 @@ cache:
   - C:\projects\qutebrowser\.cache
 build: off
 environment:
-    PYTHON: 'C:\Python34'
     PYTHONUNBUFFERED: 1
+    matrix:
+    - TESTENV: py34
+    - TESTENV: unittests-frozen
+    - TESTENV: pylint
 
 install:
-  - C:\Python27\python -u scripts\dev\ci_install.py
+  - C:\Python27\python -u scripts\dev\ci\appveyor_install.py
 
 test_script:
-  - C:\Python34\Scripts\tox -e py34
-  - C:\Python34\Scripts\tox -e py34-integration
-  - C:\Python34\Scripts\tox -e unittests-frozen
-  - C:\Python34\Scripts\tox -e smoke-frozen
-  - C:\Python34\Scripts\tox -e pylint
+  - C:\Python34\Scripts\tox -e %TESTENV%

.coveragerc

@@ -1,4 +1,5 @@
 [run]
+source = qutebrowser
 branch = true
 omit =
     qutebrowser/__main__.py

.editorconfig

@@ -0,0 +1,17 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+max_line_length = 79
+
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_size = 2
+
+[*.feature]
+max_line_length = 9999
+

.eslintignore

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

.eslintrc

@@ -30,7 +30,7 @@ rules:
     no-unneeded-ternary: 2
     operator-assignment: [2, "always"]
     operator-linebreak: [2, "after"]
-    space-after-keywords: [2, "always"]
+    keyword-spacing: 2
     space-before-blocks: [2, "always"]
     space-before-function-paren: [2, {"anonymous": "never", "named": "never"}]
     object-curly-spacing: [2, "never"]

.flake8

@@ -0,0 +1,58 @@
+[flake8]
+exclude = .venv,.hypothesis,.git,__pycache__,resources.py
+# E128: continuation line under-indented for visual indent
+# E226: missing whitespace around arithmetic operator
+# 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
+# F401: Unused import
+# N802: function name should be lowercase
+# L101: The __init__ method of classes must not have a docstring
+# L102: A docstring was incorrectly formatted.
+# L103: A test docstring must not start with any form of the words "test", ...
+# L201: Container literals must have a trailing comma
+# L202: print is not allowed except for debugging.
+# L203: pdb and compatible modules are not allowed except for debugging.
+# L204: Implicit string literal concatenation is only allowed if every string
+#       being concatenated is parenthesize
+# L207: pass is only necessary in non-optional suites containing no other
+#       statements.
+# L302: The line was too long.
+# P101: format string does contain unindexed parameters
+# P102: docstring does contain unindexed parameters
+# P103: other string does contain unindexed parameters
+# D102: Missing docstring in public method (will be handled by others)
+# D103: Missing docstring in public function (will be handled by others)
+# D104: Missing docstring in public package (will be handled by others)
+# D105: Missing docstring in magic method (will be handled by others)
+# D209: Blank line before closing """ (removed from PEP257)
+# D211: No blank lines allowed before class docstring
+#       (PEP257 got changed, but let's stick to the old standard)
+# D402: First line should not be function's signature (false-positives)
+# H101: Use TODO(NAME)
+# H201: bare except
+# H238: Use new-stule classes
+# H301: one import per line
+# H306: imports not in alphabetical order
+ignore =
+    E128,E226,E265,E501,E402,E266,
+    F401,
+    N802,
+    L101,L102,L103,L201,L202,L203,L204,L207,L302,
+    P101,P102,P103,
+    D102,D103,D104,D105,D209,D211,D402,
+    H101,H201,H238,H301,H306
+min-version = 3.4.0
+max-complexity = 12
+putty-auto-ignore = True
+putty-ignore =
+    /# pylint: disable=invalid-name/ : +N801,N806
+    /# pylint: disable=wildcard-import/ : +F403
+    /# pragma: no mccabe/ : +C901
+    tests/*/test_*.py : +D100,D101,D401
+    tests/unit/browser/http/test_content_disposition.py : +D400
+    scripts/dev/ci/appveyor_install.py : +FI53
+copyright-check = True
+copyright-regexp = # Copyright [\d-]+ .*
+copyright-min-file-size = 110

.gitignore

@@ -1,4 +1,5 @@
 __pycache__
+*.py~
 *.pyc
 *.swp
 /build
@@ -11,6 +12,7 @@ __pycache__
 /setuptools-*.egg
 /setuptools-*.zip
 /qutebrowser/git-commit-id
+/qutebrowser/3rdparty
 /doc/*.html
 /README.html
 /CHANGELOG.html
@@ -21,10 +23,17 @@ __pycache__
 /.venv
 /.coverage
 /htmlcov
-/.coverage.xml
+/coverage.xml
+/.coverage.*
 /.tox
 /testresults.html
 /.cache
 /.testmondata
 /.hypothesis
+/prof
+/venv
 TODO
+/scripts/testbrowser_cpp/Makefile
+/scripts/testbrowser_cpp/main.o
+/scripts/testbrowser_cpp/testbrowser
+/scripts/dev/pylint_checkers/qute_pylint.egg-info

.pydocstylerc

@@ -0,0 +1,13 @@
+[pydocstyle]
+# Disabled checks:
+# D102: Missing docstring in public method (will be handled by others)
+# D103: Missing docstring in public function (will be handled by others)
+# D104: Missing docstring in public package (will be handled by others)
+# D105: Missing docstring in magic method (will be handled by others)
+# D209: Blank line before closing """ (removed from PEP257)
+# D211: No blank lines allowed before class docstring
+#       (PEP257 got changed, but let's stick to the old standard)
+# D402: First line should not be function's signature (false-positives)
+ignore = D102,D103,D104,D105,D209,D211,D402
+match = (?!resources|test_*).*\.py
+inherit = false

.pylintrc

@@ -3,14 +3,14 @@
 [MASTER]
 ignore=resources.py
 extension-pkg-whitelist=PyQt5,sip
-load-plugins=pylint_checkers.config,
-             pylint_checkers.modeline,
-             pylint_checkers.openencoding,
-             pylint_checkers.settrace
+load-plugins=qute_pylint.config,
+             qute_pylint.modeline,
+             qute_pylint.openencoding,
+             qute_pylint.settrace
 
 [MESSAGES CONTROL]
+enable=all
 disable=no-self-use,
-        bad-builtin,
         fixme,
         global-statement,
         locally-disabled,
@@ -23,28 +23,31 @@ disable=no-self-use,
         blacklisted-name,
         too-many-lines,
         logging-format-interpolation,
-        interface-not-implemented,
         broad-except,
         bare-except,
         eval-used,
         exec-used,
-        file-ignored
+        file-ignored,
+        wrong-import-order,
+        ungrouped-imports,
+        redefined-variable-type,
+        suppressed-message,
+        too-many-return-statements
 
 [BASIC]
-module-rgx=(__)?[a-z][a-z0-9_]*(__)?$
-function-rgx=([a-z_][a-z0-9_]{2,50}|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,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=3
+no-docstring-rgx=(^_|^main$)
 
 [FORMAT]
 max-line-length=79
-ignore-long-lines=<?https?://
+ignore-long-lines=(<?https?://|^# Copyright 201\d|# (pylint|flake8): disable=)
+expected-line-ending-format=LF
 
 [SIMILARITIES]
 min-similarity-lines=8
@@ -52,11 +55,16 @@ min-similarity-lines=8
 [VARIABLES]
 dummy-variables-rgx=_.*
 
-[CLASSES]
-defining-attr-methods=__init__,__new__,setUp
-
 [DESIGN]
 max-args=10
 
+[CLASSES]
+valid-metaclass-classmethod-first-arg=cls
+
 [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

@@ -1,33 +1,72 @@
+sudo: required
 dist: trusty
+language: generic
 
-os:
-  - linux
-  - osx
-
-# Not really, but this is here so we can do stuff by hand.
-language: c
+matrix:
+  include:
+    - os: linux
+      env: TESTENV=py34-cov
+    - os: linux
+      env: DOCKER=debian-jessie
+      services: docker
+    - os: linux
+      env: DOCKER=archlinux
+      services: docker
+    - os: linux
+      env: DOCKER=ubuntu-wily
+      services: docker
+    - os: linux
+      env: DOCKER=ubuntu-xenial
+      services: docker
+    - os: osx
+      env: TESTENV=py35
+    - os: linux
+      env: TESTENV=pylint
+    - os: linux
+      env: TESTENV=flake8
+    - os: linux
+      env: TESTENV=docs
+    - os: linux
+      env: TESTENV=vulture
+    - os: linux
+      env: TESTENV=misc
+    - os: linux
+      env: TESTENV=pyroma
+    - os: linux
+      env: TESTENV=check-manifest
+    - os: linux
+      env: TESTENV=eslint
+  allow_failures:
+    - os: osx
+      env: TESTENV=py35
 
 cache:
   directories:
     - $HOME/.cache/pip
     - $HOME/build/The-Compiler/qutebrowser/.cache
 
+before_install:
+  # We need to do this so we pick up the system-wide python properly
+  - 'export PATH="/usr/bin:$PATH"'
+
 install:
-  - python scripts/dev/ci_install.py
+  - bash scripts/dev/ci/travis_install.sh
 
 script:
-    - xvfb-run -s "-screen 0 640x480x16" tox -e py34,py34-integration
-    - tox -e misc
-    - tox -e pep257
-    - tox -e pyflakes
-    - tox -e pep8
-    - tox -e mccabe
-    - tox -e pylint
-    - tox -e pyroma
-    - tox -e check-manifest
+  - bash scripts/dev/ci/travis_run.sh
 
-# Travis bug - OS X builds get routed to Ubuntu Trusty if "dist: trusty" is
-# given.
-matrix:
-  allow_failures:
-    - os: osx
+after_success:
+  - '[[ $TESTENV == *-cov ]] && codecov -e TESTENV -X gcov'
+
+notifications:
+  webhooks:
+    - https://buildtimetrend.herokuapp.com/travis
+  irc:
+    channels:
+      - "chat.freenode.net#qutebrowser"
+    on_success: change
+    on_failure: always
+    skip_join: true
+    template:
+      - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
+      - "%{compare_url} - %{build_url}"

CHANGELOG.asciidoc

@@ -14,6 +14,338 @@ 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.7.0
+------
+
+Added
+~~~~~
+
+- New `:edit-url` command to edit the URL in an external editor.
+- New `network -> custom-headers` setting to send custom headers with every request.
+- New `{url:pretty}` commandline replacement which gets replaced by the decoded URL.
+- New marks to remember a scroll position:
+    - New `:jump-mark` command to jump to a mark, bound to `'`
+    - New `:set-mark` command to set a mark, bound to ```(backtick)
+    - The `'` mark gets set when moving away (hinting link with anchor, searching, etc.) so you can move back with `''`
+- New `--force-color` argument to force colored logging even if stdout is not a
+  terminal
+- New `:messages` command to show error messages
+- New pop-up showing possible keybinding when the first key of a keychain is
+  pressed. This can be turned off using `:set ui keyhint-blacklist *`.
+- New `hints -> auto-follow-timeout` setting to ignore keypresses after
+  following a hint when filtering in number mode.
+- New `:history-clear` command to clear the entire history
+- New `hints -> find-implementation` to select which implementation (JS/Python)
+  should be used to find hints on a page. The `javascript` implementation is
+  better, but slower.
+
+Changed
+~~~~~~~
+
+- qutebrowser got a new (slightly updated) logo
+- `:tab-focus` can now take a negative index to focus the nth tab counted from
+  the right.
+- `:yank` can now yank the pretty/decoded URL by adding `--pretty`
+- `:navigate` now clears the URL fragment
+- `:completion-item-del` (`Ctrl-D`) can now be used in `:buffer` completion to
+  close a tab
+- Counts can now be used with special keybindings (e.g. with modifiers)
+- Various SSL ciphers are now disabled by default. With recent Qt/OpenSSL
+  versions those already all are disabled, but with older versions they might
+  not be.
+- Show favicons as window icon with `tabs-are-windows` set.
+- `:bind <key>` without a command now shows the existing binding
+- The optional `colorlog` dependency got removed, as qutebrowser now displays
+  colored logs without it.
+- URLs are now shown decoded when hovering.
+- Keybindings are now shown in the command completion
+- Improved behavior when pasting multiple lines
+- Rapid hints can now also be used for the `normal` hint target, which can be
+  useful with javascript click handlers or checkboxes which don't actually open
+  a new page.
+- `:zoom-in` or `:zoom-out` (`+`/`-`) with a too large count now zooms to the
+  smallest/largest zoom instead of doing nothing.
+- The commandline now accepts partially typed commands if they're unique.
+- Number hints are now kept filtered after following a hint in rapid mode.
+- Number hints are now renumbered after filtering
+- Number hints can now be filtered with multiple space-separated search terms
+- `hints -> scatter` is now ignored for number hints
+- Better history implementation which also stores titles.
+  As a consequence, URLs which redirect to another URL are now added to the
+  history too, marked with a `-r` suffix to the timestamp field.
+
+Fixed
+-----
+
+- Fixed using `:hint links spawn` with flags - you can now use things like the
+  `-v` argument for `:spawn` or pass flags to the spawned commands.
+- Various fixes for hinting corner-cases where following a link didn't work or
+  the hint was drawn at the wrong position.
+- Fixed crash when downloading from an URL with SSL errors
+- Close file handles correctly when a download failed
+- Fixed crash when using `;Y` (`:hint links yank-primary`) on a system without
+  primary selection
+- Don't display quit confirmation with finished downloads
+- Fixed updating the tab index in the statusbar when opening a background tab
+- Fixed a crash when entering `:-- ` in the commandline
+- Fixed `:debug-console` with PyQt 5.6
+- Fixed qutebrowser not starting when `sys.stderr` is `None`
+- Fixed crash when cancelling a download which belongs to a MHTML download
+- Fixed rebinding of keybindings being case-sensitive
+- Fix for tab indicators getting lost when moving tabs
+- Fixed handling of backspace in number hinting mode
+- Fixed `FileNotFoundError` when starting in some cases on old Qt versions
+- Fixed sharing of cookies between tabs when `private-browsing` is enabled
+- Toggling values with `:set` now uses lower-case values
+- Hints now work with (non-standard) links with spaces around the URL
+- Strip off trailing spaces for history entries with no title
+
+v0.6.2
+------
+
+Fixed
+~~~~~
+
+- Fixed crash when using `:tab-{prev,next,focus}` right after closing the last
+  tab with `last-close` set to `close`.
+- Fixed crash when doing `:undo` in a new instance with `tabs -> last-close` set
+  to `default-page`.
+- Fixed crash when starting with --cachedir=""
+- Fixed crash in some circumstances when using dictionary hints
+- Fixed various crashes related to PyQt 5.6
+
+v0.6.1
+-----
+
+Fixed
+~~~~~~
+
+- Fixed broken cheatsheet image which was missing from package
+- Fixed occasional crash when switching/disconnecting monitors
+- Fixed crash when downloading non-ascii files with a broken locale (`LC_ALL=C`)
+- Added workaround for a Qt/PyQt bug which is too weird to describe here
+
+v0.6.0
+------
+
+Added
+~~~~~
+
+- New `:buffer` command to easily switch tabs by name. This is not bound to a
+  key by default for existing users due to a conflict with the `gt`/`gT`
+  bindings (which are now removed from the default bindings).
+  You can bind it by hand by running `:bind -f gt set-cmd-text -s :buffer`.
+- New `--quiet` argument for the `:debug-pyeval` command to not open a tab with
+  the results. Note `:debug-pyeval` is still only intended for debugging.
+- The completion now matches each entered word separately.
+- A new command `:paste-primary` got added to paste the primary selection, and
+  `<Shift-Insert>` got added as a binding so it pastes primary rather than
+  clipboard.
+- New mode `word` for `hints -> mode` which uses a dictionary and link-texts
+  for hints instead of single characters.
+- New `--all` argument for `:download-cancel` to cancel all running downloads.
+- New `password_fill` userscript to fill passwords using the `pass` executable.
+- New `current` hinting mode which forces opening hints in the current tab
+  (even with `target="_blank"`)
+
+Changed
+~~~~~~~
+
+- Pasting multiple lines via `:paste` now opens each line in a new tab.
+- `:navigate increment/decrement` now preserves leading zeroes in URLs.
+- `general -> editor` can now also handle `{}` inside another argument (e.g. to open `vim` via `termite`)
+- Improved performance when scrolling with many tabs open.
+- Shift-Insert now also pastes primary selection for prompts.
+- `:download-remove --all` got un-deprecated to provide symmetry with
+  `:download-cancel --all`. It does the same as `:download-clear`.
+- Improved detection of URLs/search terms when pasting multiple lines.
+- Don't remove `qutebrowser-editor-*` temporary file if editor subprocess crashed
+- Userscripts are also searched in `/usr/share/qutebrowser/userscripts`.
+- Blocked hosts are now also read from a `blocked-hosts` file in the config dir
+  (e.g. `~/.config/qutebrowser/blocked-hosts`).
+
+Fixed
+~~~~~
+
+- Fixed starting with -c "".
+- Fixed crash when a tab is closed twice via javascript (e.g. Dropbox
+  authentication dialogs)
+- Fixed crash when a notification/geolocation prompt is answered after closing
+  the tab it belongs to.
+- Fixed crash when downloading a file without any path information (e.g a
+  magnet link).
+- Fixed crashes when opening an empty URL (e.g. via pasting).
+- Fixed validation of duplicate values in `hints -> chars`.
+- Fixed crash when PDF.js was partially installed.
+- Fixed crash when XDG_DOWNLOAD_DIR was not an absolute path.
+- Fixed very long filenames when downloading `data://`-URLs.
+- Fixed ugly UI fonts on Windows when Liberation Mono is installed
+- Fixed crash when unbinding key from a section which doesn't exist in the config
+- Fixed report window after a segfault
+- Fixed some directory browser issues on Windows
+- Fixed crash when closing a window with a finished download and delayed
+  `remove-finished-downloads` setting.
+- Fixed crash when hitting `<Tab>` then `<Ctrl-C>` on pages without keyboard
+  focus.
+- Fixed "Frame load interrupted by policy change" error showing up when
+  downloading files with Qt 5.6.
+
+Removed
+~~~~~~~
+
+- The `gt`/`gT` bindings (luakit-like alternatives to `J`/`K`) were removed
+  (except for existing configs) to make room for the `gt` binding to show
+  buffers.
+
+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
 ------
 
@@ -423,7 +755,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

@@ -89,21 +89,39 @@ Checkers
 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`:
+Currently, following tox environments are available:
 
-* 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]
-* https://github.com/mgedmin/check-manifest[check-manifest]
-* `scripts/misc_checks.py` which checks for the following things:
+* Tests using https://www.pytest.org[pytest]:
+  - `py34`: Run pytest for python-3.4.
+  - `py35`: Run pytest for python-3.5.
+  - `py34-cov`: Run pytest for python-3.4 with code coverage report.
+  - `py35-cov`: Run pytest for python-3.5 with code coverage report.
+* `flake8`: Run https://pypi.python.org/pypi/flake8[flake8] checks:
+                https://pypi.python.org/pypi/pyflakes[pyflakes],
+                https://pypi.python.org/pypi/pep8[pep8],
+                https://pypi.python.org/pypi/mccabe[mccabe]
+* `vulture`: Run https://pypi.python.org/pypi/vulture[vulture] to find
+  unused code portions.
+* `pylint`: Run http://pylint.org/[pylint] static code analysis.
+* `pydocstyle`: Check
+  https://www.python.org/dev/peps/pep-0257/[PEP257] compliance with
+  https://github.com/PyCQA/pydocstyle[pydocstyle]
+* `pyroma`: Check packaging practices with
+  https://pypi.python.org/pypi/pyroma/[pyroma]
+* `eslint`: Run http://eslint.org/[ESLint] javascript checker.
+* `check-manifest`: Check MANIFEST.in completeness with
+  https://github.com/mgedmin/check-manifest[check-manifest]
+* `mkvenv`: Bootstrap a virtualenv for testing.
+* `misc`: Run `scripts/misc_checks.py` to check for:
     - untracked git files
     - VCS conflict markers
+    - common spelling mistakes
+
+The default test suite is run with `tox`, the list of default
+environments is obtained with `tox -l` .
 
 Please make sure the checks run without any warnings on your new contributions.
+
 There's of course the possibility of false-positives, and the following
 techniques are useful to handle these:
 
@@ -122,16 +140,48 @@ smallest scope which makes sense. Most of the time, this will be line scope.
 * If you really think a check shouldn't be done globally as it yields a lot of
 false-positives, let me know! I'm still tweaking the parameters.
 
+
+Running Specific Tests
+~~~~~~~~~~~~~~~~~~~~~~
+
+While you are developing you often don't want to run the full test
+suite each time.
+
+Specific test environments can be run with `tox -e <envlist>`.
+
+Additional parameters can be passed to the test scripts by separating
+them from `tox` arguments with `--`.
+
+Examples:
+
+----
+# run only pytest tests which failed in last run:
+tox -e py35 -- --lf
+
+# run only the end2end feature tests:
+tox -e py35 -- tests/end2end/features
+
+# run everything with undo in the generated name, based on the scenario text
+tox -e py35 -- tests/end2end/features/test_tabs_bdd.py -k undo
+
+# run coverage test for specific file (updates htmlcov/index.html)
+tox -e py35-cov -- tests/unit/browser/test_webelem.py
+----
+
 Profiling
 ~~~~~~~~~
 
 In the _scripts/_ subfolder there's a `run_profile.py` which profiles the code
 and shows a graphical representation of what takes how much time.
 
-It needs https://pypi.python.org/pypi/pyprof2calltree/[pyprof2calltree] and
-http://kcachegrind.sourceforge.net/html/Home.html[KCacheGrind]. It uses the
-built-in Python https://docs.python.org/3.4/library/profile.html[cProfile]
-module.
+It uses the built-in Python
+https://docs.python.org/3.4/library/profile.html[cProfile] module and can show
+the output in four different ways:
+
+* Raw profile file (`--profile-tool=none`)
+* https://pypi.python.org/pypi/pyprof2calltree/[pyprof2calltree] and http://kcachegrind.sourceforge.net/html/Home.html[KCacheGrind] (`--profile-tool=kcachegrind`)
+* https://jiffyclub.github.io/snakeviz/[SnakeViz] (`--profile-tool=snakeviz`)
+* https://github.com/jrfonseca/gprof2dot[gprof2dot] (needs `dot` from http://graphviz.org/[Graphviz] and http://feh.finalrewind.org/[feh])
 
 Debugging
 ~~~~~~~~~
@@ -166,7 +216,6 @@ Documentation of used Python libraries:
 * http://pythonhosted.org/setuptools/[setuptools]
 * http://cx-freeze.readthedocs.org/en/latest/overview.html[cx_Freeze]
 * https://pypi.python.org/pypi/colorama[colorama]
-* https://pypi.python.org/pypi/colorlog[colorlog]
 
 Related RFCs and standards:
 
@@ -227,7 +276,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
@@ -246,22 +295,22 @@ When using Qt objects, two issues must be taken care of:
 * Methods of Qt objects report their status by using their return values,
 instead of using exceptions.
 +
-If a function gets or returns a Qt object which
-has an `.isValid()` method such as `QUrl` or `QModelIndex`, there's a helper
-function `ensure_valid` in `qutebrowser.utils.qt` which should get called on
-all such objects. It will raise `qutebrowser.utils.qt.QtValueError` if the
-value is not valid.
+If a function gets or returns a Qt object which has an `.isValid()`
+method such as `QUrl` or `QModelIndex`, there's a helper function
+`ensure_valid` in `qutebrowser.utils.qtutils` which should get called
+on all such objects. It will raise
+`qutebrowser.utils.qtutils.QtValueError` if the value is not valid.
 +
 If a function returns something else on error, the return value should
 carefully be checked.
 
-* Methods of Qt objects have certain maximum values, based on their underlying
-C++ types.
+* Methods of Qt objects have certain maximum values, based on their
+underlying C++ types.
 +
-When passing a numeric parameter to a Qt function, all numbers should be
-range-checked using `qutebrowser.utils.check_overflow`, or passing a value
-which is too large should be avoided by other means (e.g. by setting a maximum
-value for a config object).
+When passing a numeric parameter to a Qt function, all numbers should
+be range-checked using `qutebrowser.qtutils.check_overflow`, or
+passing a value which is too large should be avoided by other means
+(e.g. by setting a maximum value for a config object).
 
 [[object-registry]]
 The object registry
@@ -325,7 +374,7 @@ The following logging levels are available for every logger:
 
 [width="75%",cols="25%,75%"]
 |=======================================================================
-|criticial |Critical issue, qutebrowser can't continue to run.
+|critical  |Critical issue, qutebrowser can't continue to run.
 |error     |There was an issue and some kind of operation was abandoned.
 |warning   |There was an issue but the operation can continue running.
 |info      |General informational messages.
@@ -363,43 +412,67 @@ then gets passed as the `self` parameter to the handler. The `scope` argument
 selects which object registry (global, per-tab, etc.) to use.  See the
 <<object-registry,object registry>> section for details.
 
-There are also other arguments to customize the way the command is registered,
-see the class documentation for `register` in `qutebrowser.commands.utils` for
-details.
+There are also other arguments to customize the way the command is
+registered, see the class documentation for `register` in
+`qutebrowser.commands.cmdutils` for details.
 
 The types of the function arguments are inferred based on their default values,
 e.g. an argument `foo=True` will be converted to a flag `-f`/`--foo` in
 qutebrowser's commandline.
 
-This behavior can be overridden using Python's
-http://legacy.python.org/dev/peps/pep-3107/[function annotations]. The
-annotation should always be a `dict`, like this:
+The type can be overridden using Python's
+http://legacy.python.org/dev/peps/pep-3107/[function annotations]:
 
 [source,python]
 ----
 @cmdutils.register(...)
-def foo(bar: {'type': int}, baz=True):
+def foo(bar: int, baz=True):
     ...
 ----
 
-The following keys are supported in the dict:
-
-* `type`: The type this value should have. The value entered by the user is
-then automatically checked. Possible values:
+Possible values:
     - A callable (`int`, `float`, etc.): Gets called to validate/convert the
       value.
-    - A string: The value must match exactly (mainly useful with tuples to get
-      a choice of values, see below).
     - A python enum type: All members of the enum are possible values.
-    - A tuple of multiple types above: Any of these types are valid 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).
-* `nargs`: Gets passed to argparse, see
-https://docs.python.org/dev/library/argparse.html#nargs[its documentation].
+    - A `typing.Union` of multiple types above: Any of these types are valid
+      values, e.g. `typing.Union[str, int]`
+
+You can customize how an argument is handled using the `@cmdutils.argument`
+decorator *after* `@cmdutils.register`. This can e.g. be used to customize the
+flag an argument should get:
+
+[source,python]
+----
+@cmdutils.register(...)
+@cmdutils.argument('bar', flag='c')
+def foo(bar):
+    ...
+----
+
+For a `str` argument, you can restrict the allowed strings using `choices`:
+
+[source,python]
+----
+@cmdutils.register(...)
+@cmdutils.argument('bar', choices=['val1', 'val2'])
+def foo(bar: str):
+    ...
+----
+
+For `typing.Union` types, the given `choices` are only checked if other types
+(like `int`) don't match.
+
+The following arguments are supported for `@cmdutils.argument`:
+
+- `flag`: Customize the short flag (`-x`) the argument will get.
+- `win_id=True`: Mark the argument as special window ID argument
+- `count=True`: Mark the argument as special count argument
+- `hide=True`: Hide the argument from the documentation
+- `completion`: A `usertypes.Completion` member to use as completion.
+- `choices`: The allowed string choices for the argument.
 
 The name of an argument will always be the parameter name, with any trailing
-underscores stripped.
+underscores stripped and underscores replaced by dashes.
 
 [[handling-urls]]
 Handling URLs
@@ -522,10 +595,7 @@ Return:
 * The layout of a class should be like this:
   - docstring
   - `__magic__` methods
-  - properties
-  - _private methods
-  - public methods
-  - `on_*` methods
+  - other methods
   - overrides of Qt methods
 
 Checklists
@@ -547,28 +617,57 @@ workaround.
 * Check relevant
 https://github.com/The-Compiler/qutebrowser/issues?q=is%3Aopen+is%3Aissue+label%3Aqt[qutebrowser
 bugs] and check if they're fixed.
+* As soon as Homebrew updated, update the custom OS X bottle:
+  - Update https://github.com/The-Compiler/homebrew-qt5-webkit/blob/master/Formula/qt5.rb[qt5.rb]
+  - `brew install --build-from-source --verbose qt5.rb`
+  - `brew bottle qt5`
+  - `brew install --build-from-source --verbose pyqt5`
+  - `brew bottle pyqt5`
+  - Upload bottles to github
+  - Adjust `scripts/dev/ci/travis_install.sh`
+
+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).
+* Add newest config to `tests/unit/config/old_configs` and update `test_upgrade_version`
+    - `python -m qutebrowser --basedir conf :quit`
+    - `sed '/^#/d'  conf/config/qutebrowser.conf > tests/unit/config/old_configs/qutebrowser-v0.x.y.conf`
+    - `rm -r conf`
+    - commit
+* 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 `C:\Python34_x32\python scripts\dev\build_release.py --asciidoc C:\Python27\python C:\asciidoc-8.6.9\asciidoc.py`
+* Upload to github
 
+* 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`
+    - Upload windows release:
+           - `scp bb-win8:proj/qutebrowser/qutebrowser-0.X.Y-windows.zip .`
+           - `aunpack qutebrowser-0.X.Y-windows.zip`
+           - `sudo mv qutebrowser-0.X.Y-windows/* /srv/http/qutebrowser/releases/v0.X.Y/windows`
+* Update `qutebrowser-git` PKGBUILD
 * Announce to qutebrowser mailinglist

FAQ.asciidoc

@@ -1,5 +1,6 @@
 Frequently asked questions
 ==========================
+:title: Frequently asked questions
 The Compiler <mail@qutebrowser.org>
 
 [qanda]
@@ -60,7 +61,7 @@ Why Python?::
 
 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.
@@ -79,13 +80,37 @@ How do I play Youtube videos with mpv?::
     player - optionally even with hinting for links:
 +
 ----
-:bind x spawn mpv {url}
-:bind ;x hint links spawn mpv {hint-url}
+:bind m spawn mpv {url}
+:bind M 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.
++
+There is a very useful script for mpv, which emulates "unique application"
+functionality. This way you can add links to the mpv playlist instead of
+playing them all at once.
++
+You can find the script here: https://github.com/mpv-player/mpv/blob/master/TOOLS/umpv
++
+It also works nicely with rapid hints:
++
+----
+:bind m spawn umpv {url}
+:bind M hint links spawn umpv {hint-url}
+:bind ;M hint --rapid links spawn umpv {hint-url}
+----
+
+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
 
@@ -103,7 +128,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.
 
@@ -115,7 +140,7 @@ 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 various bugs in Qt which have 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. 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].
@@ -132,5 +157,5 @@ My issue is not listed.::
     https://github.com/The-Compiler/qutebrowser/issues[the issue tracker] or
     using the `:report` command.
     If you are reporting a segfault, make sure you read the
-    https://github.com/The-Compiler/qutebrowser/blob/master/doc/stacktrace.asciidoc[guide]
-    on how to report them with all needed information.
+    link:doc/stacktrace.asciidoc[guide] on how to report them with all needed
+    information.

INSTALL.asciidoc

@@ -8,11 +8,33 @@ 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]!
+Unfortunately there is no Debian package in the official repos yet, but installing qutebrowser is
+still relatively easy!
+
+You can use packages that are built for every release or build it yourself from git.
+
+Using the packages
+~~~~~~~~~~~~~~~~~~
+
+Install the dependencies via apt-get:
+
+----
+# apt-get install python3-lxml python-tox python3-pyqt5 python3-pyqt5.qtwebkit python3-sip python3-jinja2 python3-pygments python3-yaml
+----
+
+Get the packages from the https://github.com/The-Compiler/qutebrowser/releases[release page]
+
+Install the packages:
+
+----
+# dpkg -i python3-pypeg2_*_all.deb
+# dpkg -i qutebrowser_*_all.deb
+----
+
+Build it from git
+~~~~~~~~~~~~~~~~~
 
 Install the dependencies via apt-get:
 
@@ -32,7 +54,7 @@ Then install the packages like this:
 
 ----
 # apt-get update
-# apt-get install -t experimental python3-pyqt5 python3-pyqt5.qtwebkit python3-sip
+# apt-get install -t experimental python3-pyqt5 python3-pyqt5.qtwebkit python3-sip python3-dev
 # apt-get install python-tox
 ----
 
@@ -50,72 +72,64 @@ 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
+# 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
 ----
 
+If video or sound don't seem to work, try installing the gstreamer plugins:
+
+----
+# apt-get install gstreamer1.0-plugins-{bad,base,good,ugly}
+----
+
 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:
+qutebrowser is available in the official repositories for Fedora 22 and newer.
 
 ----
-# dnf update
-# dnf install python3-qt5 python-tox python3-sip
+# dnf install qutebrowser
 ----
 
-To generate the documentation for the `:help` command, when using the git
-repository (rather than a release):
-
-----
-# dnf install asciidoc
-$ python3 scripts/asciidoc2html.py
-----
-
-Then <<tox,install qutebrowser via tox>>.
-
 On Archlinux
 ------------
 
-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 (and the needed pypeg2 dependency) like this:
+qutebrowser is available in the official [community] repository.
 
 ----
-$ 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
+# pacman -S qutebrowser
+----
 
-$ wget https://aur.archlinux.org/packages/qu/qutebrowser/qutebrowser.tar.gz
-$ tar xzf qutebrowser.tar.gz
-$ cd qutebrowser
+There is also a -git version available in the AUR:
+https://aur.archlinux.org/packages/qutebrowser-git/[qutebrowser-git].
+
+You can install it using `makepkg` like this:
+
+----
+$ git clone https://aur.archlinux.org/qutebrowser-git.git
+$ cd qutebrowser-git
 $ makepkg -si
 $ cd ..
-$ rm -r qutebrowser qutebrowser.tar.gz
+$ rm -r qutebrowser-git
 ----
 
 or you could use an AUR helper, e.g. `yaourt -S qutebrowser-git`.
 
+If video or sound don't seem to work, try installing the gstreamer plugins:
+
+----
+# pacman -S gst-plugins-{base,good,bad,ugly} gst-libav
+----
+
 On Gentoo
 ---------
 
@@ -129,6 +143,13 @@ Make sure you have `python3_4` in your `PYTHON_TARGETS`
 (`/etc/portage/make.conf`) and rebuild your system (`emerge -uDNav @world`) if
 necessary.
 
+If video or sound don't seem to work, try installing the gstreamer plugins:
+
+----
+# emerge -av gst-plugins-{base,good,bad,ugly,libav}
+----
+
+
 On Void Linux
 -------------
 
@@ -149,12 +170,47 @@ it with:
 $ nix-env -i qutebrowser
 ----
 
+On openSUSE
+-----------
+
+There are prebuilt RPMs available for Tumbleweed and Leap 42.1:
+
+http://software.opensuse.org/download.html?project=home%3Aarpraher&package=qutebrowser[One Click Install]
+
+Or add the repo manually:
+
+----
+# zypper addrepo http://download.opensuse.org/repositories/home:arpraher/openSUSE_Tumbleweed/home:arpraher.repo
+# zypper refresh
+# zypper install qutebrowser
+----
+
 On Windows
 ----------
 
-You can either use one of the
-https://github.com/The-Compiler/qutebrowser/releases[prebuilt standalone
-packages or MSI installers], or install manually:
+There are different ways to install qutebrowser on Windows:
+
+Prebuilt binaries
+~~~~~~~~~~~~~~~~~
+
+Prebuilt standalone packages and MSI installers
+https://github.com/The-Compiler/qutebrowser/releases[are built] for every
+release.
+
+https://chocolatey.org/packages/qutebrowser[Chocolatey package]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* PackageManagement PowerShell module
+----
+PS C:\> Install-Package qutebrowser
+----
+* Chocolatey's client
+----
+C:\> choco install qutebrowser
+----
+
+Manual install
+~~~~~~~~~~~~~~
 
 * Use the installer from http://www.python.org/downloads[python.org] to get
 Python 3 (be sure to install pip).
@@ -174,16 +230,24 @@ On OS X
 -------
 
 To install qutebrowser on OS X, you'll want a package manager, e.g.
-http://brew.sh/[Homebrew] or https://www.macports.org/[MacPorts]. Also make
-sure, you have https://itunes.apple.com/en/app/xcode/id497799835[XCode]
-installed to compile PyQt5 in a later step.
+http://brew.sh/[Homebrew] or https://www.macports.org/[MacPorts].
+
+For Homebrew, a few extra steps are necessary since Homebrew dropped QtWebKit
+from Qt 5.6.
+
+This installs a Qt 5.5 and symlinks it so PyQt5 will work with it instead of Qt
+5.6. This requires that `qt5` is not installed via Homebrew:
 
 ----
-$ brew install python3 pyqt5
-$ pip3.4 install qutebrowser
+$ brew install python3 d-bus mysql sip xz
+$ brew install homebrew/versions/qt55
+$ brew install --ignore-dependencies pyqt5
+$ ln -s /usr/local/opt/qt55 /usr/local/opt/qt5
+
+$ pip3.5 install qutebrowser
 ----
 
-if you are using Homebrew. For MacPorts, run:
+For MacPorts, run:
 
 ----
 $ sudo port install python34 py34-jinja2 asciidoc py34-pygments py34-pyqt5
@@ -208,7 +272,16 @@ it as part of the packaging process.
 Installing qutebrowser with tox
 -------------------------------
 
-Run tox like this to set up a
+First of all, clone the repository using http://git-scm.org/[git] and switch
+into the repository folder:
+
+----
+$ git clone https://github.com/The-Compiler/qutebrowser.git
+$ cd qutebrowser
+----
+
+
+Then run tox inside the qutebrowser repository to set up a
 https://docs.python.org/3/library/venv.html[virtual environment]:
 
 ----
@@ -226,6 +299,14 @@ your `$PATH` (e.g. `/usr/local/bin/qutebrowser` or `~/bin/qutebrowser`):
 ~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser "$@"
 ----
 
+If you are developing on qutebrowser, you may want to redirect it to a local
+config:
+
+----
+#!/bin/bash
+~/path/to/qutebrowser/.venv/bin/python3 -m qutebrowser -c .qutebrowser-local "$@"
+----
+
 Updating
 ~~~~~~~~
 

MANIFEST.in

@@ -1,34 +1,43 @@
-global-exclude __pycache__ *.pyc *.pyo
-
-recursive-include qutebrowser *.py
-recursive-include qutebrowser/html *.html
-recursive-include qutebrowser/img *.svg
-recursive-include qutebrowser/test *.py
-recursive-include qutebrowser/javascript *.js
-graft icons
-graft doc/img
-graft misc
-graft scripts
-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 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 doc/help
-exclude .appveyor.yml
-exclude .travis.yml
-exclude misc/appveyor_install.py
+recursive-include qutebrowser *.py
+recursive-include qutebrowser/img *.svg *.png
+recursive-include qutebrowser/test *.py
+recursive-include qutebrowser/javascript *.js
+graft qutebrowser/html
+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
+prune scripts/testbrowser_cpp
+exclude scripts/asciidoc2html.py
+exclude doc/notes
+recursive-exclude doc *.asciidoc
+include doc/qutebrowser.1.asciidoc
+prune tests
+prune qutebrowser/3rdparty
+exclude .editorconfig
+exclude pytest.ini
+exclude qutebrowser.rcc
+exclude .coveragerc
+exclude .pylintrc
+exclude .eslintrc
+exclude .eslintignore
+exclude doc/help
+exclude .appveyor.yml
+exclude .travis.yml
+exclude codecov.yml
+exclude .pydocstylerc
+exclude misc/appveyor_install.py
+exclude .flake8
+
+global-exclude __pycache__ *.pyc *.pyo

README.asciidoc

@@ -6,14 +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: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"]
+
+link:http://www.qutebrowser.org[website] | link:http://blog.qutebrowser.org[blog] | link:https://github.com/The-Compiler/qutebrowser/releases[releases]
+// QUTE_WEB_HIDE_END
 
 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.
@@ -24,7 +28,7 @@ Screenshots
 -----------
 
 image:doc/img/main.png["screenshot 1",width=300,link="doc/img/main.png"]
-image:doc/img/downloads.png["screenshot 2",width=300j,link="doc/img/downloads.png"]
+image:doc/img/downloads.png["screenshot 2",width=300,link="doc/img/downloads.png"]
 image:doc/img/completion.png["screenshot 3",width=300,link="doc/img/completion.png"]
 image:doc/img/hints.png["screenshot 4",width=300,link="doc/img/hints.png"]
 
@@ -89,25 +93,26 @@ Requirements
 
 The following software and libraries are required to run qutebrowser:
 
-* http://www.python.org/[Python] 3.4
-* http://qt.io/[Qt] 5.2.0 or newer (5.5.0 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.5.0 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.
 
-The following libraries are optional and provide colored logging in the
-console:
-
-* https://pypi.python.org/pypi/colorlog/[colorlog]
-* On Windows: https://pypi.python.org/pypi/colorama/[colorama]
+On Windows, https://pypi.python.org/pypi/colorama/[colorama] is needed to
+display colored log output.
 
 See link:INSTALL.asciidoc[INSTALL] for directions on how to install qutebrowser
 and its dependencies.
@@ -135,55 +140,105 @@ Contributors, sorted by the number of commits in descending order:
 
 // QUTE_AUTHORS_START
 * Florian Bruhin
+* Daniel Schadt
 * Antoni Boucher
+* Ryan Roden-Corrent
+* Lamar Pavel
 * Bruno Oliveira
-* Martin Tournoij
 * Alexander Cogneau
+* Felix Van der Jeugt
+* Martin Tournoij
+* Jakub Klinkovský
 * Raphael Pierzina
 * Joel Torstensson
-* Claude
-* Lamar Pavel
-* Austin Anderson
-* Artur Shaik
-* ZDarian
-* Peter Vilim
-* John ShaggyTwoDope Jenkins
-* Daniel
-* Jimmy
-* Zach-Button
-* rikn00
-* Thorsten Wißmann
+* Tarcisio Fedrizzi
 * Patric Schmitz
+* Claude
+* Corentin Julé
+* meles5
+* Philipp Hansch
+* Panagiotis Ktistakis
+* Artur Shaik
+* Nathan Isom
+* Thorsten Wißmann
+* Kevin Velghe
+* Austin Anderson
+* Jimmy
+* Alexey "Averrin" Nabrodov
+* avk
+* ZDarian
+* Milan Svoboda
+* John ShaggyTwoDope Jenkins
+* Peter Vilim
+* Clayton Craft
+* Oliver Caldwell
+* Jonas Schürmann
+* error800
+* Liam BEGUIN
+* skinnay
+* Zach-Button
+* Tomasz Kramkowski
+* Halfwit
+* rikn00
+* kanikaa1234
+* haitaka
+* Nick Ginther
+* Michael Ilsaas
 * Martin Zimmermann
-* Error 800
+* Fritz Reichwald
 * Brian Jackson
 * sbinix
+* neeasade
 * jnphilipp
 * Tobias Patzl
+* Stefan Tatschner
+* Samuel Loury
+* Peter Michely
+* Link
+* Larry Hynes
 * Johannes Altmanninger
+* Ismail
+* adam
 * Samir Benmendil
 * Regina Hug
 * Mathias Fussenegger
-* Larry Hynes
+* Marcelo Santos
+* Jan Verbeek
 * Fritz V155 Reichwald
 * Franz Fellner
 * zwarag
-* meles5
-* error800
+* xd1le
+* oniondreams
+* issue
+* haxwithaxe
+* evan
+* dylan araps
+* Xitian9
+* Tomas Orsava
+* Tobias Werth
 * Tim Harder
 * Thiago Barroso Perrotta
+* Sorokin Alexei
+* Noah Huesser
 * Matthias Lisin
+* Marcel Schilling
+* Johannes Martinsson
+* Jean-Christophe Petkovich
+* Jay Kamat
 * Helen Sherwood-Taylor
 * HalosGhost
 * Gregor Pohl
 * Eivind Uggedal
+* Daniel Lu
 * Arseniy Seroka
+* Andy Balaam
 * Andreas Fischer
 // QUTE_AUTHORS_END
 
 The following people have contributed graphics:
 
-* WOFall (icon)
+* Jad/link:http://yelostudio.com[yelo] (new icon)
+* WOFall (original icon)
 * regines (key binding cheatsheet)
 
 Thanks / Similar projects
@@ -250,3 +305,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].

codecov.yml

@@ -0,0 +1,9 @@
+status:
+  project:
+    enabled: no
+  patch:
+    enabled: no
+  changes:
+    enabled: no
+
+comment: off

doc/help/commands.asciidoc

@@ -11,20 +11,28 @@
 |<<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.
+|<<buffer,buffer>>|Select tab by index or url/title best match.
 |<<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.
+|<<edit-url,edit-url>>|Navigate to a url formed in an external editor.
+|<<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.
+|<<history-clear,history-clear>>|Clear all browsing history.
 |<<home,home>>|Open main startpage in current tab.
 |<<inspector,inspector>>|Toggle the web inspector.
 |<<jseval,jseval>>|Evaluate a JavaScript string.
+|<<jump-mark,jump-mark>>|Jump to the mark named by `key`.
 |<<later,later>>|Execute a command after some time.
+|<<messages,messages>>|Show a log of past messages.
 |<<navigate,navigate>>|Open typical prev/next links or navigate using the URL path.
 |<<open,open>>|Open a URL in the current/[count]th tab.
 |<<paste,paste>>|Open a page from the clipboard.
@@ -45,6 +53,7 @@
 |<<session-save,session-save>>|Save a session.
 |<<set,set>>|Set an option.
 |<<set-cmd-text,set-cmd-text>>|Preset the statusbar to some text.
+|<<set-mark,set-mark>>|Set a mark at the current scroll position in the current tab.
 |<<spawn,spawn>>|Spawn a command in a shell.
 |<<stop,stop>>|Stop loading in the current/[count]th tab.
 |<<tab-clone,tab-clone>>|Duplicate the current tab.
@@ -69,6 +78,8 @@
 === adblock-update
 Update the adblock block lists.
 
+This updates ~/.local/share/qutebrowser/blocked-hosts with downloaded host lists and re-reads ~/.config/qutebrowser/blocked-hosts.
+
 [[back]]
 === back
 Syntax: +:back [*--tab*] [*--bg*] [*--window*]+
@@ -85,13 +96,14 @@ How many pages to go back.
 
 [[bind]]
 === bind
-Syntax: +:bind [*--mode* 'MODE'] [*--force*] 'key' 'command'+
+Syntax: +:bind [*--mode* 'mode'] [*--force*] 'key' ['command']+
 
 Bind a key to a command.
 
 ==== positional arguments
 * +'key'+: The keychain or special key (inside `<...>`) to bind.
-* +'command'+: The command to execute, with optional args.
+* +'command'+: The command to execute, with optional args, or not given to print the current binding.
+
 
 ==== optional arguments
 * +*-m*+, +*--mode*+: A comma-separated list of modes to bind the key in (default: `normal`).
@@ -117,7 +129,6 @@ Delete a bookmark.
 
 ==== 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
@@ -135,7 +146,18 @@ Load a bookmark.
 
 ==== 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.
+
+[[buffer]]
+=== buffer
+Syntax: +:buffer 'index'+
+
+Select tab by index or url/title best match.
+
+Focuses window if necessary.
+
+==== positional arguments
+* +'index'+: The [win_id/]index of the tab to focus. Or a substring in which case the closest match will be focused.
+
 
 [[close]]
 === close
@@ -143,34 +165,48 @@ 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
+Syntax: +:download-cancel [*--all*]+
+
 Cancel the last/[count]th download.
 
+==== optional arguments
+* +*-a*+, +*--all*+: Cancel all running downloads
+
 ==== 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.
 
 ==== count
-The index of the download to cancel.
+The index of the download to delete.
 
 [[download-open]]
 === download-open
 Open the last/[count]th download.
 
 ==== count
-The index of the download to cancel.
+The index of the download to open.
 
 [[download-remove]]
 === download-remove
@@ -179,10 +215,50 @@ 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*+: Remove all finished downloads.
 
 ==== count
-The index of the download to cancel.
+The index of the download to remove.
+
+[[download-retry]]
+=== download-retry
+Retry the first failed/[count]th download.
+
+==== count
+The index of the download to retry.
+
+[[edit-url]]
+=== edit-url
+Syntax: +:edit-url [*--bg*] [*--tab*] [*--window*] ['url']+
+
+Navigate to a url formed in an external editor.
+
+The editor which should be launched can be configured via the `general -> editor` config option.
+
+==== positional arguments
+* +'url'+: URL to edit; defaults to the current page url.
+
+==== optional arguments
+* +*-b*+, +*--bg*+: Open in a new background tab.
+* +*-t*+, +*--tab*+: Open in a new tab.
+* +*-w*+, +*--window*+: Open in a new window.
+
+==== count
+The tab index to open the URL in.
+
+[[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
@@ -237,7 +313,8 @@ Start hinting.
 
 * +'target'+: What to do with the selected element. 
 
- - `normal`: Open the link in the current tab.
+ - `normal`: Open the link.
+ - `current`: Open the link in the current tab.
  - `tab`: Open the link in a new tab (honoring the
  background-tabs setting).
  - `tab-fg`: Open the link in a new foreground tab.
@@ -261,7 +338,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.
@@ -273,6 +354,15 @@ Start hinting.
  `window`, `run`, `hover`, `userscript` and `spawn`.
 
 
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+
+[[history-clear]]
+=== history-clear
+Clear all browsing history.
+
+Note this only clears the global history (e.g. `~/.local/share/qutebrowser/history` on Linux) but not cookies, the back/forward history of a tab, cache or other persistent data.
+
 [[home]]
 === home
 Open main startpage in current tab.
@@ -299,6 +389,15 @@ Evaluate a JavaScript string.
 * 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.
 
+[[jump-mark]]
+=== jump-mark
+Syntax: +:jump-mark 'key'+
+
+Jump to the mark named by `key`.
+
+==== positional arguments
+* +'key'+: mark identifier; capital indicates a global mark
+
 [[later]]
 === later
 Syntax: +:later 'ms' 'command'+
@@ -313,6 +412,22 @@ Execute a command after some time.
 * 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.
 
+[[messages]]
+=== messages
+Syntax: +:messages [*--plain*] [*--tab*] [*--bg*] [*--window*] ['level']+
+
+Show a log of past messages.
+
+==== positional arguments
+* +'level'+: Include messages with `level` or higher severity. Valid values: vdebug, debug, info, warning, error, critical.
+
+
+==== optional arguments
+* +*-p*+, +*--plain*+: Whether to show plaintext (as opposed to html).
+* +*-t*+, +*--tab*+: Open in a new tab.
+* +*-b*+, +*--bg*+: Open in a background tab.
+* +*-w*+, +*--window*+: Open in a new window.
+
 [[navigate]]
 === navigate
 Syntax: +:navigate [*--tab*] [*--bg*] [*--window*] 'where'+
@@ -357,7 +472,6 @@ The tab index to open the URL in.
 
 ==== 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.
 
 [[paste]]
 === paste
@@ -365,6 +479,8 @@ Syntax: +:paste [*--sel*] [*--tab*] [*--bg*] [*--window*]+
 
 Open a page from the clipboard.
 
+If the pasted text contains newlines, each line gets opened in its own tab.
+
 ==== optional arguments
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
 * +*-t*+, +*--tab*+: Open in a new tab.
@@ -404,7 +520,6 @@ Delete a quickmark.
 
 ==== 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.
 
 [[quickmark-load]]
 === quickmark-load
@@ -422,7 +537,6 @@ Load a quickmark.
 
 ==== 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.
 
 [[quickmark-save]]
 === quickmark-save
@@ -490,7 +604,6 @@ Search for a text on the current page. With no text, clear results.
 
 ==== 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.
 
 [[session-delete]]
 === session-delete
@@ -554,19 +667,30 @@ 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.
 
+You can use the `{url}` and `{url:pretty}` variables here which will get replaced by the encoded/decoded URL.
+
 ==== positional arguments
 * +'text'+: The commandline to set.
 
 ==== 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.
-* With this command, +;;+ is interpreted literally instead of splitting off a second command.
+
+[[set-mark]]
+=== set-mark
+Syntax: +:set-mark 'key'+
+
+Set a mark at the current scroll position in the current tab.
+
+==== positional arguments
+* +'key'+: mark identifier; capital indicates a global mark
 
 [[spawn]]
 === spawn
@@ -574,19 +698,23 @@ 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.
+Note the `{url}` and `{url:pretty}` variables might be useful here. `{url}` gets replaced by the URL in fully encoded format and `{url:pretty}` uses a "pretty form" with most percent-encoded characters decoded.
 
 ==== positional arguments
 * +'cmdline'+: The commandline to execute.
 
 ==== optional arguments
-* +*-u*+, +*--userscript*+: Run the command as a userscript.
+* +*-u*+, +*--userscript*+: Run the command as a userscript. You can use an absolute path, or store the userscript in one of those
+ locations:
+ - `~/.local/share/qutebrowser/userscripts`
+ (or `$XDG_DATA_DIR`)
+ - `/usr/share/qutebrowser/userscripts`
+
 * +*-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
@@ -633,7 +761,8 @@ 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.
+* +'index'+: The tab index to focus, starting with 1. The special value `last` focuses the last focused tab. Negative indexes
+ counts from the end, such that -1 is the last tab.
 
 
 ==== count
@@ -707,7 +836,7 @@ Save open pages and quit.
 
 [[yank]]
 === yank
-Syntax: +:yank [*--title*] [*--sel*] [*--domain*]+
+Syntax: +:yank [*--title*] [*--sel*] [*--domain*] [*--pretty*]+
 
 Yank the current URL/title to the clipboard or primary selection.
 
@@ -715,6 +844,7 @@ Yank the current URL/title to the clipboard or primary selection.
 * +*-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.
+* +*-p*+, +*--pretty*+: Yank the URL in pretty decoded form.
 
 [[yank-selected]]
 === yank-selected
@@ -769,7 +899,7 @@ How many steps to zoom out.
 |<<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.
@@ -791,6 +921,7 @@ How many steps to zoom out.
 |<<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.
+|<<paste-primary,paste-primary>>|Paste the primary selection at cursor position.
 |<<prompt-accept,prompt-accept>>|Accept the current prompt.
 |<<prompt-no,prompt-no>>|Answer no to a yes/no prompt.
 |<<prompt-yes,prompt-yes>>|Answer yes to a yes/no prompt.
@@ -858,7 +989,12 @@ 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
@@ -999,6 +1135,10 @@ Open an external editor with the currently selected form field.
 
 The editor which should be launched can be configured via the `general -> editor` config option.
 
+[[paste-primary]]
+=== paste-primary
+Paste the primary selection at cursor position.
+
 [[prompt-accept]]
 === prompt-accept
 Accept the current prompt.
@@ -1091,7 +1231,7 @@ This acts like readline's yank.
 
 [[scroll]]
 === scroll
-Syntax: +:scroll 'direction' ['dy']+
+Syntax: +:scroll 'direction'+
 
 Scroll the current tab in the given direction.
 
@@ -1146,7 +1286,7 @@ 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.
+* +'dy'+: How much to scroll in y-direction.
 
 ==== count
 multiplier
@@ -1179,9 +1319,12 @@ These commands are mainly intended for debugging. They are hidden if qutebrowser
 |Command|Description
 |<<debug-all-objects,debug-all-objects>>|Print a list of  all objects to the debug log.
 |<<debug-cache-stats,debug-cache-stats>>|Print LRU cache stats.
+|<<debug-clear-ssl-errors,debug-clear-ssl-errors>>|Clear remembered SSL error answers.
 |<<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-set-fake-clipboard,debug-set-fake-clipboard>>|Put data into the fake clipboard and enable logging, used for tests.
 |<<debug-trace,debug-trace>>|Trace executed code via hunter.
 |<<debug-webaction,debug-webaction>>|Execute a webaction.
 |==============
@@ -1193,6 +1336,10 @@ Print a list of  all objects to the debug log.
 === debug-cache-stats
 Print LRU cache stats.
 
+[[debug-clear-ssl-errors]]
+=== debug-clear-ssl-errors
+Clear remembered SSL error answers.
+
 [[debug-console]]
 === debug-console
 Show the debugging console.
@@ -1206,19 +1353,43 @@ 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'+
+Syntax: +:debug-pyeval [*--quiet*] 's'+
 
 Evaluate a python string and display the results as a web page.
 
 ==== positional arguments
 * +'s'+: The string to evaluate.
 
+==== optional arguments
+* +*-q*+, +*--quiet*+: Don't show the output in a new tab.
+
 ==== 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.
 
+[[debug-set-fake-clipboard]]
+=== debug-set-fake-clipboard
+Syntax: +:debug-set-fake-clipboard ['s']+
+
+Put data into the fake clipboard and enable logging, used for tests.
+
+==== positional arguments
+* +'s'+: The text to put into the fake clipboard, or unset to enable logging.
+
 [[debug-trace]]
 === debug-trace
 Syntax: +:debug-trace ['expr']+

doc/help/index.asciidoc

@@ -12,6 +12,7 @@ The following help pages are currently available:
 * link:commands.html[Documentation of commands]
 * link:settings.html[Documentation of settings]
 * link:userscripts.html[How to write userscripts]
+* link:CONTRIBUTING.html[Contributing to qutebrowser]
 
 Getting help
 ------------

doc/help/settings.asciidoc

@@ -20,9 +20,10 @@
 |<<general-site-specific-quirks,site-specific-quirks>>|Enable workarounds for broken sites.
 |<<general-default-encoding,default-encoding>>|Default encoding to use for websites.
 |<<general-new-instance-open-target,new-instance-open-target>>|How to open links in an existing instance if a new one is launched.
-|<<general-log-javascript-console,log-javascript-console>>|Whether to log javascript console messages.
+|<<general-log-javascript-console,log-javascript-console>>|How to log javascript console messages.
 |<<general-save-session,save-session>>|Whether to always save the open pages.
 |<<general-session-default-name,session-default-name>>|The name of the session to save by default, or empty for the last loaded session.
+|<<general-url-incdec-segments,url-incdec-segments>>|The URL segments where `:navigate increment/decrement` will search for a number.
 |==============
 
 .Quick reference for section ``ui''
@@ -41,12 +42,14 @@
 |<<ui-user-stylesheet,user-stylesheet>>|User stylesheet to use (absolute filename, filename relative to the config directory or CSS string). Will expand environment variables.
 |<<ui-css-media-type,css-media-type>>|Set the CSS media type.
 |<<ui-smooth-scrolling,smooth-scrolling>>|Whether to enable smooth scrolling for webpages.
-|<<ui-remove-finished-downloads,remove-finished-downloads>>|Whether to remove finished downloads automatically.
+|<<ui-remove-finished-downloads,remove-finished-downloads>>|Number of milliseconds to wait before removing finished downloads. Will not be removed if value is -1.
 |<<ui-hide-statusbar,hide-statusbar>>|Whether to hide the statusbar unless a message is shown.
 |<<ui-statusbar-padding,statusbar-padding>>|Padding for statusbar (top, bottom, left, right).
 |<<ui-window-title-format,window-title-format>>|The format to use for the window title. The following placeholders are defined:
 |<<ui-hide-mouse-cursor,hide-mouse-cursor>>|Whether to hide the mouse cursor.
 |<<ui-modal-js-dialog,modal-js-dialog>>|Use standard JavaScript modal dialog for alert() and confirm()
+|<<ui-hide-wayland-decoration,hide-wayland-decoration>>|Hide the window decoration when using wayland (requires restart)
+|<<ui-keyhint-blacklist,keyhint-blacklist>>|Keychains that shouldn't be shown in the keyhint dialog
 |==============
 
 .Quick reference for section ``network''
@@ -61,6 +64,7 @@
 |<<network-proxy-dns-requests,proxy-dns-requests>>|Whether to send DNS requests over the configured proxy.
 |<<network-ssl-strict,ssl-strict>>|Whether to validate SSL handshakes.
 |<<network-dns-prefetch,dns-prefetch>>|Whether to try to pre-fetch DNS entries to speed up browsing.
+|<<network-custom-headers,custom-headers>>|Set custom headers for qutebrowser HTTP requests.
 |==============
 
 .Quick reference for section ``completion''
@@ -76,6 +80,8 @@
 |<<completion-web-history-max-items,web-history-max-items>>|How many URLs to show in the web history.
 |<<completion-quick-complete,quick-complete>>|Whether to move on to the next part when there's only one possible completion left.
 |<<completion-shrink,shrink>>|Whether to shrink the completion to be smaller than the configured size if there are no scrollbars.
+|<<completion-scrollbar-width,scrollbar-width>>|Width of the scrollbar in the completion window (in px).
+|<<completion-scrollbar-padding,scrollbar-padding>>|Padding of scrollbar handle in completion window (in px).
 |==============
 
 .Quick reference for section ``input''
@@ -114,6 +120,7 @@
 |<<tabs-indicator-width,indicator-width>>|Width of the progress indicator (0 to disable).
 |<<tabs-tabs-are-windows,tabs-are-windows>>|Whether to open windows instead of tabs.
 |<<tabs-title-format,title-format>>|The format to use for the tab title. The following placeholders are defined:
+|<<tabs-title-alignment,title-alignment>>|Alignment of the text inside of tabs
 |<<tabs-mousewheel-tab-switching,mousewheel-tab-switching>>|Switch between tabs using the mouse wheel.
 |<<tabs-padding,padding>>|Padding for tabs (top, bottom, left, right).
 |<<tabs-indicator-padding,indicator-padding>>|Padding for indicators (top, bottom, left, right).
@@ -159,6 +166,8 @@
 |<<content-cookies-store,cookies-store>>|Whether to store cookies.
 |<<content-host-block-lists,host-block-lists>>|List of URLs of lists which contain hosts to block.
 |<<content-host-blocking-enabled,host-blocking-enabled>>|Whether host blocking is enabled.
+|<<content-host-blocking-whitelist,host-blocking-whitelist>>|List of domains that should always be loaded, despite being ad-blocked.
+|<<content-enable-pdfjs,enable-pdfjs>>|Enable pdf.js to view PDF files in the browser.
 |==============
 
 .Quick reference for section ``hints''
@@ -169,12 +178,15 @@
 |<<hints-opacity,opacity>>|Opacity for hints.
 |<<hints-mode,mode>>|Mode to use for hints.
 |<<hints-chars,chars>>|Chars used for hint strings.
-|<<hints-min-chars,min-chars>>|Mininum number of chars used for hint strings.
-|<<hints-scatter,scatter>>|Whether to scatter hint key chains (like Vimium) or not (like dwb).
+|<<hints-min-chars,min-chars>>|Minimum number of chars used for hint strings.
+|<<hints-scatter,scatter>>|Whether to scatter hint key chains (like Vimium) or not (like dwb). Ignored for number hints.
 |<<hints-uppercase,uppercase>>|Make chars in hint strings uppercase.
-|<<hints-auto-follow,auto-follow>>|Whether to auto-follow a hint if there's only one left.
+|<<hints-dictionary,dictionary>>|The dictionary file to be used by the word hints.
+|<<hints-auto-follow,auto-follow>>|Follow a hint immediately when the hint text is completely matched.
+|<<hints-auto-follow-timeout,auto-follow-timeout>>|A timeout to inhibit normal-mode key bindings after a successfulauto-follow.
 |<<hints-next-regexes,next-regexes>>|A comma-separated list of regexes to use for 'next' links.
 |<<hints-prev-regexes,prev-regexes>>|A comma-separated list of regexes to use for 'prev' links.
+|<<hints-find-implementation,find-implementation>>|Which implementation to use to find elements to hint.
 |==============
 
 .Quick reference for section ``colors''
@@ -193,8 +205,10 @@
 |<<colors-completion.item.selected.border.top,completion.item.selected.border.top>>|Top border color of the completion widget category headers.
 |<<colors-completion.item.selected.border.bottom,completion.item.selected.border.bottom>>|Bottom border color of the selected completion item.
 |<<colors-completion.match.fg,completion.match.fg>>|Foreground color of the matched text in the completion.
+|<<colors-completion.scrollbar.fg,completion.scrollbar.fg>>|Color of the scrollbar handle in completion view.
+|<<colors-completion.scrollbar.bg,completion.scrollbar.bg>>|Color of the scrollbar in completion view
 |<<colors-statusbar.fg,statusbar.fg>>|Foreground color of the statusbar.
-|<<colors-statusbar.bg,statusbar.bg>>|Foreground color of the statusbar.
+|<<colors-statusbar.bg,statusbar.bg>>|Background color of the statusbar.
 |<<colors-statusbar.fg.error,statusbar.fg.error>>|Foreground color of the statusbar if there was an error.
 |<<colors-statusbar.bg.error,statusbar.bg.error>>|Background color of the statusbar if there was an error.
 |<<colors-statusbar.fg.warning,statusbar.fg.warning>>|Foreground color of the statusbar if there is a warning.
@@ -211,7 +225,8 @@
 |<<colors-statusbar.bg.caret-selection,statusbar.bg.caret-selection>>|Background color of the statusbar in caret mode with a selection
 |<<colors-statusbar.progress.bg,statusbar.progress.bg>>|Background color of the progress bar.
 |<<colors-statusbar.url.fg,statusbar.url.fg>>|Default foreground color of the URL in the statusbar.
-|<<colors-statusbar.url.fg.success,statusbar.url.fg.success>>|Foreground color of the URL in the statusbar on successful load.
+|<<colors-statusbar.url.fg.success,statusbar.url.fg.success>>|Foreground color of the URL in the statusbar on successful load (http).
+|<<colors-statusbar.url.fg.success.https,statusbar.url.fg.success.https>>|Foreground color of the URL in the statusbar on successful load (https).
 |<<colors-statusbar.url.fg.error,statusbar.url.fg.error>>|Foreground color of the URL in the statusbar on error.
 |<<colors-statusbar.url.fg.warn,statusbar.url.fg.warn>>|Foreground color of the URL in the statusbar when there's a warning.
 |<<colors-statusbar.url.fg.hover,statusbar.url.fg.hover>>|Foreground color of the URL in the statusbar for hovered links.
@@ -219,8 +234,10 @@
 |<<colors-tabs.bg.odd,tabs.bg.odd>>|Background color of unselected odd tabs.
 |<<colors-tabs.fg.even,tabs.fg.even>>|Foreground color of unselected even tabs.
 |<<colors-tabs.bg.even,tabs.bg.even>>|Background color of unselected even tabs.
-|<<colors-tabs.fg.selected,tabs.fg.selected>>|Foreground color of selected tabs.
-|<<colors-tabs.bg.selected,tabs.bg.selected>>|Background color of selected tabs.
+|<<colors-tabs.fg.selected.odd,tabs.fg.selected.odd>>|Foreground color of selected odd tabs.
+|<<colors-tabs.bg.selected.odd,tabs.bg.selected.odd>>|Background color of selected odd tabs.
+|<<colors-tabs.fg.selected.even,tabs.fg.selected.even>>|Foreground color of selected even tabs.
+|<<colors-tabs.bg.selected.even,tabs.bg.selected.even>>|Background color of selected even tabs.
 |<<colors-tabs.bg.bar,tabs.bg.bar>>|Background color of the tab bar.
 |<<colors-tabs.indicator.start,tabs.indicator.start>>|Color gradient start for the tab indicator.
 |<<colors-tabs.indicator.stop,tabs.indicator.stop>>|Color gradient end for the tab indicator.
@@ -239,6 +256,9 @@
 |<<colors-downloads.fg.error,downloads.fg.error>>|Foreground color for downloads with errors.
 |<<colors-downloads.bg.error,downloads.bg.error>>|Background color for downloads with errors.
 |<<colors-webpage.bg,webpage.bg>>|Background color for webpages if unset (or empty to use the theme's color)
+|<<colors-keyhint.fg,keyhint.fg>>|Text color for the keyhint widget.
+|<<colors-keyhint.fg.suffix,keyhint.fg.suffix>>|Highlight color for keys to complete the current keychain
+|<<colors-keyhint.bg,keyhint.bg>>|Background color of the keyhint widget.
 |==============
 
 .Quick reference for section ``fonts''
@@ -262,6 +282,7 @@
 |<<fonts-web-size-minimum-logical,web-size-minimum-logical>>|The minimum logical font size that is applied when zooming out.
 |<<fonts-web-size-default,web-size-default>>|The default font size for regular text.
 |<<fonts-web-size-default-fixed,web-size-default-fixed>>|The default font size for fixed-pitch text.
+|<<fonts-keyhint,keyhint>>|Font used in the keyhint widget.
 |==============
 
 == general
@@ -294,7 +315,7 @@ Default: +pass:[true]+
 === startpage
 The default page(s) to open at the start, separated by commas.
 
-Default: +pass:[https://www.duckduckgo.com]+
+Default: +pass:[https://duckduckgo.com]+
 
 [[general-default-page]]
 === default-page
@@ -335,7 +356,8 @@ Default: +pass:[15000]+
 === editor
 The editor (and arguments) to use for the `open-editor` command.
 
-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.
+`{}` gets replaced by the filename of the file to be edited.
 
 Default: +pass:[gvim -f &quot;{}&quot;]+
 
@@ -428,14 +450,15 @@ Default: +pass:[tab]+
 
 [[general-log-javascript-console]]
 === log-javascript-console
-Whether to log javascript console messages.
+How to log javascript console messages.
 
 Valid values:
 
- * +true+
- * +false+
+ * +none+: Don't log messages.
+ * +debug+: Log messages with debug level.
+ * +info+: Log messages with info level.
 
-Default: +pass:[false]+
+Default: +pass:[debug]+
 
 [[general-save-session]]
 === save-session
@@ -454,6 +477,19 @@ The name of the session to save by default, or empty for the last loaded session
 
 Default: empty
 
+[[general-url-incdec-segments]]
+=== url-incdec-segments
+The URL segments where `:navigate increment/decrement` will search for a number.
+
+Valid values:
+
+ * +host+
+ * +path+
+ * +query+
+ * +anchor+
+
+Default: +pass:[path,query]+
+
 == ui
 General options related to the user interface.
 
@@ -570,14 +606,9 @@ Default: +pass:[false]+
 
 [[ui-remove-finished-downloads]]
 === remove-finished-downloads
-Whether to remove finished downloads automatically.
+Number of milliseconds to wait before removing finished downloads. Will not be removed if value is -1.
 
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[false]+
+Default: +pass:[-1]+
 
 [[ui-hide-statusbar]]
 === hide-statusbar
@@ -605,6 +636,7 @@ The format to use for the window title. The following placeholders are defined:
 * `{title}`: The title of the current web page
 * `{title_sep}`: The string ` - ` if a title is set, empty otherwise.
 * `{id}`: The internal window ID of this window.
+* `{scroll_pos}`: The page scroll position.
 
 Default: +pass:[{perc}{title}{title_sep}qutebrowser]+
 
@@ -630,6 +662,25 @@ Valid values:
 
 Default: +pass:[false]+
 
+[[ui-hide-wayland-decoration]]
+=== hide-wayland-decoration
+Hide the window decoration when using wayland (requires restart)
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[false]+
+
+[[ui-keyhint-blacklist]]
+=== keyhint-blacklist
+Keychains that shouldn't be shown in the keyhint dialog
+
+Globs are supported, so ';*' will blacklist all keychainsstarting with ';'. Use '*' to disable keyhints
+
+Default: empty
+
 == network
 Settings related to the network.
 
@@ -715,6 +766,12 @@ Valid values:
 
 Default: +pass:[true]+
 
+[[network-custom-headers]]
+=== custom-headers
+Set custom headers for qutebrowser HTTP requests.
+
+Default: empty
+
 == completion
 Options related to completion and command history.
 
@@ -802,6 +859,18 @@ Valid values:
 
 Default: +pass:[false]+
 
+[[completion-scrollbar-width]]
+=== scrollbar-width
+Width of the scrollbar in the completion window (in px).
+
+Default: +pass:[12]+
+
+[[completion-scrollbar-padding]]
+=== scrollbar-padding
+Padding of scrollbar handle in completion window (in px).
+
+Default: +pass:[2]+
+
 == input
 Options related to input modes.
 
@@ -809,13 +878,17 @@ Options related to input modes.
 === timeout
 Timeout for ambiguous key bindings.
 
+If the current input forms both a complete match and a partial match, the complete match will be executed after this time.
+
 Default: +pass:[500]+
 
 [[input-partial-timeout]]
 === partial-timeout
 Timeout for partially typed key bindings.
 
-Default: +pass:[1000]+
+If the current input forms only partial matches, the keystring will be cleared after this time.
+
+Default: +pass:[5000]+
 
 [[input-insert-mode-on-plugins]]
 === insert-mode-on-plugins
@@ -1079,9 +1152,22 @@ The format to use for the tab title. The following placeholders are defined:
 * `{title_sep}`: The string ` - ` if a title is set, empty otherwise.
 * `{index}`: The index of this tab.
 * `{id}`: The internal tab ID of this tab.
+* `{scroll_pos}`: The page scroll position.
 
 Default: +pass:[{index}: {title}]+
 
+[[tabs-title-alignment]]
+=== title-alignment
+Alignment of the text inside of tabs
+
+Valid values:
+
+ * +left+
+ * +right+
+ * +center+
+
+Default: +pass:[left]+
+
 [[tabs-mousewheel-tab-switching]]
 === mousewheel-tab-switching
 Switch between tabs using the mouse wheel.
@@ -1261,7 +1347,7 @@ Valid values:
  * +true+
  * +false+
 
-Default: +pass:[true]+
+Default: +pass:[false]+
 
 [[content-css-regions]]
 === css-regions
@@ -1433,6 +1519,29 @@ Valid values:
 
 Default: +pass:[true]+
 
+[[content-host-blocking-whitelist]]
+=== host-blocking-whitelist
+List of domains that should always be loaded, despite being ad-blocked.
+
+Domains may contain * and ? wildcards and are otherwise required to exactly match the requested domain.
+
+Local domains are always exempt from hostblocking.
+
+Default: +pass:[piwik.org]+
+
+[[content-enable-pdfjs]]
+=== enable-pdfjs
+Enable pdf.js to view PDF files in the browser.
+
+Note that the files can still be downloaded by clicking the download button in the pdf.js viewer.
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[false]+
+
 == hints
 Hinting settings.
 
@@ -1456,6 +1565,7 @@ Valid values:
 
  * +number+: Use numeric hints.
  * +letter+: Use the chars in the hints -> chars setting.
+ * +word+: Use hints words based on the html elements and the extra words.
 
 Default: +pass:[letter]+
 
@@ -1467,13 +1577,13 @@ Default: +pass:[asdfghjkl]+
 
 [[hints-min-chars]]
 === min-chars
-Mininum number of chars used for hint strings.
+Minimum number of chars used for hint strings.
 
 Default: +pass:[1]+
 
 [[hints-scatter]]
 === scatter
-Whether to scatter hint key chains (like Vimium) or not (like dwb).
+Whether to scatter hint key chains (like Vimium) or not (like dwb). Ignored for number hints.
 
 Valid values:
 
@@ -1493,9 +1603,15 @@ Valid values:
 
 Default: +pass:[false]+
 
+[[hints-dictionary]]
+=== dictionary
+The dictionary file to be used by the word hints.
+
+Default: +pass:[/usr/share/dict/words]+
+
 [[hints-auto-follow]]
 === auto-follow
-Whether to auto-follow a hint if there's only one left.
+Follow a hint immediately when the hint text is completely matched.
 
 Valid values:
 
@@ -1504,6 +1620,12 @@ Valid values:
 
 Default: +pass:[true]+
 
+[[hints-auto-follow-timeout]]
+=== auto-follow-timeout
+A timeout to inhibit normal-mode key bindings after a successfulauto-follow.
+
+Default: +pass:[0]+
+
 [[hints-next-regexes]]
 === next-regexes
 A comma-separated list of regexes to use for 'next' links.
@@ -1516,6 +1638,17 @@ A comma-separated list of regexes to use for 'prev' links.
 
 Default: +pass:[\bprev(ious)?\b,\bback\b,\bolder\b,\b[&lt;←≪]\b,\b(&lt;&lt;|«)\b]+
 
+[[hints-find-implementation]]
+=== find-implementation
+Which implementation to use to find elements to hint.
+
+Valid values:
+
+ * +javascript+: Better but slower
+ * +python+: Slightly worse but faster
+
+Default: +pass:[javascript]+
+
 == searchengines
 Definitions of search engines which can be used via the address bar.
 The searchengine named `DEFAULT` is used when `general -> auto-search` is true and something else than a URL was entered to be opened. Other search engines can be used by prepending the search engine name to the search term, e.g. `:open google qutebrowser`. The string `{}` will be replaced by the search term, use `{{` and `}}` for literal `{`/`}` signs.
@@ -1613,6 +1746,18 @@ Foreground color of the matched text in the completion.
 
 Default: +pass:[#ff4444]+
 
+[[colors-completion.scrollbar.fg]]
+=== completion.scrollbar.fg
+Color of the scrollbar handle in completion view.
+
+Default: +pass:[${completion.fg}]+
+
+[[colors-completion.scrollbar.bg]]
+=== completion.scrollbar.bg
+Color of the scrollbar in completion view
+
+Default: +pass:[${completion.bg}]+
+
 [[colors-statusbar.fg]]
 === statusbar.fg
 Foreground color of the statusbar.
@@ -1621,7 +1766,7 @@ Default: +pass:[white]+
 
 [[colors-statusbar.bg]]
 === statusbar.bg
-Foreground color of the statusbar.
+Background color of the statusbar.
 
 Default: +pass:[black]+
 
@@ -1723,7 +1868,13 @@ Default: +pass:[${statusbar.fg}]+
 
 [[colors-statusbar.url.fg.success]]
 === statusbar.url.fg.success
-Foreground color of the URL in the statusbar on successful load.
+Foreground color of the URL in the statusbar on successful load (http).
+
+Default: +pass:[white]+
+
+[[colors-statusbar.url.fg.success.https]]
+=== statusbar.url.fg.success.https
+Foreground color of the URL in the statusbar on successful load (https).
 
 Default: +pass:[lime]+
 
@@ -1769,18 +1920,30 @@ Background color of unselected even tabs.
 
 Default: +pass:[darkgrey]+
 
-[[colors-tabs.fg.selected]]
-=== tabs.fg.selected
-Foreground color of selected tabs.
+[[colors-tabs.fg.selected.odd]]
+=== tabs.fg.selected.odd
+Foreground color of selected odd tabs.
 
 Default: +pass:[white]+
 
-[[colors-tabs.bg.selected]]
-=== tabs.bg.selected
-Background color of selected tabs.
+[[colors-tabs.bg.selected.odd]]
+=== tabs.bg.selected.odd
+Background color of selected odd tabs.
 
 Default: +pass:[black]+
 
+[[colors-tabs.fg.selected.even]]
+=== tabs.fg.selected.even
+Foreground color of selected even tabs.
+
+Default: +pass:[${tabs.fg.selected.odd}]+
+
+[[colors-tabs.bg.selected.even]]
+=== tabs.bg.selected.even
+Background color of selected even tabs.
+
+Default: +pass:[${tabs.bg.selected.odd}]+
+
 [[colors-tabs.bg.bar]]
 === tabs.bg.bar
 Background color of the tab bar.
@@ -1814,6 +1977,7 @@ Valid values:
  * +rgb+: Interpolate in the RGB color system.
  * +hsv+: Interpolate in the HSV color system.
  * +hsl+: Interpolate in the HSL color system.
+ * +none+: Don't show a gradient.
 
 Default: +pass:[rgb]+
 
@@ -1874,6 +2038,7 @@ Valid values:
  * +rgb+: Interpolate in the RGB color system.
  * +hsv+: Interpolate in the HSV color system.
  * +hsl+: Interpolate in the HSL color system.
+ * +none+: Don't show a gradient.
 
 Default: +pass:[rgb]+
 
@@ -1886,6 +2051,7 @@ Valid values:
  * +rgb+: Interpolate in the RGB color system.
  * +hsv+: Interpolate in the HSV color system.
  * +hsl+: Interpolate in the HSL color system.
+ * +none+: Don't show a gradient.
 
 Default: +pass:[rgb]+
 
@@ -1907,6 +2073,24 @@ Background color for webpages if unset (or empty to use the theme's color)
 
 Default: +pass:[white]+
 
+[[colors-keyhint.fg]]
+=== keyhint.fg
+Text color for the keyhint widget.
+
+Default: +pass:[#FFFFFF]+
+
+[[colors-keyhint.fg.suffix]]
+=== keyhint.fg.suffix
+Highlight color for keys to complete the current keychain
+
+Default: +pass:[#FFFF00]+
+
+[[colors-keyhint.bg]]
+=== keyhint.bg
+Background color of the keyhint widget.
+
+Default: +pass:[rgba(0, 0, 0, 80%)]+
+
 == fonts
 Fonts used for the UI, with optional style/weight/size.
 
@@ -1918,7 +2102,7 @@ Fonts used for the UI, with optional style/weight/size.
 === _monospace
 Default monospace fonts.
 
-Default: +pass:[Terminus, Monospace, &quot;DejaVu Sans Mono&quot;, Monaco, &quot;Bitstream Vera Sans Mono&quot;, &quot;Andale Mono&quot;, &quot;Liberation Mono&quot;, &quot;Courier New&quot;, Courier, monospace, Fixed, Consolas, Terminal]+
+Default: +pass:[Terminus, Monospace, &quot;DejaVu Sans Mono&quot;, Monaco, &quot;Bitstream Vera Sans Mono&quot;, &quot;Andale Mono&quot;, &quot;Courier New&quot;, Courier, &quot;Liberation Mono&quot;, monospace, Fixed, Consolas, Terminal]+
 
 [[fonts-completion]]
 === completion
@@ -2015,3 +2199,9 @@ Default: empty
 The default font size for fixed-pitch text.
 
 Default: empty
+
+[[fonts-keyhint]]
+=== keyhint
+Font used in the keyhint widget.
+
+Default: +pass:[8pt ${_monospace}]+

doc/quickstart.asciidoc

@@ -5,10 +5,23 @@ The Compiler <mail@qutebrowser.org>
 NOTE: This page will only appear on the first start. To view it at a later
 time, use the `:help` command.
 
+Basic keybindings to get you started
+------------------------------------
+
+* Use the arrow keys or `hjkl` to move around a webpage (vim-like syntax is used in quite a few places)
+* To go to a new webpage, press `o`, then type a url, then press Enter (Use `O` to open the url in a new tab). If what you've typed isn't a url, then a search engine will be used instead (DuckDuckGo, by default)
+* To switch between tabs, use `J` (next tab) and `K` (previous tab), or press `<Alt-num>`, where `num` is the position of the tab to switch to
+* To close the current tab, press `d` (and press `u` to undo closing a tab)
+* Use `H` and `L` to go back and forth in the history
+* To click on something without using the mouse, press `f` to show the hints, then type the keys next to what you want to click on (if that sounds weird, then just try pressing `f` and see what happens)
+* Press `:` to show the commandline
+* To search in a page, press `/`, type the phrase to search for, then press Enter. Use `n` and `N` to go back and forth through the matches, and press Esc to stop doing the search.
+* To close qutebrowser, press `Alt-F4`, or `:q`, or `:wq` to save the currently open tabs and quit (note that in the settings you can make qutebrowser always save the currently open tabs)
+
 What to do now
 --------------
 
-* View the http://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]
+* View the link: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.

doc/qutebrowser.1.asciidoc

@@ -62,8 +62,11 @@ 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'::
+*-l* '{critical,error,warning,info,debug,vdebug}', *--loglevel* '{critical,error,warning,info,debug,vdebug}'::
     Set loglevel
 
 *--logfilter* 'LOGFILTER'::
@@ -75,9 +78,15 @@ show it.
 *--debug*::
     Turn on debugging options.
 
+*--json-logging*::
+    Output log lines in JSON format (one object per line).
+
 *--nocolor*::
     Turn off colored logging.
 
+*--force-color*::
+    Force colored logging
+
 *--harfbuzz* '{old,new,system,auto}'::
     HarfBuzz engine version to use. Default: auto.
 

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,6 +5,9 @@ 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.
 
+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.
@@ -15,6 +18,10 @@ 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
 -------------------
 

icons/qutebrowser.xpm

@@ -0,0 +1,207 @@
+/* XPM */
+static char *qutebrowser[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 169 2 ",
+"   c #0A396E",
+".  c #0B3C72",
+"X  c #0B4077",
+"o  c #0C437B",
+"O  c #134175",
+"+  c #15467C",
+"@  c #18477B",
+"#  c #1A497D",
+"$  c #0D4B86",
+"%  c #0F4E8D",
+"&  c #124A80",
+"*  c #1F4F83",
+"=  c #0E518C",
+"-  c #1F5084",
+";  c #11508C",
+":  c #0F5193",
+">  c #115799",
+",  c #115B9C",
+"<  c #204F83",
+"1  c #245287",
+"2  c #2A598C",
+"3  c #325E8F",
+"4  c #11609F",
+"5  c #346496",
+"6  c #3B6898",
+"7  c #115CA1",
+"8  c #115EAC",
+"9  c #1263A3",
+"0  c #1260AD",
+"q  c #136BAC",
+"w  c #136BB2",
+"e  c #1366BA",
+"r  c #196BB2",
+"t  c #157ABB",
+"y  c #1577BB",
+"u  c #2E6DB0",
+"i  c #387FB1",
+"p  c #456E9A",
+"a  c #4873A1",
+"s  c #4375AA",
+"d  c #507AA6",
+"f  c #597EA4",
+"g  c #4D7EB3",
+"h  c #156FCB",
+"j  c #167AC5",
+"k  c #1675CA",
+"l  c #177BCE",
+"z  c #1777D8",
+"x  c #1476E4",
+"c  c #167BE6",
+"v  c #167DE8",
+"b  c #197EEF",
+"n  c #1A7FF0",
+"m  c #1A80BE",
+"M  c #5F87AF",
+"N  c #5D8BBA",
+"B  c #5A84B1",
+"V  c #6C8FB3",
+"C  c #6F96BE",
+"Z  c #1886CC",
+"A  c #1883D7",
+"S  c #198DD5",
+"D  c #1987D9",
+"F  c #198ADC",
+"G  c #1A96DC",
+"H  c #3090D9",
+"J  c #1682E9",
+"K  c #1983ED",
+"L  c #1689E9",
+"P  c #1A8DEE",
+"I  c #1B95ED",
+"U  c #1C9EEA",
+"Y  c #1B97E4",
+"T  c #1A84F2",
+"R  c #1A8BF2",
+"E  c #1C94F4",
+"W  c #1D9CF5",
+"Q  c #3388E6",
+"!  c #3D90E9",
+"~  c #228EF3",
+"^  c #229FF6",
+"/  c #3294F4",
+"(  c #3D9FF6",
+")  c #339CF4",
+"_  c #1CA2E5",
+"`  c #1DABEE",
+"'  c #1DA4F6",
+"]  c #1EA9F7",
+"[  c #1EADF8",
+"{  c #1FB4F9",
+"}  c #1FB9FA",
+"|  c #20ACF8",
+" . c #27A4F6",
+".. c #3DA9F6",
+"X. c #20B9FA",
+"o. c #2EB6F9",
+"O. c #458DC9",
+"+. c #5C8DC1",
+"@. c #5795C6",
+"#. c #709DCB",
+"$. c #74A8DD",
+"%. c #4A97EA",
+"&. c #4896EA",
+"*. c #559EEA",
+"=. c #439AF5",
+"-. c #46A3F6",
+";. c #5FA9F6",
+":. c #5EA6F3",
+">. c #47BCF9",
+",. c #51B5F8",
+"<. c #58BDF8",
+"1. c #68ABEF",
+"2. c #7DB9E7",
+"3. c #63AEF7",
+"4. c #6FB1F7",
+"5. c #66B9F8",
+"6. c #61B2F6",
+"7. c #71B4F7",
+"8. c #78B7F4",
+"9. c #72BFF9",
+"0. c #3BC0FA",
+"q. c #6FCEFB",
+"w. c #6CC5FA",
+"e. c #7BCAF9",
+"r. c #89A7C3",
+"t. c #83A2C1",
+"y. c #98B6D3",
+"u. c #9DB9D3",
+"i. c #89B6E4",
+"p. c #83B6E9",
+"a. c #81BDF7",
+"s. c #83BFF8",
+"d. c #9EC4E9",
+"f. c #8CC2F9",
+"g. c #85CDFB",
+"h. c #87C4F9",
+"j. c #92C6F9",
+"k. c #95CAFA",
+"l. c #9CCBFA",
+"z. c #89D7FC",
+"x. c #91D9FC",
+"c. c #9CDEFD",
+"v. c #9ED2FB",
+"b. c #A7CAEC",
+"n. c #B5CEE3",
+"m. c #A1CEFA",
+"M. c #AED0F0",
+"N. c #ACD6FA",
+"B. c #A0DFFC",
+"V. c #AFD8FC",
+"C. c #B5D9FB",
+"Z. c #BCDDFC",
+"A. c #BFDCF5",
+"S. c #ACE3FD",
+"D. c #B5E5FE",
+"F. c #BBE2FC",
+"G. c #CFE5F5",
+"H. c #C3E1FC",
+"J. c #CAE6FD",
+"K. c #CCEBFD",
+"L. c #C4EBFE",
+"P. c #D6EDFE",
+"I. c #DAEEFD",
+"U. c #DEF1FE",
+"Y. c #D6F2FE",
+"T. c #E4F4FE",
+"R. c #E9F6FE",
+"E. c #EBF8FF",
+"W. c None",
+/* pixels */
+"W.W.W.W.W.W.W.W.W.W.W.c.S.L.Y.E.E.S.X.} W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.D.T.E.E.T.L.D.c.z.} } X.} } W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.B.T.T.R.T.R.U.0.X.z.S.} } } } { { X.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.x.x.K.T.T.T.L.P.q.o.{ } } ` _ { { { { { W.W.W.W.W.W.",
+"W.W.W.W.W.c.P.D.G.u.r.i 9 Z _ { { G 4 X t { { { { { { W.W.W.W.W.",
+"W.W.W.W.K.U.n.f O             { =       t { { { { [ { { W.W.W.W.",
+"W.W.W.F.I.t..                 '         t { { [ [ [ [ [ >.W.W.W.",
+"W.W.x.P.V                     ' X       t ` [ [ [ [ [ [ o.e.W.W.",
+"W.W.J.y.        X t S Y Z $   ' .       y [ [ [ ] [ [ | Z.J.W.W.",
+"W.<.e.&       , _ ] ] [ ] U . ' .       y [ ' [ ] ] ] w.K.J.g.W.",
+"W.' S       o ' ' [ ' [ ' ] o ' .       y Y 9 = = 9 @.J.J.J.F.W.",
+"W.| ,       j ' ' ' ' ' ' ' o ' .       $             p A.J.J.g.",
+"'  ..       G ' ' ' ' ' ' ' o ' .                       M H.H.h.",
+",.2.      . W ' W ' ' ' ' W . '                         . M.A.x.",
+"N.M..     . W W W ' W W W W  .w           9 I U 0         #.Z.m.",
+" .9.O       D W W W W ' W j $         % F W W W  .5       d Z.C.",
+"W W ;       9 9.h.5...Q %         o j W W W W W W O.      3 C.N.",
+"E W 7         B b.d.a         . w E E W W W E W E A       @ C.l.",
+"I E l                         u W E W E W E E E E A .     - k.6.",
+"P E E 7                       m.o E E E E E E E E l .     = E P ",
+"L E E E >           . O       s.o E E E E E E E E 7       , E L ",
+"W.R E R ) #.5 1 6 N i.2       s.+ E E E E E E R L .       k R W.",
+"W.L R E -.m.m.m.m.m.m.2       m.@ N m.m.s.( R R %       X E J W.",
+"W.W.K R ~ a.m.l.l.l.l.2       s.+ < i.l.m.j.h %         e K W.W.",
+"W.W.J R R / l.l.l.l.k.2       s.+     * 5 +           8 R J W.W.",
+"W.W.W.v T R 3.k.k.j.k.2     2 j.&                 . 8 R v W.W.W.",
+"W.W.W.W.J T ~ 7.j.j.j.g +.p.j.s.+.  .         . : z T v W.W.W.W.",
+"W.W.W.W.W.c T T =.f.j.j.s.j.j.j.j.$.g s u e h b T T v W.W.W.W.W.",
+"W.W.W.W.W.W.c b n 4.f.f.s.m.s.s.s.j.s.j./ T n T b c W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.c x 1.s.s.s.s.s.s.s.s.4.=.n T n c c W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.&.*.1.a.s.s.s.s.3.n n v x x W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.%.%.%.%.*.*.Q x x x W.W.W.W.W.W.W.W.W.W.W."
+};

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.48.5 r10040"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="cheatsheet.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -32,18 +32,18 @@
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.8791156"
-     inkscape:cx="768.67127"
-     inkscape:cy="133.80749"
+     inkscape:zoom="1.7582312"
+     inkscape:cx="875.18895"
+     inkscape:cy="136.8726"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      width="1024px"
      height="640px"
      showgrid="false"
-     inkscape:window-width="636"
-     inkscape:window-height="536"
-     inkscape:window-x="2560"
-     inkscape:window-y="0"
+     inkscape:window-width="1362"
+     inkscape:window-height="740"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:window-maximized="0"
@@ -3040,17 +3040,13 @@
    style="font-weight:bold;-inkscape-font-specification:'Sans Bold';fill:#ff0000"
    id="flowSpan3852">(10)</flowSpan> misc. commands:</flowPara><flowPara
          style="font-size:10px;fill:#000000"
-         id="flowPara3725-0"><flowSpan
-   style="fill:#0000ff"
-   id="flowSpan5471">gm</flowSpan>  -  move tab</flowPara><flowPara
+         id="flowPara3725-0">gt - switch tabs by name</flowPara><flowPara
          style="font-size:10px;fill:#000000"
-         id="flowPara3854"><flowSpan
+         id="flowPara4052"><flowSpan
    style="fill:#0000ff"
-   id="flowSpan5473">gl</flowSpan>  -  move tab to left</flowPara><flowPara
+   id="flowSpan4054">gm/gl/lr</flowSpan>  -  move tab</flowPara><flowPara
          style="font-size:10px;fill:#000000"
-         id="flowPara3856"><flowSpan
-   style="fill:#0000ff"
-   id="flowSpan5475">gr</flowSpan>  -  move tab to right</flowPara><flowPara
+         id="flowPara4056">   (to index/left/right)</flowPara><flowPara
          style="font-size:10px;fill:#000000"
          id="flowPara3858">gC  -  clone tab</flowPara><flowPara
          style="font-size:10px;fill:#000000"

misc/docker/archlinux/Dockerfile

@@ -0,0 +1,35 @@
+FROM base/archlinux
+MAINTAINER Florian Bruhin <me@the-compiler.org>
+
+RUN echo 'Server = http://mirror.de.leaseweb.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
+RUN pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm archlinux-keyring
+
+RUN pacman -Suyy --noconfirm
+RUN pacman-db-upgrade
+
+RUN pacman -S --noconfirm \
+    git \
+    python-tox \
+    qt5-base \
+    qt5-webkit \
+    python-pyqt5 \
+    xorg-xinit \
+    herbstluftwm \
+    xorg-server-xvfb
+
+RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
+
+RUN useradd user && mkdir /home/user && chown -R user:users /home/user
+USER user
+WORKDIR /home/user
+
+ENV DISPLAY=:0
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+
+CMD Xvfb -screen 0 800x600x24 :0 & \
+    sleep 2 && \
+    herbstluftwm & \
+    git clone /outside qutebrowser.git && \
+    cd qutebrowser.git && \
+    tox -e py35

misc/docker/debian-jessie/Dockerfile

@@ -0,0 +1,35 @@
+FROM debian:jessie
+MAINTAINER Florian Bruhin <me@the-compiler.org>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -y update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y install --no-install-recommends \
+            python3-pyqt5 \
+            python3-pyqt5.qtwebkit \
+            python-tox \
+            python3-sip \
+            xvfb \
+            git \
+            python3-setuptools \
+            wget \
+            herbstluftwm \
+            locales \
+            libjs-pdf
+RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
+
+RUN useradd user && mkdir /home/user && chown -R user:users /home/user
+USER user
+WORKDIR /home/user
+
+ENV DISPLAY=:0
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+
+CMD Xvfb -screen 0 800x600x24 :0 & \
+    sleep 2 && \
+    herbstluftwm & \
+    git clone /outside qutebrowser.git && \
+    cd qutebrowser.git && \
+    tox -e py34

misc/docker/ubuntu-wily/Dockerfile

@@ -0,0 +1,37 @@
+FROM ubuntu:wily
+MAINTAINER Florian Bruhin <me@the-compiler.org>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -y update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y install --no-install-recommends \
+            python3-pyqt5 \
+            python3-pyqt5.qtwebkit \
+            python-tox \
+            python3-sip \
+            xvfb \
+            git \
+            python3-setuptools \
+            wget \
+            herbstluftwm \
+            language-pack-en \
+            libjs-pdf \
+            dbus
+
+RUN dbus-uuidgen --ensure
+
+RUN useradd user && mkdir /home/user && chown -R user:users /home/user
+USER user
+WORKDIR /home/user
+
+ENV DISPLAY=:0
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+
+CMD Xvfb -screen 0 800x600x24 :0 & \
+    sleep 2 && \
+    herbstluftwm & \
+    git clone /outside qutebrowser.git && \
+    cd qutebrowser.git && \
+    tox -e py34

misc/docker/ubuntu-xenial/Dockerfile

@@ -0,0 +1,37 @@
+FROM ubuntu:xenial
+MAINTAINER Florian Bruhin <me@the-compiler.org>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -y update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y install --no-install-recommends \
+            python3-pyqt5 \
+            python3-pyqt5.qtwebkit \
+            python-tox \
+            python3-sip \
+            xvfb \
+            git \
+            python3-setuptools \
+            wget \
+            herbstluftwm \
+            language-pack-en \
+            libjs-pdf \
+            dbus
+
+RUN dbus-uuidgen --ensure
+
+RUN useradd user && mkdir /home/user && chown -R user:users /home/user
+USER user
+WORKDIR /home/user
+
+ENV DISPLAY=:0
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+
+CMD Xvfb -screen 0 800x600x24 :0 & \
+    sleep 2 && \
+    herbstluftwm & \
+    git clone /outside qutebrowser.git && \
+    cd qutebrowser.git && \
+    tox -e py35

misc/qt_menu.nib/README

@@ -1,7 +0,0 @@
-These files are copied from Qt's source tree in
-src/plugins/platforms/cocoa/qt_menu.nib at revision
-b8246f08e49eb672974fd3d3d972a5ff13c1524d.
-
-http://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/cocoa/qt_menu.nib
-
-They are needed for cx_Freeze and don't seem to be bundled with Qt anymore.

misc/qt_menu.nib/classes.nib

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBClasses</key>
-	<array>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>hide</key>
-				<string>id</string>
-				<key>hideOtherApplications</key>
-				<string>id</string>
-				<key>orderFrontStandardAboutPanel</key>
-				<string>id</string>
-                <key>qtDispatcherToQPAMenuItem</key>
-				<string>id</string>
-				<key>terminate</key>
-				<string>id</string>
-				<key>unhideAllApplications</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>QCocoaMenuLoader</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>aboutItem</key>
-				<string>NSMenuItem</string>
-				<key>aboutQtItem</key>
-				<string>NSMenuItem</string>
-				<key>appMenu</key>
-				<string>NSMenu</string>
-				<key>hideItem</key>
-				<string>NSMenuItem</string>
-				<key>preferencesItem</key>
-				<string>NSMenuItem</string>
-				<key>quitItem</key>
-				<string>NSMenuItem</string>
-				<key>theMenu</key>
-				<string>NSMenu</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSResponder</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>FirstResponder</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-	</array>
-	<key>IBVersion</key>
-	<string>1</string>
-</dict>
-</plist>

misc/qt_menu.nib/info.nib

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBFramework Version</key>
-	<string>672</string>
-	<key>IBOldestOS</key>
-	<integer>5</integer>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>57</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>9L31a</string>
-	<key>targetFramework</key>
-	<string>IBCocoaFramework</string>
-</dict>
-</plist>

misc/qutebrowser.spec

@@ -0,0 +1,74 @@
+# -*- mode: python -*-
+
+import sys
+import os
+
+sys.path.insert(0, os.getcwd())
+from scripts import setupcommon
+
+block_cipher = None
+
+
+def get_data_files():
+    data_files = [
+        ('../qutebrowser/html', 'html'),
+        ('../qutebrowser/img', 'img'),
+        ('../qutebrowser/javascript', 'javascript'),
+        ('../qutebrowser/html/doc', 'html/doc'),
+        ('../qutebrowser/git-commit-id', '')
+    ]
+
+    if os.path.exists(os.path.join('qutebrowser', '3rdparty', 'pdfjs')):
+        data_files.append(('../qutebrowser/3rdparty/pdfjs', '3rdparty/pdfjs'))
+    else:
+        print("Warning: excluding pdfjs as it's not present!")
+
+    return data_files
+
+
+setupcommon.write_git_file()
+
+
+if os.name == 'nt':
+    icon = 'icons/qutebrowser.ico'
+elif sys.platform == 'darwin':
+    icon = 'icons/qutebrowser.icns'
+else:
+    icon = None
+
+
+a = Analysis(['../qutebrowser/__main__.py'],
+             pathex=['misc'],
+             binaries=None,
+             datas=get_data_files(),
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='qutebrowser',
+          icon=icon,
+          debug=False,
+          strip=False,
+          upx=True,
+          console=False )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='qutebrowser')
+
+app = BUNDLE(coll,
+             name='qutebrowser.app',
+             icon=icon,
+             info_plist={'NSHighResolutionCapable': 'True'},
+             bundle_identifier=None)

misc/requirements/README.md

@@ -0,0 +1,20 @@
+This directory contains various `requirements` files which are used by `tox` to
+have reproducable tests with pinned versions.
+
+The files are generated based on unpinned requirements in `*.txt-raw` files.
+
+Those files can also contain some special commands:
+
+- Add an additional comment to a line: `#@ comment: <package> <comment here>`
+- Filter a line for requirements.io: `#@ filter: <package> <filter>`
+- Don't include a package in the output: `#@ ignore: <package>` (or multiple packages)
+- Replace a part of a frozen package specification with another: `#@ replace <regex> <replacement>`
+
+Some examples:
+
+```
+#@ comment: mypkg blah blub
+#@ filter: mypkg != 1.0.0
+#@ ignore: mypkg, otherpkg
+#@ replace: foo bar
+```

misc/requirements/requirements-check-manifest.txt

@@ -0,0 +1,3 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+check-manifest==0.31

misc/requirements/requirements-check-manifest.txt-raw

@@ -0,0 +1 @@
+check-manifest

misc/requirements/requirements-codecov.txt

@@ -0,0 +1,5 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+codecov==2.0.5
+coverage==4.1
+requests==2.10.0

misc/requirements/requirements-codecov.txt-raw

@@ -0,0 +1 @@
+codecov

misc/requirements/requirements-cxfreeze.txt

@@ -0,0 +1,3 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+cx-Freeze==4.3.4

misc/requirements/requirements-cxfreeze.txt-raw

@@ -0,0 +1 @@
+cx_Freeze

misc/requirements/requirements-flake8.txt

@@ -0,0 +1,29 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+ebb-lint==0.4.4
+flake8==2.5.4
+flake8-copyright==0.1
+flake8-debugger==1.4.0
+flake8-deprecated==1.0
+flake8-docstrings==0.2.6
+flake8-future-import==0.4.1
+flake8-mock==0.2
+flake8-pep3101==0.3
+flake8-putty==0.3.2
+flake8-string-format==0.2.2
+flake8-tidy-imports==1.0.0
+flake8-tuple==0.2.9
+hacking==0.11.0
+intervaltree==2.1.0
+mccabe==0.5.0
+packaging==16.7
+pbr==1.10.0
+pep257==0.7.0  # still needed by flake8-docstrings but ignored
+pep8==1.7.0
+pep8-naming==0.3.3
+pydocstyle==1.0.0
+pyflakes==1.2.3
+pyparsing==2.1.4
+six==1.10.0
+sortedcontainers==1.5.3
+venusian==1.0

misc/requirements/requirements-flake8.txt-raw

@@ -0,0 +1,21 @@
+ebb-lint
+flake8
+flake8-copyright
+flake8-debugger
+flake8-deprecated
+flake8-docstrings
+flake8-future-import
+flake8-mock
+flake8-pep3101
+flake8-putty
+flake8-string-format
+flake8-tidy-imports
+flake8-tuple
+hacking
+pep8-naming
+pydocstyle
+pyflakes
+
+mccabe==0.5.0
+
+#@ comment: pep257 still needed by flake8-docstrings but ignored

misc/requirements/requirements-pip.txt

@@ -0,0 +1 @@
+pip==8.1.2

misc/requirements/requirements-pyinstaller.txt

@@ -0,0 +1,3 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyInstaller==3.2

misc/requirements/requirements-pyinstaller.txt-raw

@@ -0,0 +1 @@
+PyInstaller

misc/requirements/requirements-pylint-master.txt

@@ -0,0 +1,11 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+-e git+https://github.com/PyCQA/astroid.git#egg=astroid
+isort==4.2.5
+lazy-object-proxy==1.2.2
+mccabe==0.5.0
+-e git+https://github.com/PyCQA/pylint.git#egg=pylint
+./scripts/dev/pylint_checkers
+requests==2.10.0
+six==1.10.0
+wrapt==1.10.8

misc/requirements/requirements-pylint-master.txt-raw

@@ -0,0 +1,13 @@
+-e git+https://github.com/PyCQA/astroid.git#egg=astroid
+-e git+https://github.com/PyCQA/pylint.git#egg=pylint
+./scripts/dev/pylint_checkers
+requests
+
+# https://github.com/PyCQA/pylint/issues/932
+mccabe==0.5.0
+
+# remove @commit-id for scm installs
+#@ replace: @.*# #
+
+# fix qute-pylint location
+#@ replace: qute-pylint==.* ./scripts/dev/pylint_checkers

misc/requirements/requirements-pylint.txt

@@ -0,0 +1,10 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+astroid==1.4.6
+colorama==0.3.7
+lazy-object-proxy==1.2.2
+pylint==1.5.6
+./scripts/dev/pylint_checkers
+requests==2.10.0
+six==1.10.0
+wrapt==1.10.8

misc/requirements/requirements-pylint.txt-raw

@@ -0,0 +1,6 @@
+pylint
+./scripts/dev/pylint_checkers
+requests
+
+# fix qute-pylint location
+#@ replace: qute-pylint==.* ./scripts/dev/pylint_checkers

misc/requirements/requirements-pyroma.txt

@@ -0,0 +1,4 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+docutils==0.12
+pyroma==2.0.2

misc/requirements/requirements-pyroma.txt-raw

@@ -0,0 +1 @@
+pyroma

misc/requirements/requirements-qutebrowser.txt-raw

@@ -0,0 +1,6 @@
+Jinja2
+Pygments
+pyPEG2
+PyYAML
+colorama
+cssutils

misc/requirements/requirements-tests.txt

@@ -0,0 +1,32 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+beautifulsoup4==4.4.1
+CherryPy==6.0.1
+coverage==4.1
+decorator==4.0.10
+Flask==0.10.1  # rq.filter: < 0.11.0
+glob2==0.4.1
+httpbin==0.4.1
+hypothesis==3.4.0
+itsdangerous==0.24
+# Jinja2==2.8
+Mako==1.0.4
+# MarkupSafe==0.23
+parse==1.6.6
+parse-type==0.3.4
+py==1.4.31
+pytest==2.9.2
+pytest-bdd==2.16.1
+pytest-catchlog==1.2.2
+pytest-cov==2.2.1
+pytest-faulthandler==1.3.0
+pytest-instafail==0.3.0
+pytest-mock==1.1
+pytest-qt==1.11.0
+pytest-repeat==0.2
+pytest-rerunfailures==2.0.0
+pytest-travis-fold==1.2.0
+pytest-xvfb==0.2.0
+six==1.10.0
+vulture==0.8.1
+Werkzeug==0.11.10

misc/requirements/requirements-tests.txt-raw

@@ -0,0 +1,22 @@
+beautifulsoup4
+CherryPy
+coverage
+Flask==0.10.1
+httpbin
+hypothesis
+pytest
+pytest-bdd
+pytest-catchlog
+pytest-cov
+pytest-faulthandler
+pytest-instafail
+pytest-mock
+pytest-qt
+pytest-repeat
+pytest-rerunfailures
+pytest-travis-fold
+pytest-xvfb
+vulture
+
+#@ filter: Flask < 0.11.0
+#@ ignore: Jinja2, MarkupSafe

misc/requirements/requirements-tox.txt

@@ -0,0 +1,6 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+pluggy==0.3.1
+py==1.4.31
+tox==2.3.1
+virtualenv==15.0.2

misc/requirements/requirements-tox.txt-raw

@@ -0,0 +1 @@
+tox

misc/requirements/requirements-vulture.txt

@@ -0,0 +1,3 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+vulture==0.8.1

misc/requirements/requirements-vulture.txt-raw

@@ -0,0 +1 @@
+vulture

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

@@ -30,9 +30,10 @@ import os
 import re
 
 from bs4 import BeautifulSoup
+from urllib.parse import urljoin
 
 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'))
+        f.write('open -t %s\n' % urljoin(os.environ['QUTE_URL'], link.get('href')))

misc/userscripts/password_fill

@@ -0,0 +1,364 @@
+#!/bin/bash -e
+help() {
+    blink=$'\e[1;31m' reset=$'\e[0m'
+cat <<EOF
+This script can only be used as a userscript for qutebrowser
+2015, Thorsten Wißmann <edu _at_ thorsten-wissmann _dot_ de>
+In case of questions or suggestions, do not hesitate to send me an E-Mail or to
+directly ask me via IRC (nickname thorsten\`) in #qutebrowser on freenode.
+
+  $blink!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$reset
+  WARNING: the passwords are stored in qutebrowser's
+           debug log reachable via the url qute:log
+  $blink!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$reset
+
+Usage: run as a userscript form qutebrowser, e.g.:
+  spawn --userscript ~/.config/qutebrowser/password_fill
+
+Pass backend: (see also passwordstore.org)
+  This script expects pass to store the credentials of each page in an extra
+  file, where the filename (or filepath) contains the domain of the respective
+  page. The first line of the file must contain the password, the login name
+  must be contained in a later line beginning with "user:", "login:", or
+  "username:" (configurable by the user_pattern variable).
+
+Behavior:
+  It will try to find a username/password entry in the configured backend
+  (currently only pass) for the current website and will load that pair of
+  username and password to any form on the current page that has some password
+  entry field. If multiple entries are found, a zenity menu is offered.
+
+  If no entry is found, then it crops subdomains from the url if at least one
+  entry is found in the backend. (In that case, it always shows a menu)
+
+Configuration:
+  This script loads the bash script ~/.config/qutebrowser/password_fill_rc (if
+  it exists), so you can change any configuration variable and overwrite any
+  function you like.
+
+EOF
+}
+
+set -o pipefail
+shopt -s nocasematch # make regexp matching in bash case insensitive
+
+if [ -z "$QUTE_FIFO" ] ; then
+    help
+    exit
+fi
+
+error() {
+    local msg="$*"
+    echo "message-error '${msg//\'/\\\'}'" >> "$QUTE_FIFO"
+}
+msg() {
+    local msg="$*"
+    echo "message-info '${msg//\'/\\\'}'" >> "$QUTE_FIFO"
+}
+die() {
+    error "$*"
+    exit 0
+}
+
+javascript_escape() {
+    # print the first argument in a escaped way, such that it can safely
+    # be used within javascripts double quotes
+    sed "s,[\\\'\"],\\\&,g" <<< "$1"
+}
+
+# ======================================================= #
+# CONFIGURATION
+# ======================================================= #
+# The configuration file is per default located in
+# ~/.config/qutebrowser/password_fill_rc and is a bash script that is loaded
+# later in the present script. So basically you can replace all of the
+# following definitions and make them fit your needs.
+
+# The following simplifies a URL to the domain (e.g. "wiki.qutebrowser.org")
+# which is later used to search the correct entries in the password backend. If
+# you e.g. don't want the "www." to be removed or if you want to distinguish
+# between different paths on the same domain.
+
+simplify_url() {
+    simple_url="${1##*://}" # remove protocol specification
+    simple_url="${simple_url%%\?*}" # remove GET parameters
+    simple_url="${simple_url%%/*}" # remove directory path
+    simple_url="${simple_url%:*}" # remove port
+    simple_url="${simple_url##www.}" # remove www. subdomain
+}
+
+# no_entries_found() is called if the first query_entries() call did not find
+# any matching entries. Multiple implementations are possible:
+# The easiest behavior is to quit:
+#no_entries_found() {
+#    if [ 0 -eq "${#files[@]}" ] ; then
+#        die "No entry found for »$simple_url«"
+#    fi
+#}
+# But you could also fill the files array with all entries from your pass db
+# if the first db query did not find anything
+# no_entries_found() {
+#     if [ 0 -eq "${#files[@]}" ] ; then
+#         query_entries ""
+#         if [ 0 -eq "${#files[@]}" ] ; then
+#             die "No entry found for »$simple_url«"
+#         fi
+#     fi
+# }
+
+# Another behavior is to drop another level of subdomains until search hits
+# are found:
+no_entries_found() {
+    while [ 0 -eq "${#files[@]}" ] && [ -n "$simple_url" ]; do
+        shorter_simple_url=$(sed 's,^[^.]*\.,,' <<< "$simple_url")
+        if [ "$shorter_simple_url" = "$simple_url" ] ; then
+            # if no dot, then even remove the top level domain
+            simple_url=""
+            query_entries "$simple_url"
+            break
+        fi
+        simple_url="$shorter_simple_url"
+        query_entries "$simple_url"
+        #die "No entry found for »$simple_url«"
+        # enforce menu if we do "fuzzy" matching
+        menu_if_one_entry=1
+    done
+    if [ 0 -eq "${#files[@]}" ] ; then
+        die "No entry found for »$simple_url«"
+    fi
+}
+
+# Backend implementations tell, how the actual password store is accessed.
+# Right now, there is only one fully functional password backend, namely for
+# the program "pass".
+# A password backend consists of three actions:
+#  - init() initializes backend-specific things and does sanity checks.
+#  - query_entries() is called with a simplified url and is expected to fill
+#    the bash array $files with the names of matching password entries. There
+#    are no requirements how these names should look like.
+#  - open_entry() is called with some specific entry of the $files array and is
+#    expected to write the username of that entry to the $username variable and
+#    the corresponding password to $password
+
+reset_backend() {
+    init() { true ; }
+    query_entries() { true ; }
+    open_entry() { true ; }
+}
+
+# choose_entry() is expected to choose one entry from the array $files and
+# write it to the variable $file.
+choose_entry() {
+    choose_entry_zenity
+}
+
+# The default implementation chooses a random entry from the array. So if there
+# are multiple matching entries, multiple calls to this userscript will
+# eventually pick the "correct" entry. I.e. if this userscript is bound to
+# "zl", the user has to press "zl" until the correct username shows up in the
+# login form.
+choose_entry_random() {
+    local nr=${#files[@]}
+    file="${files[$((RANDOM % nr))]}"
+    # Warn user, that there might be other matching password entries
+    if [ "$nr" -gt 1 ] ; then
+        msg "Picked $file out of $nr entries: ${files[*]}"
+    fi
+}
+
+# another implementation would be to ask the user via some menu (like rofi or
+# dmenu or zenity or even qutebrowser completion in future?) which entry to
+# pick
+MENU_COMMAND=( head -n 1 )
+# whether to show the menu if there is only one entry in it
+menu_if_one_entry=0
+choose_entry_menu() {
+    local nr=${#files[@]}
+    if [ "$nr" -eq 1 ] && ! ((menu_if_one_entry)) ; then
+        file="${files[0]}"
+    else
+        file=$( printf "%s\n" "${files[@]}" | "${MENU_COMMAND[@]}" )
+    fi
+}
+
+choose_entry_rofi() {
+    MENU_COMMAND=( rofi -p "qutebrowser> " -dmenu
+                        -mesg $'Pick a password entry for <b>'"${QUTE_URL//&/&amp;}"'</b>' )
+    choose_entry_menu || true
+}
+
+choose_entry_zenity() {
+    MENU_COMMAND=( zenity --list --title "Qutebrowser password fill"
+                          --text "Pick the password entry:"
+                          --column "Name" )
+    choose_entry_menu || true
+}
+
+choose_entry_zenity_radio() {
+    zenity_helper() {
+        awk '{ print $0 ; print $0 }'                   \
+        | zenity --list --radiolist                     \
+                 --title "Qutebrowser password fill"    \
+                 --text "Pick the password entry:"      \
+                 --column " " --column "Name"
+    }
+    MENU_COMMAND=( zenity_helper )
+    choose_entry_menu || true
+}
+
+# =======================================================
+# backend: PASS
+
+# configuration options:
+match_filename=1 # whether allowing entry match by filepath
+match_line=0     # whether allowing entry match by URL-Pattern in file
+                 # Note: match_line=1 gets very slow, even for small password stores!
+match_line_pattern='^url: .*' # applied using grep -iE
+user_pattern='^(user|username|login): '
+
+GPG_OPTS=( "--quiet" "--yes" "--compress-algo=none" "--no-encrypt-to" )
+GPG="gpg"
+export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}"
+which gpg2 &>/dev/null && GPG="gpg2"
+[[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" )
+
+pass_backend() {
+    init() {
+        PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
+        if ! [ -d "$PREFIX" ] ; then
+            die "Can not open password store dir »$PREFIX«"
+        fi
+    }
+    query_entries() {
+        local url="$1"
+
+        if ((match_line)) ; then
+            # add entries with matching URL-tag
+            while read -r -d "" passfile ; do
+                if $GPG "${GPG_OPTS}" -d "$passfile" \
+                     | grep --max-count=1 -iE "${match_line_pattern}${url}" > /dev/null
+                then
+                    passfile="${passfile#$PREFIX}"
+                    passfile="${passfile#/}"
+                    files+=( "${passfile%.gpg}" )
+                fi
+            done < <(find -L "$PREFIX" -iname '*.gpg' -print0)
+        fi
+        if ((match_filename)) ; then
+            # add entries with matching filepath
+            while read -r passfile ; do
+                passfile="${passfile#$PREFIX}"
+                passfile="${passfile#/}"
+                files+=( "${passfile%.gpg}" )
+            done < <(find -L "$PREFIX" -iname '*.gpg' | grep "$url")
+        fi
+    }
+    open_entry() {
+        local path="$PREFIX/${1}.gpg"
+        password=""
+        local firstline=1
+        while read -r line ; do
+            if ((firstline)) ; then
+                password="$line"
+                firstline=0
+            else
+                if [[ $line =~ $user_pattern ]] ; then
+                    # remove the matching prefix "user: " from the beginning of the line
+                    username=${line#${BASH_REMATCH[0]}}
+                    break
+                fi
+            fi
+        done < <($GPG "${GPG_OPTS}" -d "$path" )
+    }
+}
+# =======================================================
+
+# =======================================================
+# backend: secret
+secret_backend() {
+    init() {
+        return
+    }
+    query_entries() {
+        local domain="$1"
+        while read -r line ; do
+            if [[ "$line" =~ "attribute.username = " ]] ; then
+                files+=("$domain ${line#${BASH_REMATCH[0]}}")
+            fi
+        done < <( secret-tool search --unlock --all domain "$domain" 2>&1 )
+    }
+    open_entry() {
+        local domain="${1%% *}"
+        username="${1#* }"
+        password=$(secret-tool lookup domain "$domain" username "$username")
+    }
+}
+# =======================================================
+
+# load some sane default backend
+reset_backend
+pass_backend
+# load configuration
+QUTE_CONFIG_DIR=${QUTE_CONFIG_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/qutebrowser/}
+PWFILL_CONFIG=${PWFILL_CONFIG:-${QUTE_CONFIG_DIR}/password_fill_rc}
+if [ -f "$PWFILL_CONFIG" ] ; then
+    source "$PWFILL_CONFIG"
+fi
+init
+
+simplify_url "$QUTE_URL"
+query_entries "${simple_url}"
+no_entries_found
+# remove duplicates
+mapfile -t files < <(printf "%s\n" "${files[@]}" | sort | uniq )
+choose_entry
+if [ -z "$file" ] ; then
+    # choose_entry didn't want any of these entries
+    exit 0
+fi
+open_entry "$file"
+#username="$(date)"
+#password="XYZ"
+#msg "$username, ${#password}"
+
+[ -n "$username" ] || die "Username not set in entry $file"
+[ -n "$password" ] || die "Password not set in entry $file"
+
+js() {
+cat <<EOF
+    function hasPasswordField(form) {
+        var inputs = form.getElementsByTagName("input");
+        for (var j = 0; j < inputs.length; j++) {
+            var input = inputs[j];
+            if (input.type == "password") {
+                return true;
+            }
+        }
+        return false;
+    };
+    function loadData2Form (form) {
+        var inputs = form.getElementsByTagName("input");
+        for (var j = 0; j < inputs.length; j++) {
+            var input = inputs[j];
+            if (input.type == "text" || input.type == "email") {
+                input.value = "$(javascript_escape "${username}")";
+            }
+            if (input.type == "password") {
+                input.value = "$(javascript_escape "${password}")";
+            }
+        }
+    };
+
+    var forms = document.getElementsByTagName("form");
+    for (i = 0; i < forms.length; i++) {
+        if (hasPasswordField(forms[i])) {
+            loadData2Form(forms[i]);
+        }
+    }
+EOF
+}
+
+printjs() {
+    js | sed 's,//.*$,,' | tr '\n' ' '
+}
+echo "jseval -q $(printjs)" >> "$QUTE_FIFO"

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
+#
+# Behavior:
+#   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

@@ -1,27 +1,22 @@
 [pytest]
 norecursedirs = .tox .venv
+addopts = --strict -rfEw --faulthandler-timeout=70 --instafail
 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.
+    no_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
+    integration: Tests which test a bigger portion of code
+    end2end: End to end tests which run qutebrowser as subprocess
+    pyqt531_or_newer: Needs PyQt 5.3.1 or newer.
+    xfail_norun: xfail the test with out running it
+    ci: Tests which should only run on CI.
+    flaky_once: Try to rerun this test once if it fails
 qt_log_level_fail = WARNING
 qt_log_ignore =
     ^SpellCheck: .*
@@ -29,4 +24,19 @@ qt_log_ignore =
     ^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
+    ^"Method \\"GetAll\\" with signature \\"s\\" on interface \\"org\.freedesktop\.DBus\.Properties\\" doesn't exist\\n"
+    ^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
+    ^QGeoclueMaster error creating GeoclueMasterClient\.
+    ^Geoclue error: Process org\.freedesktop\.Geoclue\.Master exited with status 127
+    ^QObject::connect: Cannot connect \(null\)::stateChanged\(QNetworkSession::State\) to QNetworkReplyHttpImpl::_q_networkSessionStateChanged\(QNetworkSession::State\)
+    ^QXcbClipboard: Cannot transfer data, no data available
+    ^Image of format '' blocked because it is not considered safe. If you are sure it is safe to do so, you can white-list the format by setting the environment variable QTWEBKIT_IMAGEFORMAT_WHITELIST=
+qt_wait_signal_raising = true
+xfail_strict = true

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, 4, 0)
-__version__ = '.'.join(map(str, __version_info__))
+__version_info__ = (0, 7, 0)
+__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/app.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,18 +29,20 @@ import shutil
 import tempfile
 import atexit
 import datetime
+import tokenize
 
-from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWidgets import QApplication, QWidget
+from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon, QCursor, QWindow
 from PyQt5.QtCore import (pyqtSlot, qInstallMessageHandler, QTimer, QUrl,
-                          QObject, Qt, QEvent)
+                          QObject, Qt, QEvent, pyqtSignal)
 try:
     import hunter
 except ImportError:
     hunter = None
 
 import qutebrowser
-import qutebrowser.resources  # pylint: disable=unused-import
+import qutebrowser.resources
 from qutebrowser.completion.models import instances as completionmodels
 from qutebrowser.commands import cmdutils, runners, cmdexc
 from qutebrowser.config import style, config, websettings, configexc
@@ -58,8 +60,7 @@ qApp = None
 
 
 def run(args):
-    """Initialize everthing and run the application."""
-    # pylint: disable=too-many-statements
+    """Initialize everything and run the application."""
     if args.version:
         print(version.version(short=True))
         print()
@@ -102,8 +103,9 @@ def run(args):
     if server is None:
         sys.exit(usertypes.Exit.ok)
     else:
-        server.got_args.connect(lambda args, cwd:
-                                process_pos_args(args, cwd=cwd, via_ipc=True))
+        server.got_args.connect(lambda args, target_arg, cwd:
+                                process_pos_args(args, cwd=cwd, via_ipc=True,
+                                                 target_arg=target_arg))
 
     init(args, crash_handler)
     ret = qt_mainloop()
@@ -163,11 +165,14 @@ def init(args, crash_handler):
 def _init_icon():
     """Initialize the icon of qutebrowser."""
     icon = QIcon()
+    fallback_icon = QIcon()
     for size in (16, 24, 32, 48, 64, 96, 128, 256, 512):
         filename = ':/icons/qutebrowser-{}x{}.png'.format(size, size)
         pixmap = QPixmap(filename)
         qtutils.ensure_not_null(pixmap)
-        icon.addPixmap(pixmap)
+        fallback_icon.addPixmap(pixmap)
+    qtutils.ensure_not_null(fallback_icon)
+    icon = QIcon.fromTheme('qutebrowser', fallback_icon)
     qtutils.ensure_not_null(icon)
     qApp.setWindowIcon(icon)
 
@@ -228,7 +233,7 @@ def _load_session(name):
         session_manager.delete('_restart')
 
 
-def process_pos_args(args, via_ipc=False, cwd=None):
+def process_pos_args(args, via_ipc=False, cwd=None, target_arg=None):
     """Process positional commandline args.
 
     URLs to open have no prefix, commands to execute begin with a colon.
@@ -237,6 +242,9 @@ def process_pos_args(args, via_ipc=False, cwd=None):
         args: A list of arguments to process.
         via_ipc: Whether the arguments were transmitted over IPC.
         cwd: The cwd to use for fuzzy_url.
+        target_arg: Command line argument received by a running instance via
+                    ipc. If the --target argument was not specified, target_arg
+                    will be an empty string.
     """
     if via_ipc and not args:
         win_id = mainwindow.get_window(via_ipc, force_window=True)
@@ -247,26 +255,32 @@ def process_pos_args(args, via_ipc=False, cwd=None):
         if cmd.startswith(':'):
             if win_id is None:
                 win_id = mainwindow.get_window(via_ipc, force_tab=True)
-            log.init.debug("Startup cmd {}".format(cmd))
+            log.init.debug("Startup cmd {!r}".format(cmd))
             commandrunner = runners.CommandRunner(win_id)
             commandrunner.run_safely_init(cmd[1:])
         elif not cmd:
             log.init.debug("Empty argument")
             win_id = mainwindow.get_window(via_ipc, force_window=True)
         else:
-            win_id = mainwindow.get_window(via_ipc)
+            if via_ipc and target_arg and target_arg != 'auto':
+                open_target = target_arg
+            else:
+                open_target = config.get('general', 'new-instance-open-target')
+            win_id = mainwindow.get_window(via_ipc, force_target=open_target)
             tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                         window=win_id)
             log.init.debug("Startup URL {}".format(cmd))
+            if not cwd:  # could also be an empty string due to the PyQt signal
+                cwd = None
             try:
                 url = urlutils.fuzzy_url(cmd, cwd, relative=True)
             except urlutils.InvalidUrlError as e:
                 message.error('current', "Error in startup argument '{}': "
                               "{}".format(cmd, e))
             else:
-                open_target = config.get('general', 'new-instance-open-target')
                 background = open_target in ('tab-bg', 'tab-bg-silent')
-                tabbed_browser.tabopen(url, background=background)
+                tabbed_browser.tabopen(url, background=background,
+                                       explicit=True)
 
 
 def _open_startpage(win_id=None):
@@ -326,20 +340,21 @@ def _save_version():
     state_config['general']['version'] = qutebrowser.__version__
 
 
+@pyqtSlot('QWidget*', 'QWidget*')
 def on_focus_changed(_old, new):
     """Register currently focused main window in the object registry."""
-    if new is None:
-        window = None
-    else:
-        window = new.window()
-    if window is None or not isinstance(window, mainwindow.MainWindow):
+    if not isinstance(new, QWidget):
+        log.misc.debug("on_focus_changed called with non-QWidget {!r}".format(
+            new))
+
+    if new is None or not isinstance(new, mainwindow.MainWindow):
         try:
             objreg.delete('last-focused-main-window')
         except KeyError:
             pass
         qApp.restoreOverrideCursor()
     else:
-        objreg.register('last-focused-main-window', window, update=True)
+        objreg.register('last-focused-main-window', new.window(), update=True)
         _maybe_hide_mouse_cursor()
 
 
@@ -411,32 +426,38 @@ def _init_modules(args, crash_handler):
     proxy.init()
     log.init.debug("Initializing cookies...")
     cookie_jar = cookies.CookieJar(qApp)
+    ram_cookie_jar = cookies.RAMCookieJar(qApp)
     objreg.register('cookie-jar', cookie_jar)
+    objreg.register('ram-cookie-jar', ram_cookie_jar)
     log.init.debug("Initializing cache...")
-    diskcache = cache.DiskCache(qApp)
+    diskcache = cache.DiskCache(standarddir.cache(), parent=qApp)
     objreg.register('cache', diskcache)
     log.init.debug("Initializing completions...")
     completionmodels.init()
     log.init.debug("Misc initialization...")
+    if config.get('ui', 'hide-wayland-decoration'):
+        os.environ['QT_WAYLAND_DISABLE_WINDOWDECORATION'] = '1'
+    else:
+        os.environ.pop('QT_WAYLAND_DISABLE_WINDOWDECORATION', None)
     _maybe_hide_mouse_cursor()
     objreg.get('config').changed.connect(_maybe_hide_mouse_cursor)
 
 
 def _init_late_modules(args):
     """Initialize modules which can be inited after the window is shown."""
-    try:
-        log.init.debug("Reading web history...")
-        reader = objreg.get('web-history').async_read()
-        with debug.log_time(log.init, 'Reading history'):
-            while True:
-                QApplication.processEvents()
+    log.init.debug("Reading web history...")
+    reader = objreg.get('web-history').async_read()
+    with debug.log_time(log.init, 'Reading history'):
+        while True:
+            QApplication.processEvents()
+            try:
                 next(reader)
-    except StopIteration:
-        pass
-    except (OSError, UnicodeDecodeError) as e:
-        error.handle_fatal_exc(e, args, "Error while initializing!",
-                               pre_text="Error while initializing")
-        sys.exit(usertypes.Exit.err_init)
+            except StopIteration:
+                break
+            except (OSError, UnicodeDecodeError) as e:
+                error.handle_fatal_exc(e, args, "Error while initializing!",
+                                       pre_text="Error while initializing")
+                sys.exit(usertypes.Exit.err_init)
 
 
 class Quitter:
@@ -463,6 +484,25 @@ class Quitter:
         """Slot which gets invoked when the last window was closed."""
         self.shutdown(last_window=True)
 
+    def _compile_modules(self):
+        """Compile all modules to catch SyntaxErrors."""
+        if os.path.basename(sys.argv[0]) == 'qutebrowser':
+            # Launched via launcher script
+            return
+        elif hasattr(sys, 'frozen'):
+            return
+        else:
+            path = os.path.abspath(os.path.dirname(qutebrowser.__file__))
+            if not os.path.isdir(path):
+                # Probably running from an python egg.
+                return
+
+        for dirpath, _dirnames, filenames in os.walk(path):
+            for fn in filenames:
+                if os.path.splitext(fn)[1] == '.py' and os.path.isfile(fn):
+                    with tokenize.open(os.path.join(dirpath, fn)) as f:
+                        compile(f.read(), fn, 'exec')
+
     def _get_restart_args(self, pages=(), session=None):
         """Get the current working directory and args to relaunch qutebrowser.
 
@@ -514,6 +554,10 @@ class Quitter:
         else:
             argdict['session'] = session
             argdict['override_restore'] = False
+        # Ensure :restart works with --temp-basedir
+        argdict['temp_basedir'] = False
+        argdict['temp_basedir_restarted'] = True
+
         # Dump the data
         data = json.dumps(argdict)
         args += ['--json-args', data]
@@ -531,8 +575,12 @@ class Quitter:
         except sessions.SessionError as e:
             log.destroy.exception("Failed to save session!")
             raise cmdexc.CommandError("Failed to save session: {}!".format(e))
+        except SyntaxError as e:
+            log.destroy.exception("Got SyntaxError")
+            raise cmdexc.CommandError("SyntaxError in {}:{}: {}".format(
+                e.filename, e.lineno, e))
         if ok:
-            self.shutdown()
+            self.shutdown(restart=True)
 
     def restart(self, pages=(), session=None):
         """Inner logic to restart qutebrowser.
@@ -551,6 +599,7 @@ class Quitter:
         Return:
             True if the restart succeeded, False otherwise.
         """
+        self._compile_modules()
         log.destroy.debug("sys.executable: {}".format(sys.executable))
         log.destroy.debug("sys.path: {}".format(sys.path))
         log.destroy.debug("sys.argv: {}".format(sys.argv))
@@ -574,7 +623,8 @@ class Quitter:
 
     @cmdutils.register(instance='quitter', name=['quit', 'q'],
                        ignore_args=True)
-    def shutdown(self, status=0, session=None, last_window=False):
+    def shutdown(self, status=0, session=None, last_window=False,
+                 restart=False):
         """Quit qutebrowser.
 
         Args:
@@ -582,6 +632,7 @@ class Quitter:
             session: A session name if saving should be forced.
             last_window: If the shutdown was triggered due to the last window
                             closing.
+            restart: If we're planning to restart.
         """
         if self._shutting_down:
             return
@@ -611,13 +662,14 @@ class Quitter:
             # in the real main event loop, or we'll get a segfault.
             log.destroy.debug("Deferring real shutdown because question was "
                               "active.")
-            QTimer.singleShot(0, functools.partial(self._shutdown, status))
+            QTimer.singleShot(0, functools.partial(self._shutdown, status,
+                                                   restart=restart))
         else:
             # If we have no questions to shut down, we are already in the real
             # event loop, so we can shut down immediately.
-            self._shutdown(status)
+            self._shutdown(status, restart=restart)
 
-    def _shutdown(self, status):
+    def _shutdown(self, status, restart):
         """Second stage of shutdown."""
         log.destroy.debug("Stage 2 of shutting down...")
         if qApp is None:
@@ -650,14 +702,20 @@ class Quitter:
                     error.handle_fatal_exc(
                         e, self._args, "Error while saving!",
                         pre_text="Error while saving {}".format(key))
+        # Disable storage so removing tempdir will work
+        QWebSettings.setIconDatabasePath('')
+        QWebSettings.setOfflineWebApplicationCachePath('')
+        QWebSettings.globalSettings().setLocalStoragePath('')
         # Re-enable faulthandler to stdout, then remove crash log
         log.destroy.debug("Deactivating crash log...")
         objreg.get('crash-handler').destroy_crashlogfile()
         # Delete temp basedir
-        if self._args.temp_basedir:
-            atexit.register(shutil.rmtree, self._args.basedir)
+        if ((self._args.temp_basedir or self._args.temp_basedir_restarted) and
+                not restart):
+            atexit.register(shutil.rmtree, self._args.basedir,
+                            ignore_errors=True)
         # If we don't kill our custom handler here we might get segfaults
-        log.destroy.debug("Deactiving message handler...")
+        log.destroy.debug("Deactivating message handler...")
         qInstallMessageHandler(None)
         # Now we can hopefully quit without segfaults
         log.destroy.debug("Deferring QApplication::exit...")
@@ -666,8 +724,8 @@ class Quitter:
         # segfaults.
         QTimer.singleShot(0, functools.partial(qApp.exit, status))
 
-    @cmdutils.register(instance='quitter', name='wq',
-                       completion=[usertypes.Completion.sessions])
+    @cmdutils.register(instance='quitter', name='wq')
+    @cmdutils.argument('name', completion=usertypes.Completion.sessions)
     def save_and_quit(self, name=sessions.default):
         """Save open pages and quit.
 
@@ -685,6 +743,8 @@ class Application(QApplication):
         _args: ArgumentParser instance.
     """
 
+    new_window = pyqtSignal(mainwindow.MainWindow)
+
     def __init__(self, args):
         """Constructor.
 
@@ -702,6 +762,12 @@ class Application(QApplication):
         objreg.register('app', self)
 
         self.launch_time = datetime.datetime.now()
+        self.focusObjectChanged.connect(self.on_focus_object_changed)
+
+    @pyqtSlot(QObject)
+    def on_focus_object_changed(self, obj):
+        """Log when the focus object changed."""
+        log.misc.debug("Focus object changed: {!r}".format(obj))
 
     def __repr__(self):
         return utils.get_repr(self)
@@ -770,12 +836,9 @@ class EventFilter(QObject):
         Return:
             True if the event should be filtered, False if it's passed through.
         """
-        if qApp.overrideCursor() is None:
-            # Mouse cursor shown -> don't filter event
-            return False
-        else:
-            # Mouse cursor hidden -> filter event
-            return True
+        # Mouse cursor shown (overrideCursor None) -> don't filter event
+        # Mouse cursor hidden (overrideCursor not None) -> filter event
+        return qApp.overrideCursor() is not None
 
     def eventFilter(self, obj, event):
         """Handle an event.

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,6 +24,7 @@ import os.path
 import functools
 import posixpath
 import zipfile
+import fnmatch
 
 from qutebrowser.config import config
 from qutebrowser.utils import objreg, standarddir, log, message
@@ -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,10 +91,12 @@ 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.
+        _config_blocked_hosts: A set of blocked hosts from ~/.config.
         _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.
+        _local_hosts_file: The path to the blocked-hosts file.
+        _config_hosts_file: The path to a blocked-hosts in ~/.config
 
     Class attributes:
         WHITELISTED: Hosts which never should be blocked.
@@ -87,41 +106,90 @@ class HostBlocker:
                    'local')
 
     def __init__(self):
-        self.blocked_hosts = set()
+        self._blocked_hosts = set()
+        self._config_blocked_hosts = set()
         self._in_progress = []
         self._done_count = 0
+
         data_dir = standarddir.data()
         if data_dir is None:
-            self._hosts_file = None
+            self._local_hosts_file = None
         else:
-            self._hosts_file = os.path.join(data_dir, 'blocked-hosts')
+            self._local_hosts_file = os.path.join(data_dir, 'blocked-hosts')
+        self.on_config_changed()
+
+        config_dir = standarddir.config()
+        if config_dir is None:
+            self._config_hosts_file = None
+        else:
+            self._config_hosts_file = os.path.join(config_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 or
+                 host in self._config_blocked_hosts) and
+                not is_whitelisted_host(host))
+
+    def _read_hosts_file(self, filename, target):
+        """Read hosts from the given filename.
+
+        Args:
+            filename: The file to read.
+            target: The set to store the hosts in.
+
+        Return:
+            True if a read was attempted, False otherwise
+        """
+        if filename is None or not os.path.exists(filename):
+            return False
+
+        try:
+            with open(filename, 'r', encoding='utf-8') as f:
+                for line in f:
+                    target.add(line.strip())
+        except OSError:
+            log.misc.exception("Failed to read host blocklist!")
+
+        return True
+
     def read_hosts(self):
         """Read hosts from the existing blocked-hosts file."""
-        self.blocked_hosts = set()
-        if self._hosts_file is None:
+        self._blocked_hosts = set()
+
+        if self._local_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())
-            except OSError:
-                log.misc.exception("Failed to read host blocklist!")
-        else:
+
+        self._read_hosts_file(self._config_hosts_file,
+                              self._config_blocked_hosts)
+
+        found = self._read_hosts_file(self._local_hosts_file,
+                                      self._blocked_hosts)
+
+        if not found:
             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', win_id='win_id')
+    @cmdutils.register(instance='host-blocker')
+    @cmdutils.argument('win_id', win_id=True)
     def adblock_update(self, win_id):
-        """Update the adblock block lists."""
-        if self._hosts_file is None:
+        """Update the adblock block lists.
+
+        This updates ~/.local/share/qutebrowser/blocked-hosts with downloaded
+        host lists and re-reads ~/.config/qutebrowser/blocked-hosts.
+        """
+        self._read_hosts_file(self._config_hosts_file,
+                              self._config_blocked_hosts)
+        if self._local_hosts_file is None:
             raise cmdexc.CommandError("No data storage is configured!")
-        self.blocked_hosts = set()
+        self._blocked_hosts = set()
         self._done_count = 0
         urls = config.get('content', 'host-block-lists')
         download_manager = objreg.get('download-manager', scope='window',
@@ -189,7 +257,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(
@@ -197,21 +265,23 @@ 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):
+        with open(self._local_hosts_file, 'w', encoding='utf-8') as f:
+            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):
         """Update files when the config changed."""
         urls = config.get('content', 'host-block-lists')
-        if urls is None:
+        if urls is None and self._local_hosts_file is not None:
             try:
-                os.remove(self._hosts_file)
-            except OSError:
-                log.misc.exception("Failed to delete hosts file.")
+                os.remove(self._local_hosts_file)
+            except FileNotFoundError:
+                pass
+            except OSError as e:
+                log.misc.exception("Failed to delete hosts file: {}".format(e))
 
     def on_download_finished(self, download):
         """Check if all downloads are finished and if so, trigger reading.

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.
 #
@@ -25,26 +25,31 @@ 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.
 
+    If the cache is deactivated via the command line argument --cachedir="",
+    both attributes _cache_dir and _http_cache_dir are set to None.
+
     Attributes:
         _activated: Whether the cache should be used.
+        _cache_dir: The base directory for cache files (standarddir.cache()) or
+                    None.
+        _http_cache_dir: the HTTP subfolder in _cache_dir or None.
     """
 
-    def __init__(self, parent=None):
+    def __init__(self, cache_dir, parent=None):
         super().__init__(parent)
-        cache_dir = standarddir.cache()
-        if config.get('general', 'private-browsing') or cache_dir is None:
-            self._activated = False
+        self._cache_dir = cache_dir
+        if cache_dir is None:
+            self._http_cache_dir = None
         else:
-            self._activated = True
-            self.setCacheDirectory(os.path.join(standarddir.cache(), 'http'))
-        self.setMaximumCacheSize(config.get('storage', 'cache-size'))
+            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):
@@ -52,19 +57,24 @@ class DiskCache(QNetworkDiskCache):
                               maxsize=self.maximumCacheSize(),
                               path=self.cacheDirectory())
 
+    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', 'private-browsing'):
-            if (config.get('general', 'private-browsing') or
-                    standarddir.cache() is None):
-                self._activated = False
-            else:
-                self._activated = True
-                self.setCacheDirectory(
-                    os.path.join(standarddir.cache(), 'http'))
+        elif (section, option) == ('general',  # pragma: no branch
+                                   'private-browsing'):
+            self._maybe_activate()
 
     def cacheSize(self):
         """Return the current size taken up by the cache.

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,19 +68,27 @@ 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:

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.
 #
@@ -27,6 +27,7 @@ import shutil
 import functools
 import collections
 
+import sip
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QTimer,
                           Qt, QVariant, QAbstractListModel, QModelIndex, QUrl)
 from PyQt5.QtGui import QDesktopServices
@@ -48,8 +49,10 @@ ModelRole = usertypes.enum('ModelRole', ['item'], start=Qt.UserRole,
 
 RetryInfo = collections.namedtuple('RetryInfo', ['request', 'manager'])
 
+DownloadPath = collections.namedtuple('DownloadPath', ['filename', 'question'])
+
 # Remember the last used directory
-_last_used_directory = None
+last_used_directory = None
 
 
 # All REFRESH_INTERVAL milliseconds, speeds will be recalculated and downloads
@@ -57,20 +60,20 @@ _last_used_directory = None
 REFRESH_INTERVAL = 500
 
 
-def _download_dir():
+def download_dir():
     """Get the download directory to use."""
     directory = config.get('storage', 'download-directory')
     remember_dir = config.get('storage', 'remember-download-directory')
 
-    if remember_dir and _last_used_directory is not None:
-        return _last_used_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:
@@ -79,15 +82,83 @@ 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)
-    else:
+        return os.path.join(download_dir(), filename)
+    else:  # pragma: no cover
         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.
+    """
+    # Remove chars which can't be encoded in the filename encoding.
+    # See https://github.com/The-Compiler/qutebrowser/issues/427
+    encoding = sys.getfilesystemencoding()
+    filename = utils.force_encoding(filename, encoding)
+    basename = utils.force_encoding(basename, encoding)
+    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.
@@ -156,7 +227,7 @@ class DownloadItemStats(QObject):
         else:
             return remaining_bytes / avg
 
-    @pyqtSlot(int, int)
+    @pyqtSlot('qint64', 'qint64')
     def on_download_progress(self, bytes_done, bytes_total):
         """Update local variables when the download progress changed.
 
@@ -201,6 +272,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
@@ -255,6 +327,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)
@@ -339,6 +412,8 @@ class DownloadItem(QObject):
         self.reply = None
         self.done = True
         self.data_changed.emit()
+        if self.fileobj is not None:
+            self.fileobj.close()
 
     def init_reply(self, reply):
         """Set a new reply and connect its signals.
@@ -354,6 +429,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:
@@ -383,8 +459,8 @@ class DownloadItem(QObject):
         elif self.stats.percentage() is None:
             return start
         else:
-            return utils.interpolate_color(
-                start, stop, self.stats.percentage(), system)
+            return utils.interpolate_color(start, stop,
+                                           self.stats.percentage(), system)
 
     @pyqtSlot()
     def cancel(self, remove_data=True):
@@ -420,6 +496,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)
@@ -442,23 +520,38 @@ 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:
+        global last_used_directory
+        if self.fileobj is not None:  # pragma: no cover
             raise ValueError("fileobj was already set! filename: {}, "
                              "existing: {}, fileobj {}".format(
                                  filename, self._filename, self.fileobj))
         filename = os.path.expanduser(filename)
-        # Remove chars which can't be encoded in the filename encoding.
-        # 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))
 
-        _last_used_directory = os.path.dirname(self._filename)
+        # At this point, we have a misconfigured XDG_DOWNLOAD_DIR, as
+        # download_dir() + filename is still no absolute path.
+        # The config value is checked for "absoluteness", but
+        # ~/.config/user-dirs.dirs may be misconfigured and a non-absolute path
+        # may be set for XDG_DOWNLOAD_DIR
+        if self._filename is None:
+            message.error(
+                self._win_id,
+                "XDG_DOWNLOAD_DIR points to a relative path - please check"
+                " your ~/.config/user-dirs.dirs. The download is saved in"
+                " your home directory.",
+            )
+            # fall back to $HOME as download_dir
+            self._filename = create_full_filename(
+                self.basename, os.path.expanduser(os.path.join('~', 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):
@@ -467,40 +560,21 @@ class DownloadItem(QObject):
             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)):
+        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.
 
         Args:
             fileobj: A file-like object.
         """
-        if self.fileobj is not None:
+        if self.fileobj is not None:  # pragma: no cover
             raise ValueError("fileobj was already set! Old: {}, new: "
                              "{}".format(self.fileobj, fileobj))
         self.fileobj = fileobj
@@ -574,7 +648,7 @@ class DownloadItem(QObject):
         except OSError as e:
             self._die(e.strerror)
 
-    @pyqtSlot(int)
+    @pyqtSlot('QNetworkReply::NetworkError')
     def on_reply_error(self, code):
         """Handle QNetworkReply errors."""
         if code == QNetworkReply.OperationCanceledError:
@@ -591,6 +665,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.
 
@@ -649,15 +732,10 @@ class DownloadManager(QAbstractListModel):
     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):
@@ -706,19 +784,41 @@ class DownloadManager(QAbstractListModel):
 
             If not, None.
         """
-        if fileobj is not None and filename is not None:
+        if fileobj is not None and filename is not None:  # pragma: no cover
             raise TypeError("Only one of fileobj/filename may be given!")
         # WORKAROUND for Qt corrupting data loaded from cache:
         # https://bugreports.qt.io/browse/QTBUG-42757
         request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
                              QNetworkRequest.AlwaysNetwork)
-        suggested_fn = urlutils.filename_from_url(request.url())
 
-        if prompt_download_directory is None:
-            prompt_download_directory = config.get(
-                'storage', 'prompt-download-directory')
-        if not prompt_download_directory and not fileobj:
-            filename = config.get('storage', 'download-directory')
+        if request.url().scheme().lower() != 'data':
+            suggested_fn = urlutils.filename_from_url(request.url())
+        else:
+            # We might be downloading a binary blob embedded on a page or even
+            # generated dynamically via javascript. We try to figure out a more
+            # sensible name than the base64 content of the data.
+            origin = request.originatingObject()
+            try:
+                origin_url = origin.url()
+            except AttributeError:
+                # Raised either if origin is None or some object that doesn't
+                # have its own url. We're probably fine with a default fallback
+                # then.
+                suggested_fn = 'binary blob'
+            else:
+                # Use the originating URL as a base for the filename (works
+                # e.g. for pdf.js).
+                suggested_fn = urlutils.filename_from_url(origin_url)
+
+        if suggested_fn is None:
+            suggested_fn = 'qutebrowser-download'
+
+        # 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,
@@ -726,21 +826,13 @@ class DownloadManager(QAbstractListModel):
                                       filename=filename,
                                       suggested_filename=suggested_fn,
                                       **kwargs)
-        if suggested_fn is None:
-            suggested_fn = 'qutebrowser-download'
-        else:
-            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)
         q.answered.connect(
             lambda fn: self.fetch_request(request,
                                           filename=fn,
                                           suggested_filename=suggested_fn,
                                           **kwargs))
-        message_bridge.ask(q, blocking=False)
+        self._postprocess_question(q)
+        q.ask()
         return None
 
     def fetch_request(self, request, *, page=None, **kwargs):
@@ -771,12 +863,12 @@ 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.
         """
-        if fileobj is not None and filename is not None:
+        if fileobj is not None and filename is not None:  # pragma: no cover
             raise TypeError("Only one of fileobj/filename may be given!")
         if not suggested_filename:
             if filename is not None:
@@ -790,17 +882,23 @@ 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)
         download.redirected.connect(
             functools.partial(self.on_redirect, download))
         download.basename = suggested_filename
-        idx = len(self.downloads) + 1
-        download.index = idx
+        idx = len(self.downloads)
+        download.index = idx + 1  # "Human readable" index
         self.beginInsertRows(QModelIndex(), idx, idx)
         self.downloads.append(download)
         self.endInsertRows()
@@ -808,26 +906,33 @@ class DownloadManager(QAbstractListModel):
         if not self._update_timer.isActive():
             self._update_timer.start()
 
-        prompt_download_directory = config.get('storage',
-                                               'prompt-download-directory')
-        if not prompt_download_directory and not fileobj:
-            filename = config.get('storage', 'download-directory')
+        if fileobj is not None:
+            download.set_fileobj(fileobj)
+            download.autoclose = False
+            return download
 
         if filename is not None:
             download.set_filename(filename)
-        elif 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
+
+        # 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
 
@@ -841,32 +946,40 @@ 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',
-                       count='count')
-    def download_cancel(self, count=0):
+    @cmdutils.register(instance='download-manager', scope='window')
+    @cmdutils.argument('count', count=True)
+    def download_cancel(self, all_=False, count=0):
         """Cancel the last/[count]th download.
 
         Args:
+            all_: Cancel all running downloads
             count: The index of the download to cancel.
         """
-        try:
-            download = self.downloads[count - 1]
-        except IndexError:
-            self.raise_no_download(count)
-        if download.done:
-            if not count:
-                count = len(self.downloads)
-            raise cmdexc.CommandError("Download {} is already done!"
-                                      .format(count))
-        download.cancel()
+        if all_:
+            # We need to make a copy as we're indirectly mutating
+            # self.downloads here
+            for download in self.downloads[:]:
+                if not download.done:
+                    download.cancel()
+        else:
+            try:
+                download = self.downloads[count - 1]
+            except IndexError:
+                self.raise_no_download(count)
+            if download.done:
+                if not count:
+                    count = len(self.downloads)
+                raise cmdexc.CommandError("Download {} is already done!"
+                                        .format(count))
+            download.cancel()
 
-    @cmdutils.register(instance='download-manager', scope='window',
-                       count='count')
+    @cmdutils.register(instance='download-manager', scope='window')
+    @cmdutils.argument('count', count=True)
     def download_delete(self, count=0):
         """Delete the last/[count]th download from disk.
 
         Args:
-            count: The index of the download to cancel.
+            count: The index of the download to delete.
         """
         try:
             download = self.downloads[count - 1]
@@ -878,25 +991,15 @@ class DownloadManager(QAbstractListModel):
             raise cmdexc.CommandError("Download {} is not done!".format(count))
         download.delete()
         self.remove_item(download)
+        log.downloads.debug("deleted download {}".format(download))
 
-    @cmdutils.register(instance='download-manager', scope='window',
-                       deprecated="Use :download-cancel instead.",
-                       count='count')
-    def cancel_download(self, 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',
-                       count='count')
+    @cmdutils.register(instance='download-manager', scope='window')
+    @cmdutils.argument('count', count=True)
     def download_open(self, count=0):
         """Open the last/[count]th download.
 
         Args:
-            count: The index of the download to cancel.
+            count: The index of the download to open.
         """
         try:
             download = self.downloads[count - 1]
@@ -908,6 +1011,31 @@ class DownloadManager(QAbstractListModel):
             raise cmdexc.CommandError("Download {} is not done!".format(count))
         download.open_file()
 
+    @cmdutils.register(instance='download-manager', scope='window')
+    @cmdutils.argument('count', count=True)
+    def download_retry(self, count=0):
+        """Retry the first failed/[count]th download.
+
+        Args:
+            count: The index of the download to retry.
+        """
+        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.
@@ -963,18 +1091,23 @@ class DownloadManager(QAbstractListModel):
         """Check if there are finished downloads to clear."""
         return any(download.done for download in self.downloads)
 
-    @cmdutils.register(instance='download-manager', scope='window',
-                       count='count')
+    @cmdutils.register(instance='download-manager', scope='window')
+    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')
+    @cmdutils.argument('count', count=True)
     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.
-            count: The index of the download to cancel.
+            all_: Remove all finished downloads.
+            count: The index of the download to remove.
         """
         if all_:
-            finished_items = [d for d in self.downloads if d.done]
-            self.remove_items(finished_items)
+            self.download_clear()
         else:
             try:
                 download = self.downloads[count - 1]
@@ -998,6 +1131,9 @@ class DownloadManager(QAbstractListModel):
 
     def remove_item(self, download):
         """Remove a given download."""
+        if sip.isdeleted(self):
+            # https://github.com/The-Compiler/qutebrowser/issues/1242
+            return
         try:
             idx = self.downloads.index(download)
         except ValueError:
@@ -1011,6 +1147,10 @@ class DownloadManager(QAbstractListModel):
         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."""
         # On the first pass, we only generate the indices so we get the
@@ -1088,7 +1228,8 @@ class DownloadManager(QAbstractListModel):
     def flags(self, _index):
         """Override flags so items aren't selectable.
 
-        The default would be Qt.ItemIsEnabled | Qt.ItemIsSelectable."""
+        The default would be Qt.ItemIsEnabled | Qt.ItemIsSelectable.
+        """
         return Qt.ItemIsEnabled | Qt.ItemNeverHasChildren
 
     def rowCount(self, parent=QModelIndex()):
@@ -1097,3 +1238,11 @@ class DownloadManager(QAbstractListModel):
             # We don't have children
             return 0
         return len(self.downloads)
+
+    def running_downloads(self):
+        """Return the amount of still running downloads.
+
+        Return:
+            The number of unfinished downloads.
+        """
+        return sum(1 for download in self.downloads if not download.done)

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 {
@@ -79,6 +79,7 @@ class DownloadView(QListView):
         self.setResizeMode(QListView.Adjust)
         self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Fixed)
+        self.setFocusPolicy(Qt.NoFocus)
         self.setFlow(QListView.LeftToRight)
         self.setSpacing(1)
         self._menu = None
@@ -125,6 +126,7 @@ class DownloadView(QListView):
                 - (QAction, callable) tuples.
                 - (None, None) for a separator
         """
+        model = self.model()
         actions = []
         if item is None:
             pass
@@ -134,13 +136,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.
 #
@@ -19,14 +19,15 @@
 
 """A HintManager to draw hints over links."""
 
-import math
-import functools
 import collections
+import functools
+import math
+import re
+from string import ascii_lowercase
 
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QEvent, Qt, QUrl,
                           QTimer)
-from PyQt5.QtGui import QMouseEvent, QClipboard
-from PyQt5.QtWidgets import QApplication
+from PyQt5.QtGui import QMouseEvent
 from PyQt5.QtWebKit import QWebElement
 from PyQt5.QtWebKitWidgets import QWebPage
 
@@ -34,17 +35,21 @@ from qutebrowser.config import config
 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
+from qutebrowser.utils import usertypes, log, qtutils, message, objreg, utils
 
 
 ElemTuple = collections.namedtuple('ElemTuple', ['elem', 'label'])
 
 
-Target = usertypes.enum('Target', ['normal', 'tab', 'tab_fg', 'tab_bg',
-                                   'window', 'yank', 'yank_primary', 'run',
-                                   'fill', 'hover', 'rapid', 'rapid_win',
-                                   'download', 'userscript', 'spawn'])
+Target = usertypes.enum('Target', ['normal', 'current', 'tab', 'tab_fg',
+                                   'tab_bg', 'window', 'yank', 'yank_primary',
+                                   'run', 'fill', 'hover', 'download',
+                                   'userscript', 'spawn'])
+
+
+class WordHintingError(Exception):
+
+    """Exception raised on errors during word hinting."""
 
 
 @pyqtSlot(usertypes.KeyMode)
@@ -62,14 +67,16 @@ class HintContext:
         frames: The QWebFrames to use.
         destroyed_frames: id()'s of QWebFrames which have been destroyed.
                           (Workaround for https://github.com/The-Compiler/qutebrowser/issues/152)
+        all_elems: A list of all (elem, label) namedtuples ever created.
         elems: A mapping from key strings to (elem, label) namedtuples.
+               May contain less elements than `all_elems` due to filtering.
         baseurl: The URL of the current page.
         target: What to do with the opened links.
-                normal/tab/tab_fg/tab_bg/window: Get passed to BrowserTab.
+                normal/current/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.
@@ -81,6 +88,7 @@ class HintContext:
     """
 
     def __init__(self):
+        self.all_elems = []
         self.elems = {}
         self.target = None
         self.baseurl = None
@@ -112,6 +120,7 @@ class HintManager(QObject):
         _context: The HintContext for the current invocation.
         _win_id: The window ID this HintManager is associated with.
         _tab_id: The tab ID this HintManager is associated with.
+        _filterstr: Used to save the filter string for restoring in rapid mode.
 
     Signals:
         mouse_event: Mouse event to be posted in the web view.
@@ -123,6 +132,7 @@ class HintManager(QObject):
 
     HINT_TEXTS = {
         Target.normal: "Follow hint",
+        Target.current: "Follow hint in current tab",
         Target.tab: "Follow hint in new tab",
         Target.tab_fg: "Follow hint in foreground tab",
         Target.tab_bg: "Follow hint in background tab",
@@ -147,6 +157,8 @@ class HintManager(QObject):
         self._win_id = win_id
         self._tab_id = tab_id
         self._context = None
+        self._filterstr = None
+        self._word_hinter = WordHinter()
         mode_manager = objreg.get('mode-manager', scope='window',
                                   window=win_id)
         mode_manager.left.connect(self.on_mode_left)
@@ -161,7 +173,7 @@ class HintManager(QObject):
 
     def _cleanup(self):
         """Clean up after hinting."""
-        for elem in self._context.elems.values():
+        for elem in self._context.all_elems:
             try:
                 elem.label.removeFromDocument()
             except webelem.IsNullError:
@@ -199,12 +211,19 @@ class HintManager(QObject):
         Return:
             A list of hint strings, in the same order as the elements.
         """
-        if config.get('hints', 'mode') == 'number':
+        hint_mode = config.get('hints', 'mode')
+        if hint_mode == 'word':
+            try:
+                return self._word_hinter.hint(elems)
+            except WordHintingError as e:
+                message.error(self._win_id, str(e), immediately=True)
+                # falls back on letter hints
+        if hint_mode == 'number':
             chars = '0123456789'
         else:
             chars = config.get('hints', 'chars')
         min_chars = config.get('hints', 'min-chars')
-        if config.get('hints', 'scatter'):
+        if config.get('hints', 'scatter') and hint_mode != 'number':
             return self._hint_scattered(min_chars, chars, elems)
         else:
             return self._hint_linear(min_chars, chars, elems)
@@ -336,7 +355,7 @@ class HintManager(QObject):
             ('display', 'inline !important'),
             ('z-index', '{} !important'.format(int(2 ** 32 / 2 - 1))),
             ('pointer-events', 'none !important'),
-            ('position', 'absolute !important'),
+            ('position', 'fixed !important'),
             ('color', config.get('colors', 'hints.fg') + ' !important'),
             ('background', config.get('colors', 'hints.bg') + ' !important'),
             ('font', config.get('fonts', 'hints') + ' !important'),
@@ -362,15 +381,12 @@ class HintManager(QObject):
             elem: The QWebElement to set the style attributes for.
             label: The label QWebElement.
         """
-        rect = elem.geometry()
+        no_js = config.get('hints', 'find-implementation') != 'javascript'
+        rect = elem.rect_on_view(adjust_zoom=False, no_js=no_js)
         left = rect.x()
         top = rect.y()
-        zoom = elem.webFrame().zoomFactor()
-        if not config.get('ui', 'zoom-text-only'):
-            left /= zoom
-            top /= zoom
-        log.hints.vdebug("Drawing label '{!r}' at {}/{} for element '{!r}', "
-                         "zoom level {}".format(label, left, top, elem, zoom))
+        log.hints.vdebug("Drawing label '{!r}' at {}/{} for element '{!r}' "
+                         "(no_js: {})".format(label, left, top, elem, no_js))
         label.setStyleProperty('left', '{}px !important'.format(left))
         label.setStyleProperty('top', '{}px !important'.format(top))
 
@@ -415,9 +431,8 @@ class HintManager(QObject):
             context: The HintContext to use.
         """
         target_mapping = {
-            Target.rapid: usertypes.ClickTarget.tab_bg,
-            Target.rapid_win: usertypes.ClickTarget.window,
             Target.normal: usertypes.ClickTarget.normal,
+            Target.current: usertypes.ClickTarget.normal,
             Target.tab_fg: usertypes.ClickTarget.tab,
             Target.tab_bg: usertypes.ClickTarget.tab_bg,
             Target.window: usertypes.ClickTarget.window,
@@ -427,17 +442,25 @@ class HintManager(QObject):
             target_mapping[Target.tab] = usertypes.ClickTarget.tab_bg
         else:
             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()
+
+        # Click the center of the largest square fitting into the top/left
+        # corner of the rectangle, this will help if part of the <a> element
+        # is hidden behind other elements
+        # https://github.com/The-Compiler/qutebrowser/issues/1005
+        rect = elem.rect_on_view()
+        if rect.width() > rect.height():
+            rect.setWidth(rect.height())
+        else:
+            rect.setHeight(rect.width())
+        pos = rect.center()
+
         action = "Hovering" if context.target == Target.hover else "Clicking"
-        log.hints.debug("{} on '{}' at {}/{}".format(
-            action, elem, pos.x(), pos.y()))
+        log.hints.debug("{} on '{}' at position {}".format(
+            action, elem.debug_text(), pos))
+
         self.start_hinting.emit(target_mapping[context.target])
         if context.target in [Target.tab, Target.tab_fg, Target.tab_bg,
-                              Target.window, Target.rapid, Target.rapid_win]:
+                              Target.window]:
             modifiers = Qt.ControlModifier
         else:
             modifiers = Qt.NoModifier
@@ -452,6 +475,15 @@ class HintManager(QObject):
                 QMouseEvent(QEvent.MouseButtonRelease, pos, Qt.LeftButton,
                             Qt.NoButton, modifiers),
             ]
+
+        if context.target in [Target.normal, Target.current]:
+            # Set the pre-jump mark ', so we can jump back here after following
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                        window=self._win_id)
+            tabbed_browser.set_mark("'")
+
+        if context.target == Target.current:
+            elem.remove_blank_target()
         for evt in events:
             self.mouse_event.emit(evt)
         if elem.is_text_input() and elem.is_editable():
@@ -467,12 +499,16 @@ class HintManager(QObject):
             url: The URL to open as a QUrl.
             context: The HintContext to use.
         """
-        sel = context.target == Target.yank_primary
-        mode = QClipboard.Selection if sel else QClipboard.Clipboard
+        sel = (context.target == Target.yank_primary and
+               utils.supports_selection())
+
         urlstr = url.toString(QUrl.FullyEncoded | QUrl.RemovePassword)
-        QApplication.clipboard().setText(urlstr, mode)
-        message.info(self._win_id, "URL yanked to {}".format(
-            "primary selection" if sel else "clipboard"))
+        utils.set_clipboard(urlstr, selection=sel)
+
+        msg = "Yanked URL to {}: {}".format(
+            "primary selection" if sel else "clipboard",
+            urlstr)
+        message.info(self._win_id, msg)
 
     def _run_cmd(self, url, context):
         """Run the command based on a hint URL.
@@ -554,9 +590,8 @@ class HintManager(QObject):
         """
         urlstr = url.toString(QUrl.FullyEncoded | QUrl.RemovePassword)
         args = context.get_args(urlstr)
-        cmd, *args = args
-        proc = guiprocess.GUIProcess(self._win_id, what='command', parent=self)
-        proc.start(cmd, args)
+        commandrunner = runners.CommandRunner(self._win_id)
+        commandrunner.run_safely('spawn ' + ' '.join(args))
 
     def _resolve_url(self, elem, baseurl):
         """Resolve a URL and check if we want to keep it.
@@ -570,7 +605,7 @@ class HintManager(QObject):
         """
         for attr in ('href', 'src'):
             if attr in elem:
-                text = elem[attr]
+                text = elem[attr].strip()
                 break
         else:
             return None
@@ -586,8 +621,7 @@ class HintManager(QObject):
     def _find_prevnext(self, frame, prev=False):
         """Find a prev/next element in frame."""
         # First check for <link rel="prev(ious)|next">
-        elems = frame.findAllElements(
-            webelem.SELECTORS[webelem.Group.links])
+        elems = frame.findAllElements(webelem.SELECTORS[webelem.Group.links])
         rel_values = ('prev', 'previous') if prev else ('next')
         for e in elems:
             e = webelem.WebElementWrapper(e)
@@ -664,14 +698,27 @@ class HintManager(QObject):
         if not elems:
             raise cmdexc.CommandError("No elements found.")
         strings = self._hint_strings(elems)
+        log.hints.debug("hints: {}".format(', '.join(strings)))
         for e, string in zip(elems, strings):
             label = self._draw_label(e, string)
-            self._context.elems[string] = ElemTuple(e, label)
+            elem = ElemTuple(e, label)
+            self._context.all_elems.append(elem)
+            self._context.elems[string] = elem
         keyparsers = objreg.get('keyparsers', scope='window',
                                 window=self._win_id)
         keyparser = keyparsers[usertypes.KeyMode.hint]
         keyparser.update_bindings(strings)
 
+    def _filter_matches(self, filterstr, elemstr):
+        """Return True if `filterstr` matches `elemstr`."""
+        # Empty string and None always match
+        if not filterstr:
+            return True
+        filterstr = filterstr.casefold()
+        elemstr = elemstr.casefold()
+        # Do multi-word matching
+        return all(word in elemstr for word in filterstr.split())
+
     def follow_prevnext(self, frame, baseurl, prev=False, tab=False,
                         background=False, window=False):
         """Click a "previous"/"next" element on the page.
@@ -710,9 +757,10 @@ class HintManager(QObject):
             webview.openurl(url)
 
     @cmdutils.register(instance='hintmanager', scope='tab', name='hint',
-                       win_id='win_id')
+                       star_args_optional=True, maxsplit=2)
+    @cmdutils.argument('win_id', win_id=True)
     def start(self, rapid=False, group=webelem.Group.all, target=Target.normal,
-              *args: {'nargs': '*'}, win_id):
+              *args, win_id):
         """Start hinting.
 
         Args:
@@ -727,7 +775,8 @@ class HintManager(QObject):
 
             target: What to do with the selected element.
 
-                - `normal`: Open the link in the current tab.
+                - `normal`: Open the link.
+                - `current`: Open the link in the current tab.
                 - `tab`: Open the link in a new tab (honoring the
                          background-tabs setting).
                 - `tab-fg`: Open the link in a new foreground tab.
@@ -749,7 +798,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.
@@ -771,7 +824,7 @@ class HintManager(QObject):
         if rapid:
             if target in [Target.tab_bg, Target.window, Target.run,
                           Target.hover, Target.userscript, Target.spawn,
-                          Target.download]:
+                          Target.download, Target.normal, Target.current]:
                 pass
             elif (target == Target.tab and
                   config.get('tabs', 'background-tabs')):
@@ -798,7 +851,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)
@@ -807,79 +859,118 @@ 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))
-        for (string, elems) in self._context.elems.items():
+        for string, elem in self._context.elems.items():
             try:
                 if string.startswith(keystr):
                     matched = string[:len(keystr)]
                     rest = string[len(keystr):]
                     match_color = config.get('colors', 'hints.fg.match')
-                    elems.label.setInnerXml(
+                    elem.label.setInnerXml(
                         '<font color="{}">{}</font>{}'.format(
                             match_color, matched, rest))
-                    if self._is_hidden(elems.label):
+                    if self._is_hidden(elem.label):
                         # hidden element which matches again -> show it
-                        self._show_elem(elems.label)
+                        self._show_elem(elem.label)
                 else:
                     # element doesn't match anymore -> hide it
-                    self._hide_elem(elems.label)
+                    self._hide_elem(elem.label)
             except webelem.IsNullError:
                 pass
 
+    def _filter_number_hints(self):
+        """Apply filters for numbered hints and renumber them.
+
+        Return:
+            Elements which are still visible
+        """
+        # renumber filtered hints
+        elems = []
+        for e in self._context.all_elems:
+            try:
+                if not self._is_hidden(e.label):
+                    elems.append(e)
+            except webelem.IsNullError:
+                pass
+        if not elems:
+            # Whoops, filtered all hints
+            modeman.leave(self._win_id, usertypes.KeyMode.hint,
+                          'all filtered')
+            return {}
+
+        strings = self._hint_strings(elems)
+        self._context.elems = {}
+        for elem, string in zip(elems, strings):
+            elem.label.setInnerXml(string)
+            self._context.elems[string] = elem
+        keyparsers = objreg.get('keyparsers', scope='window',
+                                window=self._win_id)
+        keyparser = keyparsers[usertypes.KeyMode.hint]
+        keyparser.update_bindings(strings, preserve_filter=True)
+
+        return self._context.elems
+
+    def _filter_non_number_hints(self):
+        """Apply filters for letter/word hints.
+
+        Return:
+            Elements which are still visible
+        """
+        visible = {}
+        for string, elem in self._context.elems.items():
+            try:
+                if not self._is_hidden(elem.label):
+                    visible[string] = elem
+            except webelem.IsNullError:
+                pass
+        if not visible:
+            # Whoops, filtered all hints
+            modeman.leave(self._win_id, usertypes.KeyMode.hint,
+                          'all filtered')
+        return visible
+
     def filter_hints(self, filterstr):
         """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 use the filter
+                       from previous call (saved in `self._filterstr`). If
+                       `filterstr` is an empty string or if both `filterstr`
+                       and `self._filterstr` are None, all hints are shown.
         """
-        for elems in self._context.elems.values():
+        if filterstr is None:
+            filterstr = self._filterstr
+        else:
+            self._filterstr = filterstr
+
+        for elem in self._context.all_elems:
             try:
-                if (filterstr is None or
-                        str(elems.elem).lower().startswith(filterstr)):
-                    if self._is_hidden(elems.label):
+                if self._filter_matches(filterstr, str(elem.elem)):
+                    if self._is_hidden(elem.label):
                         # hidden element which matches again -> show it
-                        self._show_elem(elems.label)
+                        self._show_elem(elem.label)
                 else:
                     # element doesn't match anymore -> hide it
-                    self._hide_elem(elems.label)
+                    self._hide_elem(elem.label)
             except webelem.IsNullError:
                 pass
-        visible = {}
-        for k, e in self._context.elems.items():
-            try:
-                if not self._is_hidden(e.label):
-                    visible[k] = e
-            except webelem.IsNullError:
-                pass
-        if not visible:
-            # Whoops, filtered all hints
-            modeman.leave(self._win_id, usertypes.KeyMode.hint, 'all filtered')
-        elif len(visible) == 1 and config.get('hints', 'auto-follow'):
+
+        if config.get('hints', 'mode') == 'number':
+            visible = self._filter_number_hints()
+        else:
+            visible = self._filter_non_number_hints()
+
+        if (len(visible) == 1 and
+                config.get('hints', 'auto-follow') and
+                filterstr is not None):
+            # apply auto-follow-timeout
+            timeout = config.get('hints', 'auto-follow-timeout')
+            keyparsers = objreg.get('keyparsers', scope='window',
+                                    window=self._win_id)
+            normal_parser = keyparsers[usertypes.KeyMode.normal]
+            normal_parser.set_inhibited_timeout(timeout)
             # unpacking gets us the first (and only) key in the dict.
             self.fire(*visible)
 
@@ -897,6 +988,7 @@ class HintManager(QObject):
         # Handlers which take a QWebElement
         elem_handlers = {
             Target.normal: self._click,
+            Target.current: self._click,
             Target.tab: self._click,
             Target.tab_fg: self._click,
             Target.tab_bg: self._click,
@@ -916,50 +1008,61 @@ class HintManager(QObject):
         }
         elem = self._context.elems[keystr].elem
         if elem.webFrame() is None:
-            message.error(self._win_id, "This element has no webframe.",
+            message.error(self._win_id,
+                          "This element has no webframe.",
                           immediately=True)
             return
         if self._context.target in elem_handlers:
-            handler = functools.partial(
-                elem_handlers[self._context.target], elem, self._context)
+            handler = functools.partial(elem_handlers[self._context.target],
+                                        elem, self._context)
         elif self._context.target in url_handlers:
             url = self._resolve_url(elem, self._context.baseurl)
             if url is None:
                 self._show_url_error()
                 return
-            handler = functools.partial(
-                url_handlers[self._context.target], url, self._context)
+            handler = functools.partial(url_handlers[self._context.target],
+                                        url, self._context)
         else:
             raise ValueError("No suitable handler found!")
         if not self._context.rapid:
             modeman.maybe_leave(self._win_id, usertypes.KeyMode.hint,
                                 'followed')
         else:
-            # Show all hints again
+            # Reset filtering
             self.filter_hints(None)
             # Undo keystring highlighting
-            for (string, elems) in self._context.elems.items():
-                elems.label.setInnerXml(string)
+            for string, elem in self._context.elems.items():
+                elem.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):
         """Reposition hints if contents size changed."""
         log.hints.debug("Contents size changed...!")
-        for elems in self._context.elems.values():
+        for e in self._context.all_elems:
             try:
-                if elems.elem.webFrame() is None:
+                if e.elem.webFrame() is None:
                     # This sometimes happens for some reason...
-                    elems.label.removeFromDocument()
+                    e.label.removeFromDocument()
                     continue
-                self._set_style_position(elems.elem, elems.label)
+                self._set_style_position(e.elem, e.label)
             except webelem.IsNullError:
                 pass
 
@@ -972,3 +1075,117 @@ class HintManager(QObject):
             # hinting.
             return
         self._cleanup()
+
+
+class WordHinter:
+
+    """Generator for word hints.
+
+    Attributes:
+        words: A set of words to be used when no "smart hint" can be
+            derived from the hinted element.
+    """
+
+    def __init__(self):
+        # will be initialized on first use.
+        self.words = set()
+        self.dictionary = None
+
+    def ensure_initialized(self):
+        """Generate the used words if yet uninitialized."""
+        dictionary = config.get("hints", "dictionary")
+        if not self.words or self.dictionary != dictionary:
+            self.words.clear()
+            self.dictionary = dictionary
+            try:
+                with open(dictionary, encoding="UTF-8") as wordfile:
+                    alphabet = set(ascii_lowercase)
+                    hints = set()
+                    lines = (line.rstrip().lower() for line in wordfile)
+                    for word in lines:
+                        if set(word) - alphabet:
+                            # contains none-alphabetic chars
+                            continue
+                        if len(word) > 4:
+                            # we don't need words longer than 4
+                            continue
+                        for i in range(len(word)):
+                            # remove all prefixes of this word
+                            hints.discard(word[:i + 1])
+                        hints.add(word)
+                    self.words.update(hints)
+            except IOError as e:
+                error = "Word hints requires reading the file at {}: {}"
+                raise WordHintingError(error.format(dictionary, str(e)))
+
+    def extract_tag_words(self, elem):
+        """Extract tag words form the given element."""
+        attr_extractors = {
+            "alt": lambda elem: elem["alt"],
+            "name": lambda elem: elem["name"],
+            "title": lambda elem: elem["title"],
+            "src": lambda elem: elem["src"].split('/')[-1],
+            "href": lambda elem: elem["href"].split('/')[-1],
+            "text": str,
+        }
+
+        extractable_attrs = collections.defaultdict(list, {
+            "IMG": ["alt", "title", "src"],
+            "A": ["title", "href", "text"],
+            "INPUT": ["name"]
+        })
+
+        return (attr_extractors[attr](elem)
+                for attr in extractable_attrs[elem.tagName()]
+                if attr in elem or attr == "text")
+
+    def tag_words_to_hints(self, words):
+        """Take words and transform them to proper hints if possible."""
+        for candidate in words:
+            if not candidate:
+                continue
+            match = re.search('[A-Za-z]{3,}', candidate)
+            if not match:
+                continue
+            if 4 < match.end() - match.start() < 8:
+                yield candidate[match.start():match.end()].lower()
+
+    def any_prefix(self, hint, existing):
+        return any(hint.startswith(e) or e.startswith(hint) for e in existing)
+
+    def filter_prefixes(self, hints, existing):
+        return (h for h in hints if not self.any_prefix(h, existing))
+
+    def new_hint_for(self, elem, existing, fallback):
+        """Return a hint for elem, not conflicting with the existing."""
+        new = self.tag_words_to_hints(self.extract_tag_words(elem))
+        new_no_prefixes = self.filter_prefixes(new, existing)
+        fallback_no_prefixes = self.filter_prefixes(fallback, existing)
+        # either the first good, or None
+        return (next(new_no_prefixes, None) or
+                next(fallback_no_prefixes, None))
+
+    def hint(self, elems):
+        """Produce hint labels based on the html tags.
+
+        Produce hint words based on the link text and random words
+        from the words arg as fallback.
+
+        Args:
+            words: Words to use as fallback when no link text can be used.
+            elems: The elements to get hint strings for.
+
+        Return:
+            A list of hint strings, in the same order as the elements.
+        """
+        self.ensure_initialized()
+        hints = []
+        used_hints = set()
+        words = iter(self.words)
+        for elem in elems:
+            hint = self.new_hint_for(elem, used_hints, words)
+            if not hint:
+                raise WordHintingError("Not enough words in the dictionary.")
+            used_hints.add(hint)
+            hints.append(hint)
+        return hints

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.
 #
@@ -22,50 +22,144 @@
 import time
 import collections
 
-from PyQt5.QtCore import pyqtSignal, QUrl
+from PyQt5.QtCore import pyqtSignal, QUrl, QObject
 from PyQt5.QtWebKit import QWebHistoryInterface
 
-from qutebrowser.utils import utils, objreg, standarddir, log
+from qutebrowser.commands import cmdutils
+from qutebrowser.utils import utils, objreg, standarddir, log, qtutils
 from qutebrowser.config import config
 from qutebrowser.misc import lineparser
 
 
-class HistoryEntry:
+class Entry:
 
     """A single entry in the web history.
 
     Attributes:
         atime: The time the page was accessed.
         url: The URL which was accessed as QUrl.
-        url_string: The URL which was accessed as string.
+        redirect: If True, don't save this entry to disk
     """
 
-    def __init__(self, atime, url):
+    def __init__(self, atime, url, title, redirect=False):
         self.atime = float(atime)
-        self.url = QUrl(url)
-        self.url_string = url
+        self.url = url
+        self.title = title
+        self.redirect = redirect
+        qtutils.ensure_valid(url)
 
     def __repr__(self):
         return utils.get_repr(self, constructor=True, atime=self.atime,
-                              url=self.url.toDisplayString())
+                              url=self.url_str(), title=self.title,
+                              redirect=self.redirect)
 
     def __str__(self):
-        return '{} {}'.format(int(self.atime), self.url_string)
+        atime = str(int(self.atime))
+        if self.redirect:
+            atime += '-r'  # redirect flag
+        elems = [atime, self.url_str()]
+        if self.title:
+            elems.append(self.title)
+        return ' '.join(elems)
+
+    def __eq__(self, other):
+        return (self.atime == other.atime and
+                self.title == other.title and
+                self.url == other.url and
+                self.redirect == other.redirect)
+
+    def url_str(self):
+        """Get the URL as a lossless string."""
+        return self.url.toString(QUrl.FullyEncoded | QUrl.RemovePassword)
 
     @classmethod
-    def from_str(cls, s):
-        """Get a history based on a 'TIME URL' string."""
-        return cls(*s.split(' ', maxsplit=1))
+    def from_str(cls, line):
+        """Parse a history line like '12345 http://example.com title'."""
+        data = line.split(maxsplit=2)
+        if len(data) == 2:
+            atime, url = data
+            title = ""
+        elif len(data) == 3:
+            atime, url, title = data
+        else:
+            raise ValueError("2 or 3 fields expected")
+
+        url = QUrl(url)
+        if not url.isValid():
+            raise ValueError("Invalid URL: {}".format(url.errorString()))
+
+        if atime.startswith('\0'):
+            log.init.debug(
+                "Removing NUL bytes from entry {!r} - see "
+                "https://github.com/The-Compiler/qutebrowser/issues/"
+                "670".format(data))
+            atime = atime.lstrip('\0')
+
+        if '-' in atime:
+            atime, flags = atime.split('-')
+        else:
+            flags = ''
+
+        if not set(flags).issubset('r'):
+            raise ValueError("Invalid flags {!r}".format(flags))
+
+        redirect = 'r' in flags
+
+        return cls(atime, url, title, redirect=redirect)
 
 
-class WebHistory(QWebHistoryInterface):
+class WebHistoryInterface(QWebHistoryInterface):
 
-    """A QWebHistoryInterface which supports being written to disk.
+    """Glue code between WebHistory and Qt's QWebHistoryInterface.
 
     Attributes:
+        _history: The WebHistory object.
+    """
+
+    def __init__(self, webhistory, parent=None):
+        super().__init__(parent)
+        self._history = webhistory
+
+    def addHistoryEntry(self, url_string):
+        """Required for a QWebHistoryInterface impl, obsoleted by add_url."""
+        pass
+
+    def historyContains(self, url_string):
+        """Called by WebKit to determine if an URL is contained in the history.
+
+        Args:
+            url_string: The URL (as string) to check for.
+
+        Return:
+            True if the url is in the history, False otherwise.
+        """
+        return url_string in self._history.history_dict
+
+
+class WebHistory(QObject):
+
+    """The global history of visited pages.
+
+    This is a little more complex as you'd expect so the history can be read
+    from disk async while new history is already arriving.
+
+    self.history_dict is the main place where the history is stored, in an
+    OrderedDict (sorted by time) of URL strings mapped to Entry objects.
+
+    While reading from disk is still ongoing, the history is saved in
+    self._temp_history instead, and then appended to self.history_dict once
+    that's fully populated.
+
+    All history which is new in this session (rather than read from disk from a
+    previous browsing session) is also stored in self._new_history.
+    self._saved_count tracks how many of those entries were already written to
+    disk, so we can always append to the existing data.
+
+    Attributes:
+        history_dict: An OrderedDict of URLs read from the on-disk history.
+        _hist_dir: The directory to store the history in
         _lineparser: The AppendLineParser used to save the history.
-        _history_dict: An OrderedDict of URLs read from the on-disk history.
-        _new_history: A list of HistoryEntry items of the current session.
+        _new_history: A list of Entry 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.
@@ -73,23 +167,28 @@ class WebHistory(QWebHistoryInterface):
                        async_read was called.
 
     Signals:
-        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.
+        add_completion_item: Emitted before a new Entry is added.
+                             Used to sync with the completion.
+                             arg: The new Entry.
+        item_added: Emitted after a new Entry is added.
+                    Used to tell the savemanager that the history is dirty.
+                    arg: The new Entry.
+        cleared: Emitted after the history is cleared.
     """
 
-    add_completion_item = pyqtSignal(HistoryEntry)
-    item_added = pyqtSignal(HistoryEntry)
+    add_completion_item = pyqtSignal(Entry)
+    item_added = pyqtSignal(Entry)
+    cleared = pyqtSignal()
     async_read_done = pyqtSignal()
 
-    def __init__(self, parent=None):
+    def __init__(self, hist_dir, hist_name, 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()
+        self._hist_dir = hist_dir
+        self._lineparser = lineparser.AppendLineParser(hist_dir, hist_name,
+                                                       parent=self)
+        self.history_dict = collections.OrderedDict()
         self._temp_history = collections.OrderedDict()
         self._new_history = []
         self._saved_count = 0
@@ -99,14 +198,11 @@ class WebHistory(QWebHistoryInterface):
     def __repr__(self):
         return utils.get_repr(self, length=len(self))
 
-    def __getitem__(self, key):
-        return self._new_history[key]
-
     def __iter__(self):
-        return iter(self._history_dict.values())
+        return iter(self.history_dict.values())
 
     def __len__(self):
-        return len(self._history_dict)
+        return len(self.history_dict)
 
     def async_read(self):
         """Read the initial history."""
@@ -115,52 +211,51 @@ class WebHistory(QWebHistoryInterface):
             return
         self._initial_read_started = True
 
-        if standarddir.data() is None:
+        if self._hist_dir is None:
             self._initial_read_done = True
             self.async_read_done.emit()
+            assert not self._temp_history
             return
 
         with self._lineparser.open():
             for line in self._lineparser:
                 yield
-                data = line.rstrip().split(maxsplit=1)
-                if not data:
-                    # empty line
+
+                line = line.rstrip()
+                if not line:
                     continue
-                elif len(data) != 2:
-                    # other malformed line
-                    log.init.warning("Invalid history entry {!r}!".format(
-                        line))
+
+                try:
+                    entry = Entry.from_str(line)
+                except ValueError as e:
+                    log.init.warning("Invalid history entry {!r}: {}!".format(
+                        line, e))
                     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
+                # old_urls to be lists or change Entry 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)
+        for entry in self._temp_history.values():
             self._add_entry(entry)
-            self.add_completion_item.emit(entry)
+            self._new_history.append(entry)
+            if not entry.redirect:
+                self.add_completion_item.emit(entry)
+        self._temp_history.clear()
 
     def _add_entry(self, entry, target=None):
-        """Add an entry to self._history_dict or another given OrderedDict."""
+        """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)
+            target = self.history_dict
+        url_str = entry.url_str()
+        target[url_str] = entry
+        target.move_to_end(url_str)
 
     def get_recent(self):
         """Get the most recent history entries."""
@@ -174,36 +269,44 @@ class WebHistory(QWebHistoryInterface):
         self._lineparser.save()
         self._saved_count = len(self._new_history)
 
-    def addHistoryEntry(self, url_string):
+    @cmdutils.register(name='history-clear', instance='web-history')
+    def clear(self):
+        """Clear all browsing history.
+
+        Note this only clears the global history
+        (e.g. `~/.local/share/qutebrowser/history` on Linux) but not cookies,
+        the back/forward history of a tab, cache or other persistent data.
+        """
+        self._lineparser.clear()
+        self.history_dict.clear()
+        self._temp_history.clear()
+        self._new_history.clear()
+        self._saved_count = 0
+        self.cleared.emit()
+
+    def add_url(self, url, title="", *, redirect=False, atime=None):
         """Called by WebKit when an URL should be added to the history.
 
         Args:
-            url_string: An url as string to add to the history.
+            url: An url (as QUrl) to add to the history.
+            redirect: Whether the entry was redirected to another URL
+                      (hidden in completion)
+            atime: Override the atime used to add the entry
         """
-        if not url_string:
-            return
         if config.get('general', 'private-browsing'):
             return
-        entry = HistoryEntry(time.time(), url_string)
+        if atime is None:
+            atime = time.time()
+        entry = Entry(atime, url, title, redirect=redirect)
         if self._initial_read_done:
-            self.add_completion_item.emit(entry)
-            self._new_history.append(entry)
             self._add_entry(entry)
+            self._new_history.append(entry)
             self.item_added.emit(entry)
+            if not entry.redirect:
+                self.add_completion_item.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.
-
-        Args:
-            url_string: The URL (as string) to check for.
-
-        Return:
-            True if the url is in the history, False otherwise.
-        """
-        return url_string in self._history_dict
-
 
 def init(parent=None):
     """Initialize the web history.
@@ -211,6 +314,9 @@ def init(parent=None):
     Args:
         parent: The parent to use for WebHistory.
     """
-    history = WebHistory(parent)
+    history = WebHistory(hist_dir=standarddir.data(), hist_name='history',
+                         parent=parent)
     objreg.register('web-history', history)
-    QWebHistoryInterface.setDefaultInterface(history)
+
+    interface = WebHistoryInterface(history, parent=history)
+    QWebHistoryInterface.setDefaultInterface(interface)

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.
 #

qutebrowser/browser/inspector.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.
 #

qutebrowser/browser/mhtml.py

@@ -0,0 +1,543 @@
+# 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._cancelled, 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 original 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 _cancelled(self, url, item):
+        """Callback when a download is cancelled by the user.
+
+        Args:
+            url: The original url of the asset as QUrl.
+            item: The DownloadItem given by the DownloadManager.
+        """
+        # This callback is called before _finished, so there's no need to
+        # remove the item or close the fileobject.
+        log.downloads.debug("MHTML download cancelled by user: {}".format(url))
+        # Write an empty file instead
+        item.fileobj.seek(0)
+        item.fileobj.truncate()
+
+    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

@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2015 Antoni Boucher (antoyo) <bouanto@zoho.com>
+# 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.
 #
@@ -25,10 +25,8 @@
 
 import os
 
-from PyQt5.QtCore import QUrl
-
 from qutebrowser.browser.network import schemehandler, networkreply
-from qutebrowser.utils import utils, jinja
+from qutebrowser.utils import jinja
 
 
 def get_file_list(basedir, all_files, filterfunc):
@@ -59,9 +57,29 @@ def is_root(directory):
     Return:
         Whether the directory is a root directory or not.
     """
+    # If you're curious as why this works:
+    # dirname('/') = '/'
+    # dirname('/home') = '/'
+    # dirname('/home/') = '/home'
+    # dirname('/home/foo') = '/home'
+    # basically, for files (no trailing slash) it removes the file part, and
+    # for directories, it removes the trailing slash, so the only way for this
+    # to be equal is if the directory is the root directory.
     return os.path.dirname(directory) == directory
 
 
+def parent_dir(directory):
+    """Return the parent directory for the given directory.
+
+    Args:
+        directory: The path to the directory.
+
+    Return:
+        The path to the parent directory.
+    """
+    return os.path.normpath(os.path.join(directory, os.pardir))
+
+
 def dirbrowser_html(path):
     """Get the directory browser web page.
 
@@ -72,37 +90,25 @@ def dirbrowser_html(path):
         The HTML of the web page.
     """
     title = "Browse directory: {}".format(path)
-    template = jinja.env.get_template('dirbrowser.html')
-    # pylint: disable=no-member
-    # https://bitbucket.org/logilab/pylint/issue/490/
-
-    folder_icon = utils.resource_filename('img/folder.svg')
-    file_icon = utils.resource_filename('img/file.svg')
-
-    folder_url = QUrl.fromLocalFile(folder_icon).toString(QUrl.FullyEncoded)
-    file_url = QUrl.fromLocalFile(file_icon).toString(QUrl.FullyEncoded)
 
     if is_root(path):
         parent = None
     else:
-        parent = os.path.dirname(path)
+        parent = parent_dir(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='')
+        html = jinja.render('error.html',
+                            title="Error while reading directory",
+                            url='file:///{}'.format(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, folder_url=folder_url,
-                           file_url=file_url)
+    html = jinja.render('dirbrowser.html', title=title, url=path, icon='',
+                        parent=parent, files=files, directories=directories)
     return html.encode('UTF-8', errors='xmlcharrefreplace')