Release v0.9.0

This reverts commit f0ccc7be14.

.appveyor.yml

@@ -11,7 +11,7 @@ environment:
     - 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 %TESTENV%

.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

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

.eslintrc

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

.flake8

@@ -1,24 +1,15 @@
 [flake8]
-exclude = .venv,.hypothesis,.git,__pycache__,resources.py
+exclude = .*,__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
+# E731: do not assign a lambda expression, use a def
+#       (for pytest's __tracebackhide__)
 # 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
@@ -30,27 +21,26 @@ exclude = .venv,.hypothesis,.git,__pycache__,resources.py
 # 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)
+# D403: First word of the first line should be properly capitalized
+#       (false-positives)
 ignore =
-    E128,E226,E265,E501,E402,E266,
+    E128,E226,E265,E501,E402,E266,E731,
     F401,
     N802,
-    L101,L102,L103,L201,L202,L203,L204,L207,L302,
     P101,P102,P103,
-    D102,D103,D104,D105,D209,D211,D402
+    D102,D103,D104,D105,D209,D211,D402,D403
+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
-    /# flake8: disable=E131/ : +E131
-    /# flake8: disable=N803/ : +N803
-    /# flake8: disable=T002/ : +T002
-    /# flake8: disable=F841/ : +F841
-    /# flake8: disable=S001/ : +S001
-    tests/*/*/test_*.py : +D100,D101,D401
     tests/*/test_*.py : +D100,D101,D401
-    tests/unit/browser/http/test_content_disposition.py : +D400
-    scripts/dev/ci/install.py : +C901
+    tests/unit/browser/webkit/test_history.py : +N806
+    tests/helpers/fixtures.py : +N806
+    tests/unit/browser/webkit/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

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,2 @@
+<!-- If this is a bug report, please remember to mention your version info from
+the `qute:version` page or `qutebrowser --version` -->

.gitignore

@@ -1,4 +1,5 @@
 __pycache__
+*.py~
 *.pyc
 *.swp
 /build
@@ -19,7 +20,7 @@ __pycache__
 /FAQ.html
 /INSTALL.html
 /qutebrowser/html/doc/
-/.venv
+/.venv*
 /.coverage
 /htmlcov
 /coverage.xml
@@ -30,4 +31,14 @@ __pycache__
 /.testmondata
 /.hypothesis
 /prof
+/venv
 TODO
+/scripts/testbrowser_cpp/webkit/Makefile
+/scripts/testbrowser_cpp/webkit/main.o
+/scripts/testbrowser_cpp/webkit/testbrowser
+/scripts/testbrowser_cpp/webkit/.qmake.stash
+/scripts/testbrowser_cpp/webengine/Makefile
+/scripts/testbrowser_cpp/webengine/main.o
+/scripts/testbrowser_cpp/webengine/testbrowser
+/scripts/testbrowser_cpp/webengine/.qmake.stash
+/scripts/dev/pylint_checkers/qute_pylint.egg-info

.pylintrc

@@ -6,7 +6,10 @@ extension-pkg-whitelist=PyQt5,sip
 load-plugins=qute_pylint.config,
              qute_pylint.modeline,
              qute_pylint.openencoding,
-             qute_pylint.settrace
+             qute_pylint.settrace,
+             pylint.extensions.bad_builtin,
+             pylint.extensions.docstyle
+persistent=n
 
 [MESSAGES CONTROL]
 enable=all
@@ -14,6 +17,7 @@ disable=no-self-use,
         fixme,
         global-statement,
         locally-disabled,
+        locally-enabled,
         too-many-ancestors,
         too-few-public-methods,
         too-many-public-methods,
@@ -31,12 +35,15 @@ disable=no-self-use,
         wrong-import-order,
         ungrouped-imports,
         redefined-variable-type,
-        suppressed-message
+        suppressed-message,
+        too-many-return-statements,
+        duplicate-code,
+        wrong-import-position
 
 [BASIC]
 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}$
+method-rgx=[a-z_][A-Za-z0-9_]{1,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}$
@@ -57,10 +64,16 @@ dummy-variables-rgx=_.*
 [DESIGN]
 max-args=10
 
+[CLASSES]
+valid-metaclass-classmethod-first-arg=cls
+
 [TYPECHECK]
+# WORKAROUND for https://github.com/PyCQA/astroid/pull/357
+ignored-modules=pytest
 # 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
+                qutebrowser.browser.webkit.webelem.WebElementWrapper,
+                scripts.dev.check_coverage.MsgType,
+                qutebrowser.browser.downloads.UnsupportedAttribute

.travis.yml

@@ -1,17 +1,11 @@
 sudo: required
 dist: trusty
-env:
-  global:
-    - PATH=/home/travis/bin:/home/travis/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-# Not really, but this is here so we can do stuff by hand.
-language: c
+language: generic
 
 matrix:
   include:
     - os: linux
       env: TESTENV=py34-cov
-    - os: linux
-      env: TESTENV=unittests-nodisp
     - os: linux
       env: DOCKER=debian-jessie
       services: docker
@@ -19,10 +13,18 @@ matrix:
       env: DOCKER=archlinux
       services: docker
     - os: linux
-      env: DOCKER=ubuntu-wily
+      env: DOCKER=archlinux QUTE_BDD_WEBENGINE=true
+      services: docker
+    - os: linux
+      env: DOCKER=ubuntu-xenial
       services: docker
     - os: osx
-      env: TESTENV=py35
+      env: TESTENV=py35 OSX=elcapitan
+      osx_image: xcode7.3
+    # https://github.com/The-Compiler/qutebrowser/issues/2013
+    # - os: osx
+    #   env: TESTENV=py35 OSX=yosemite
+    #   osx_image: xcode6.4
     - os: linux
       env: TESTENV=pylint
     - os: linux
@@ -41,15 +43,21 @@ matrix:
       env: TESTENV=eslint
   allow_failures:
     - os: osx
-      env: TESTENV=py35
+      env: TESTENV=py35 OSX=elcapitan
+      osx_image: xcode7.3
+  fast_finish: true
 
 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:
   - bash scripts/dev/ci/travis_run.sh
@@ -62,8 +70,8 @@ notifications:
     - https://buildtimetrend.herokuapp.com/travis
   irc:
     channels:
-      - "chat.freenode.net#qutebrowser"
-    on_success: change
+      - "chat.freenode.net#qutebrowser-dev"
+    on_success: always
     on_failure: always
     skip_join: true
     template:

CHANGELOG.asciidoc

@@ -14,6 +14,413 @@ 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.9.0
+------
+
+Added
+~~~~~
+
+- *New dependency:* qutebrowser now depends on the Qt QML module, which is
+   packaged separately in some distributions (as Qt Declarative/QML/Quick).
+- New `:rl-backward-kill-word` command which does what `:rl-unix-word-rubout`
+  did before v0.8.0.
+- New `:rl-unix-filename-rubout` command which is similar to readline's
+  `unix-filename-rubout`.
+- New `fonts -> completion.category` setting to customize the font used for
+  completion category headers.
+- New `:debug-log-capacity` command to adjust how many lines are logged into RAM
+  (to report bugs which are difficult to reproduce).
+- New `hide-unmatched-rapid-hints` option to not hide hint unmatched hint labels
+  in rapid mode.
+- New `{clipboard}` and `{primary}` replacements for the commandline which
+  replace the `:paste` command.
+- New `:insert-text` command to insert a given text into a field on the page,
+  which replaces `:paste-primary` together with the `{primary}` replacement.
+- New `:window-only` command to close all other windows.
+- New `prev-category` and `next-category` arguments to `:completion-item-focus`
+  to focus the previous/next category in the completion (bound to `<Ctrl-Tab>`
+  and `<Ctrl-Shift-Tab>` by default).
+- New `:click-element` command to fake a click on a element.
+- New `:debug-log-filter` command to change console log filtering on-the-fly.
+- New `:debug-log-level` command to change the console loglevel on-the-fly.
+- New `general -> yank-ignored-url-parameters` option to configure which URL
+  parameters (like `utm_source` etc.) to strip off when yanking an URL.
+- Support for the
+  https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API[HTML5 page visibility API]
+- New `readability` userscript which shows a readable version of a page (using
+  the `readability-lxml` python package)
+- New `cast` userscript to show a video on a Google Chromecast
+- New `:run-with-count` command which replaces the (undocumented) `:count:command` syntax.
+- New `:record-macro` (`q`) and `:run-macro` (`@`) commands for keyboard macros.
+- New `ui -> hide-scrollbar` setting to hide the scrollbar independently of the
+  `user-stylesheet` setting.
+- New `general -> default-open-dispatcher` setting to configure what to open
+  downloads with (instead of e.g. `xdg-open` on Linux).
+- Support for PAC (proxy autoconfig) with QtWebKit
+
+Changed
+~~~~~~~
+
+- Hints are now drawn natively in Qt instead of using web elements. This has a
+  few implications for users:
+    * The `hints -> opacity` setting does not exist anymore, but you can use
+      `rgba(r, g, b, alpha)` colors instead for `colors -> hints.bg`.
+    * The `hints -> font` setting is not affected by
+      `fonts -> web-family-fixed` anymore. Thus, a transformer got added to
+      change `Monospace` to `${_monospace}`.
+    * Gradients in hint colors can now be configured by using `qlineargradient`
+      and friends instead of `-webkit-gradient`. The most common cases get
+      migrated automatically, but if you drastically changed the defaults,
+      you'll need to manually adjust your config.
+    * Styling hints by styling `qutehint` elements in `user-stylesheet` was
+      never officially supported and does not work anymore.
+    * Hints are now not affected by the page's stylesheet or zoom anymore.
+- `:bookmark-add` now has a `--toggle` flag which deletes the bookmark if it
+  already exists.
+- `:bookmark-load` now has a `--delete` flag which deletes the bookmark after
+  loading it.
+- `:open` now also accepts quickmark names instead of URLs
+- `:tab-move` now optionally takes an index for absolute moving.
+- Commands taking either an argument or a count (like `:zoom` or `:tab-focus`)
+  now prefer the count instead of showing an error message.
+- `:open` now has an `--implicit` argument to treat the opened tab as implicit
+  (i.e. to open it at the position it would be opened if it was a clicked link)
+- `:download-open` and `:prompt-open-download` now have an optional `cmdline`
+  argument to pass a commandline to open the download with.
+- `:yank` now has a position argument to select what to yank instead of using
+  flags.
+- Replacements like `{url}` can now also be used in the middle of an argument.
+  Consequently, commands taking another command (`:later`, `:repeat` and
+  `:bind`) now don't immediately evaluate variables.
+- Tab titles in the `:buffer` completion now update correctly when a page's
+  title is changed via javascript.
+- `:hint` now has a `--mode <mode>` flag to override the hint mode configured
+  using the `hints -> mode` setting.
+- With `new-instance-open-target` set to a tab option, the tab is now opened in
+  the most recently focused (instead of the last opened) window. This can be
+  configured with the new `new-instance-open-target.window` setting.
+  It can also be set to `last-visible` to show the pages in the most recently
+  visible window, or `first-opened` to use the first (oldest) available window.
+- Word hints now are more clever about getting the element text from some elements.
+- Completions for `:help` and `:bind` now also show hidden commands
+- The `:buffer` completion now also filters using the first column (id).
+- `:undo` has been improved to reopen tabs at the position they were closed.
+- `:navigate` now takes a count for `up`/`increment`/`decrement`.
+- The `hints -> auto-follow` setting now can be set to
+  `always`/`full-match`/`unique-match`/`never` to more precisely control when
+  hints should be followed automatically.
+- Counts can now be used with special keybindings (e.g. with modifiers).
+  This was already implemented for v0.7.0 originally, but got reverted because
+  it caused some issues and then never re-applied.
+- Sending a command to an existing instance (via "qutebrowser :reload") now
+  doesn't mark it as urgent anymore.
+- `tabs -> title-format` now treats an empty string as valid.
+- Bindings for `:`, `/` and `?` are now configured explicitly and not hardcoded
+  anymore.
+- The `completion -> show` setting can now be set to `always`, `auto` or
+  `never`.
+- `:open-editor` can now be used in any mode.
+- Lots of improvements to and bugfixes for the QtWebEngine backend, such as
+  working hints. However, using qutebrowser directly from git is still advised
+  when using `--backend webengine`.
+- `content -> javascript-can-open-windows` got renamed to
+  `javascript-can-open-windows-automatically`.
+- `:prompt-accept` now optionally accepts a value which overrides the one
+  entered in the input box. `yes` and `no` can be used as values for yes/no
+  questions.
+- The new `--qt-arg` and `--qt-flag` arguments can be used to pass
+  arguments/flags to Qt's commandline.
+- Error/warning/info messages are now shown stacked above the statusbar.
+  This also added various new settings:
+    * `colors -> messages.fg.error` (renamed from `statusbar.fg.error`)
+    * `colors -> messages.bg.error` (renamed from `statusbar.bg.error`)
+    * `colors -> messages.border.error`
+    * `colors -> messages.fg.warning` (renamed from `statusbar.fg.warning`)
+    * `colors -> messages.bg.warning` (renamed from `statusbar.bg.warning`)
+    * `colors -> messages.border.warning`
+    * `colors -> messages.fg.info`
+    * `colors -> messages.bg.info`
+    * `colors -> messages.border.info`
+    * `fonts -> messages.error`
+    * `fonts -> messages.warning`
+    * `fonts -> messages.info`
+- The `qute:settings` page now also shows option descriptions.
+- `qute:version` and `qutebrowser --version` now show various important paths
+- `:spawn`/userscripts now show a nicer error when a script wasn't found
+- Various functionality now works when javascript is disabled with QtWebKit
+- Various commands/settings taking `left`/`right`/`previous` arguments now take
+  `prev`/`next`/`last-used` to remove ambiguity.
+- The `ui -> user-stylesheet` setting now only takes filenames, not CSS snippets
+- `ui -> window-title-format` now has a new `{backend} ` replacement
+- `:hint` has a new `--add-history` argument to add the URL to the history for
+  yank/spawn targets.
+- `:set` now cycles through values if more than one argument is given.
+- `:open` now opens `default-page` without an URL even without `-t`/`-b`/`-w` given.
+
+Deprecated
+~~~~~~~~~~
+
+- The `:paste` command got deprecated as `:open` with `{clipboard}` and
+  `{primary}` can be used instead.
+- The `:paste-primary` command got deprecated as `:insert-text {primary}` can
+  be used instead.
+- The `:prompt-yes` and `:prompt-no` commands got deprecated as
+  `:prompt-accept yes` and `:prompt-accept no` can be used instead.
+
+Removed
+~~~~~~~
+
+- The `:yank-selected` command got merged into `:yank` as `:yank selection`
+  and thus removed.
+- The `:completion-item-prev` and `:completion-item-next` commands got merged
+  into a new `:completion-focus {prev,next}` command and thus removed.
+- The `ui -> hide-mouse-cursor` setting since it was completely broken and
+  nobody seemed to care.
+- The `hints -> opacity` setting - see the "Changed" section for details.
+- The `completion -> auto-open` setting got merged into `completion -> show` and
+  thus removed.
+- All `--qt-*` arguments got replaced by `--qt-arg` and `--qt-flag` and thus
+  removed.
+- The `-c`/`--confdir`, `--datadir` and `--cachedir` arguments got removed, as
+  `--basedir` should be sufficient.
+
+Fixed
+~~~~~
+
+- `:undo` now doesn't undo tabs "closed" by `:tab-detach` anymore.
+- Fixed an issue with hint chars not being cleared correctly when leaving hint
+  mode.
+- `:tab-detach` now fails correctly when there's only one tab open.
+- Various small issues with the command completion
+- Fixed hang when using multiple spaces in a row with the URL completion
+- qutebrowser now still starts with an incorrectly configured
+  `$XDG_RUNTIME_DIR`.
+- Fixed crash when a userscript writes invalid unicode data to the FIFO
+- Fixed crash when a included HTML was not found
+
+v0.8.3
+------
+
+Fixed
+~~~~~
+
+- Fixed crash when doing `:<space><enter>`, another corner-case introduced in v0.8.0
+- Fixed `:open-editor` (`<Ctrl-e>`) on Windows
+- Fixed crash when setting `general -> auto-save-interval` to a too big value.
+- Fixed crash when using hints on Void Linux.
+- Fixed compatibility with Python 3.5.2+ on Debian unstable
+- Compatibility with pdfjs v1.6.210
+- `:bind` can now be used to bind to an alias (binding by editing `keys.conf`
+  already worked before)
+- The command completion now updates correctly when changing aliases
+- The tabbar now displays correctly with the Adwaita Qt theme
+- The default `sk` keybinding now sets the commandline to `:bind` correctly
+- Fixed crash when closing a window without focusing it
+- Userscripts now can access QUTE_FIFO correctly on Windows
+
+v0.8.2
+------
+
+Fixed
+~~~~~
+
+- Fixed `general -> private-browsing` not being set correctly until a restart
+  (which caused e.g. local storage to be enabled).
+- When hinting input fields (`:t`), also consider input elements without a type.
+- Fixed crash when opening an invalid URL with a percent-encoded and a real @ in it
+- Fixed default `;o` and `;O` bindings
+- Fixed local storage not working (and possible other bugs) when using a
+  relative path with `--basedir`.
+- Fixed crash when deleting a quickmark with Ctrl-D
+- Fixed HTML5 video playback on Windows
+- Fixed crash when using `:prompt-open-download` with a file with chars not
+  encodable with the OS' filesystem encoding (e.g. with `LC_ALL=C`)
+- Fixed `:prompt-open-download` with a too long filename (> 255 bytes)
+- Fixed crash when cancelling a download after doing `:prompt-open-download`
+- Fixed crash when writing a download to disk fails with
+  `:prompt-open-download`.
+- Fixed `:restart` deleting the basedir when it was given with `--basedir`.
+
+v0.8.1
+------
+
+Fixed
+~~~~~
+
+- Fix crash when pressing enter without a command
+- Adjust error message to point out QtWebEngine is unsupported with the OS
+  X .app currently.
+- Hide Harfbuzz warning with the OS X .app
+
+v0.8.0
+------
+
+Added
+~~~~~
+
+- New `:repeat-command` command (mapped to `.`) to repeat the last command.
+  Note that two former default bundings conflict with that binding, unbinding
+  them via `:unbind .i` and `:unbind .o` is recommended.
+- New `qute:bookmarks` page which displays all bookmarks and quickmarks.
+- New `:prompt-open-download` (bound to `Ctrl-X`) which can be used to open a
+  download directly when getting the filename prompt.
+- New `{host}` replacement for tab- and window titles which evaluates
+  to the current host.
+- New default binding `;t` for `:hint input`.
+- New variables `$QUTE_CONFIG_DIR`, `$QUTE_DATA_DIR` and
+  `$QUTE_DOWNLOAD_DIR` available for userscripts.
+- New option `ui` -> `status-position` to configure the position of the
+  status bar (top/bottom).
+- New `--pdf <filename>` argument for `:print` WHICH can be used to generate a
+  PDF without a dialog.
+
+Changed
+~~~~~~~
+
+- `:scroll-perc` now prefers a count over the argument given to it, which means
+  `gg` can be used with a count.
+- Aliases can now use `;;` to have an alias which executed multiple commands.
+- `:edit-url` now does nothing if the URL isn't changed in the spawned editor.
+- `:bookmark-add` can now be passed a URL and title to add that as a bookmark
+  rather than the current page.
+- New `taskadd` userscript to add a taskwarrior task annotated with the
+  current URL.
+- `:bookmark-del` and `:quickmark-del` now delete the current page's URL if none
+  is given.
+
+Fixed
+-----
+
+- Compatibility with PyQt 5.7
+- Fixed some configuration values being lost when a config option gets removed
+  from qutebrowser's code.
+- Fix crash when downloading with a full disk
+- Using `:jump-mark` (e.g. `''`) when the current URL is invalid doesn't crash
+  anymore.
+
+Removed
+-------
+
+- The ability to display status messages from webpages, as well as the related
+  `ui ->  display-statusbar-messages` setting.
+- The `general -> wrap-search` setting as searches now always wrap.
+  According to a quick straw poll and prior crash logs, almost nobody is using
+  `wrap-search = false`, and turning off wrapping is not possible with
+  QtWebEngine.
+- `:edit-url` now doesn't accept a count anymore as its behavior was confusing
+  and it doesn't make much sense to add a count.
+
+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.
+- New `inputs` group for `:hint` to hint text input fields.
+
+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
+- 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 a 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 an 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
 ------
 
@@ -381,7 +788,7 @@ Fixed
 ~~~~~
 
 - Scrolling should now work more reliably on some pages where arrow keys worked but `hjkl` didn't.
-- Small improvements when checking if an input is an URL or not.
+- Small improvements when checking if an input is a URL or not.
 - Fixed wrong cursor position when completing the first item in the completion.
 - Fixed exception when using search engines with {foo} in their name.
 - Fixed a bug where the same title was shown for all tabs on some systems.
@@ -393,7 +800,7 @@ Fixed
 - Various fixes for deprecated key bindings and auto-migrations.
 - Workaround for qutebrowser not starting when there are NUL-bytes in the history (because of a currently unknown bug).
 - Fixed handling of keybindings containing Ctrl/Meta on OS X.
-- Fixed crash when downloading an URL without filename (e.g. magnet links) via "Save as...".
+- Fixed crash when downloading a URL without filename (e.g. magnet links) via "Save as...".
 - Fixed exception when starting qutebrowser with `:set` as argument.
 - Fixed horrible completion performance when the `shrink` option was set.
 - Sessions now store zoom/scroll-position correctly.
@@ -544,7 +951,7 @@ Fixed
 - Scroll completion to top when showing it.
 - Handle unencodable file paths in config types correctly.
 - Fix for crash when executing a delayed command (because of a shadowed keybinding) and then unfocusing the window.
-- Fix for crash when hinting on a page which doesn't have an URL yet.
+- Fix for crash when hinting on a page which doesn't have a URL yet.
 - Fix exception when using `:set-cmd-text` with an empty argument.
 - Add a timeout to pastebin HTTP replies.
 - Various other fixes for small/rare bugs.

CONTRIBUTING.asciidoc

@@ -11,9 +11,9 @@ This document contains guidelines for contributing to qutebrowser, as well as
 useful hints when doing so.
 
 If anything mentioned here would prevent you from contributing, please let me
-know, and contribute anyways! The guidelines are only meant to make life easier
-for me, but if you don't follow anything in here, I won't be mad at you. I will
-probably change it for you then, though.
+know, and contribute anyways! The guidelines are meant to make life easier for
+me, but if you don't follow everything in here, I won't be mad at you. In
+fact, I will probably change it for you.
 
 If you have any problems, I'm more than happy to help! You can get help in
 several ways:
@@ -44,7 +44,7 @@ require little/no coding]
 
 There are also some things to do if you don't want to write code:
 
-* Help the community, e.g. on the mailinglist and the IRC channel.
+* Help the community, e.g., on the mailinglist and the IRC channel.
 * Improve the documentation.
 * Help on the website and graphics (logo, etc.).
 
@@ -60,7 +60,7 @@ git clone https://github.com/The-Compiler/qutebrowser.git
 
 If you don't know git, a http://git-scm.com/[git cheatsheet] might come in
 handy. Of course, if using git is the issue which prevents you from
-contributing, feel free to send normal patches instead, e.g. generated via
+contributing, feel free to send normal patches instead, e.g., generated via
 `diff -Nur`.
 
 Getting patches
@@ -77,7 +77,7 @@ based on your changes like this:
 ----
 git format-patch origin/master <1>
 ----
-<1> Replace `master` by the branch your work was based on, e.g.
+<1> Replace `master` by the branch your work was based on, e.g.,
 `origin/develop`.
 
 Useful utilities
@@ -89,7 +89,7 @@ Checkers
 qutebrowser uses http://tox.readthedocs.org/en/latest/[tox] to run its
 unittests and several linters/checkers.
 
-Currently, following tox environments are available:
+Currently, the following tox environments are available:
 
 * Tests using https://www.pytest.org[pytest]:
   - `py34`: Run pytest for python-3.4.
@@ -117,18 +117,18 @@ Currently, following tox environments are available:
     - VCS conflict markers
     - common spelling mistakes
 
-The default test suite is run with `tox`, the list of default
-environments is obtained with `tox -l` .
+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
+There's always the possibility of false positives; the following
 techniques are useful to handle these:
 
 * Use `_foo` for unused parameters, with `foo` being a descriptive name. Using
 `_` is discouraged.
-* If you think you have a good reason to suppress a message, add the following
-comment:
+* If you think you have a good reason to suppress a message, then add the 
+following comment:
 +
 ----
 # pylint: disable=message-name
@@ -158,11 +158,11 @@ Examples:
 # run only pytest tests which failed in last run:
 tox -e py35 -- --lf
 
-# run only the integration feature tests:
-tox -e py35 -- tests/integration/features
+# 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/integration/features/test_tabs.py -k undo
+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
@@ -174,18 +174,22 @@ 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
 ~~~~~~~~~
 
-In the `qutebrowser.utils.debug` module there are some useful functions for
-debugging.
+There are some useful functions for debugging in the `qutebrowser.utils.debug`
+module.
 
-When starting qutebrowser with the `--debug` flag you also get useful debug
+When starting qutebrowser with the `--debug` flag, you also get useful debug
 logs. You can add +--logfilter _category[,category,...]_+ to restrict logging
 to the given categories.
 
@@ -212,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:
 
@@ -273,10 +276,10 @@ Hints
 Python and Qt objects
 ~~~~~~~~~~~~~~~~~~~~~
 
-For many tasks, there are solutions in both Qt and the Python standard library
-available.
+For many tasks, there are solutions available in both Qt and the Python
+standard library.
 
-In qutebrowser, the policy is usually using the Python libraries, as they
+In qutebrowser, the policy is usually to use the Python libraries, as they
 provide exceptions and other benefits.
 
 There are some exceptions to that:
@@ -289,7 +292,7 @@ slots.
 
 When using Qt objects, two issues must be taken care of:
 
-* Methods of Qt objects report their status by using their return values,
+* Methods of Qt objects report their status with their return values,
 instead of using exceptions.
 +
 If a function gets or returns a Qt object which has an `.isValid()`
@@ -301,13 +304,12 @@ on all such objects. It will raise
 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
+* 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.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).
+To avoid passing too large of a numeric parameter to a Qt function, all 
+numbers should be range-checked using `qutebrowser.qtutils.check_overflow`,
+or by other means (e.g. by setting a maximum value for a config object).
 
 [[object-registry]]
 The object registry
@@ -336,8 +338,8 @@ window=_win-id_, tab=_tab-id_])+. The default scope is `global`.
 All objects can be printed by starting with the `--debug` flag and using the
 `:debug-all-objects` command.
 
-The registry is mainly used for <<commands,command handlers>> but also can be
-useful in places where using Qt's
+The registry is mainly used for <<commands,command handlers>>, but it can
+also be useful in places where using Qt's
 http://doc.qt.io/qt-5/signalsandslots.html[signals and slots] mechanism would
 be difficult.
 
@@ -347,7 +349,7 @@ Logging
 Logging is used at various places throughout the qutebrowser code. If you add a
 new feature, you should also add some strategic debug logging.
 
-Unless other Python projects, qutebrowser doesn't use a logger per file,
+Unlike other Python projects, qutebrowser doesn't use a logger per file,
 instead it uses custom-named loggers.
 
 The existing loggers are defined in `qutebrowser.utils.log`. If your feature
@@ -371,7 +373,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.
@@ -410,42 +412,66 @@ 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
+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
+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, for example, 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
@@ -455,13 +481,13 @@ qutebrowser handles two different types of URLs: URLs as a string, and URLs as
 the Qt `QUrl` type. As this can get confusing quickly, please follow the
 following guidelines:
 
-* Convert a string to a QUrl object as early as possible, i.e. directly after
+* Convert a string to a QUrl object as early as possible, i.e., directly after
 the user did enter it.
     - Use `utils.urlutils.fuzzy_url` if the URL is entered by the user
       somewhere.
     - Be sure you handle `utils.urlutils.FuzzyError` and display an error
       message to the user.
-* Convert a `QUrl` object to a string as late as possible, e.g. before
+* Convert a `QUrl` object to a string as late as possible, i.e., before
 displaying it to the user.
     - If you want to display the URL to the user, use `url.toDisplayString()`
       so password information is removed.
@@ -487,8 +513,8 @@ This is needed so valgrind handles self-modifying code correctly:
 [quote]
 ____
 This option controls Valgrind's detection of self-modifying code. If no
-checking is done, if a program executes some code, then overwrites it with new
-code, and executes the new code, Valgrind will continue to execute the
+checking is done and a program executes some code, overwrites it with new
+code, and then executes the new code, Valgrind will continue to execute the
 translations it made for the old code. This will likely lead to incorrect
 behavior and/or crashes.
 
@@ -500,6 +526,21 @@ generate code and subsequently overwrite part or all of it. Running with all
 will slow Valgrind down noticeably.
 ____
 
+Setting up a Windows Development Environment
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Install https://www.python.org/downloads/release/python-344/[Python 3.4]
+* Install https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/[PyQt 5.5]
+* Create a file at `C:\Windows\system32\python3.bat` with the following content:
+  `@C:\Python34\python %*`
+  This will make the Python 3.4 interpreter available as `python3`, which is used by various development scripts.
+* Install git from the https://git-scm.com/download/win[git-scm downloads page]
+  Try not to enable `core.autocrlf`, since that will cause `flake8` to complain a lot. Use an editor that can deal with plain line feeds instead.
+* Clone your favourite qutebrowser repository.
+* To install tox, open an elevated cmd, enter your working directory and run `pip install -rmisc/requirements/requirements-tox.txt`.
+
+Note that the `flake8` tox env might not run due to encoding errors despite having LANG/LC_* set correctly.
+
 Style conventions
 -----------------
 
@@ -568,10 +609,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
@@ -605,29 +643,28 @@ qutebrowser release
 ~~~~~~~~~~~~~~~~~~~
 
 * Make sure there are no unstaged changes and the tests are green.
+* Run `x=... y=...` to set the respective shell variables
 
+* 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.
+* Update changelog (remove *(unreleased)*)
 * 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`
+* Create annotated git tag (`git tag -s "v0.$x.$y" -m "Release v0.$x.$y"`)
+* `git push origin`; `git push origin 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.
 
-* Run `scripts/dev/build_release.py` on Linux to build an sdist
-* Upload to PyPI: `twine upload dist/foo{,.asc}`
-* Create Windows packages via `scripts/dev/build_release.py` and upload.
-
-* Upload to qutebrowser.org with checksum/GPG
-    - On server: `sudo mkdir -p /srv/http/qutebrowser/releases/v0.X.Y/windows`
-    - `rsync -avPh dist/ tonks:`
-    - On server: `sudo mv qutebrowser-0.X.Y.tar.gz* /srv/http/qutebrowser/releases/v0.X.Y`
-
-* Update AUR package
-* Announce to qutebrowser mailinglist
+* Linux: Run `python3 scripts/dev/build_release.py --upload v0.$x.$y`
+* Windows: Run `C:\Python34_x32\python scripts\dev\build_release.py --asciidoc C:\Python27\python C:\asciidoc-8.6.9\asciidoc.py --upload v0.X.Y` (replace X/Y by hand)
+* OS X: Run `python3 scripts/dev/build_release.py --upload v0.X.Y` (replace X/Y by hand)
+* On server: Run `python3 scripts/dev/download_release.py v0.X.Y` (replace X/Y by hand)
+* Update `qutebrowser-git` PKGBUILD if dependencies/install changed
+* Announce to qutebrowser and qutebrowser-announce mailinglist

FAQ.asciidoc

@@ -80,13 +80,27 @@ 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

INSTALL.asciidoc

@@ -10,9 +10,33 @@ qutebrowser should run on these systems:
 * Ubuntu Trusty (14.04 LTS) or newer
 * 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-pyqt5.qtquick python3-sip python3-jinja2 python3-pygments python3-yaml
+----
+
+Get the qutebrowser package from the
+https://github.com/The-Compiler/qutebrowser/releases[release page] and download
+the https://qutebrowser.org/python3-pypeg2_2.15.2-1_all.deb[PyPEG2 package].
+
+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 +56,7 @@ Then install the packages like this:
 
 ----
 # apt-get update
-# apt-get install -t experimental python3-pyqt5 python3-pyqt5.qtwebkit python3-sip python3-dev
+# apt-get install -t experimental python3-pyqt5 python3-pyqt5.qtwebkit python3-pyqt5.qtquick python3-sip python3-dev
 # apt-get install python-tox
 ----
 
@@ -50,7 +74,7 @@ For distributions other than Debian or if you prefer to not use the
 experimental repo:
 
 ----
-# apt-get install python3-pyqt5 python3-pyqt5.qtwebkit python-tox python3-sip python3-dev
+# apt-get install python3-pyqt5 python3-pyqt5.qtwebkit python3-pyqt5.qtquick python-tox python3-sip python3-dev
 ----
 
 To generate the documentation for the `:help` command, when using the git
@@ -121,6 +145,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
 -------------
 
@@ -156,6 +187,24 @@ Or add the repo manually:
 # zypper install qutebrowser
 ----
 
+On OpenBSD
+----------
+
+qutebrowser is in http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/qutebrowser/[OpenBSD ports].
+
+Manual install:
+
+----
+# cd /usr/ports/www/qutebrowser
+# make install
+----
+
+Or alternatively if you're using `-current` (or OpenBSD 6.1 once it's been released):
+
+----
+# pkg_add qutebrowser
+----
+
 On Windows
 ----------
 
@@ -200,21 +249,42 @@ Then <<tox,install qutebrowser via tox>>.
 On OS X
 -------
 
-*Using qutebrowser with Homebrew on OS X is currently broken, as Homebrew
-dropped QtWebKit support with Qt 5.6. I'm working on building a standalone
-`.app` for OS X instead, but it'll still take a few days until it's ready.*
+Prebuilt binary
+~~~~~~~~~~~~~~~
 
-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.
+The easiest way to install qutebrowser on OS X is to use the prebuilt `.app`
+files from the
+https://github.com/The-Compiler/qutebrowser/releases[release page].
+
+This binary is also available through the
+https://caskroom.github.io/[Homebrew Cask] package manager:
 
 ----
-$ brew install python3 pyqt5
+$ brew cask install qutebrowser
+----
+
+Manual Install
+~~~~~~~~~~~~~~
+
+Alternatively, you can install the dependencies via a package manager (like
+http://brew.sh/[Homebrew] or https://www.macports.org/[MacPorts]) and run
+qutebrowser from source.
+
+==== Homebrew
+
+Homebrew's builds of Qt and PyQt no longer include QtWebKit, so it is necessary 
+to build from source. The build takes several hours on an average laptop.
+
+----
+$ brew install qt5 --with-qtwebkit
+$ brew install -s pyqt5
+
 $ pip3.5 install qutebrowser
 ----
 
-if you are using Homebrew. For MacPorts, run:
+==== MacPorts
+
+For MacPorts, run:
 
 ----
 $ sudo port install python34 py34-jinja2 asciidoc py34-pygments py34-pyqt5
@@ -255,6 +325,12 @@ https://docs.python.org/3/library/venv.html[virtual environment]:
 $ tox -e mkvenv
 ----
 
+On Windows, run tox with the 'mkvenv-win' option, however make sure that ONLY Python3 is in your PATH before running tox.
+
+----
+$ tox -e mkvenv-win
+----
+
 This installs all needed Python dependencies in a `.venv` subfolder. The
 system-wide Qt5/PyQt5 installations are symlinked into the virtual environment.
 

MANIFEST.in

@@ -1,12 +1,13 @@
 recursive-include qutebrowser *.py
-recursive-include qutebrowser/html *.html
 recursive-include qutebrowser/img *.svg *.png
 recursive-include qutebrowser/test *.py
 recursive-include qutebrowser/javascript *.js
+graft qutebrowser/html
 graft qutebrowser/3rdparty
 graft icons
 graft doc/img
-graft misc
+graft misc/apparmor
+graft misc/userscripts
 recursive-include scripts *.py
 include qutebrowser/utils/testfile
 include qutebrowser/git-commit-id
@@ -15,25 +16,34 @@ include qutebrowser.desktop
 include requirements.txt
 include tox.ini
 include qutebrowser.py
+include misc/cheatsheet.svg
 
 prune www
 prune scripts/dev
+prune scripts/testbrowser_cpp
+prune .github
 exclude scripts/asciidoc2html.py
 exclude doc/notes
 recursive-exclude doc *.asciidoc
 include doc/qutebrowser.1.asciidoc
 prune tests
 prune qutebrowser/3rdparty
+prune misc/requirements
+prune misc/docker
+exclude .editorconfig
 exclude pytest.ini
 exclude qutebrowser.rcc
 exclude .coveragerc
 exclude .pylintrc
-exclude .eslintrc
-exclude .eslintignore
+exclude qutebrowser/javascript/.eslintrc.yaml
+exclude qutebrowser/javascript/.eslintignore
 exclude doc/help
 exclude .appveyor.yml
 exclude .travis.yml
+exclude codecov.yml
 exclude .pydocstylerc
 exclude misc/appveyor_install.py
+exclude misc/qutebrowser.spec
+exclude .flake8
 
 global-exclude __pycache__ *.pyc *.pyo

README.asciidoc

@@ -15,6 +15,8 @@ image:https://requires.io/github/The-Compiler/qutebrowser/requirements.svg?branc
 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:https://www.qutebrowser.org[website] | link:https://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
@@ -22,12 +24,6 @@ on Python, PyQt5 and QtWebKit and free software, licensed under the GPL.
 
 It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl.
 
-// QUTE_WEB_HIDE
-**qutebrowser is currently running a crowdfunding campaign to add support for
-the QtWebEngine backend, which fixes many issues. Please
-link:http://igg.me/at/qutebrowser[check it out]!**
-// QUTE_WEB_HIDE_END
-
 Screenshots
 -----------
 
@@ -52,9 +48,10 @@ Documentation
 In addition to the topics mentioned in this README, the following documents are
 available:
 
-* A http://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]: +
-image:http://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="http://qutebrowser.org/img/cheatsheet-big.png"]
+* A https://qutebrowser.org/img/cheatsheet-big.png[key binding cheatsheet]: +
+image:https://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://qutebrowser.org/img/cheatsheet-big.png"]
 * link:doc/quickstart.asciidoc[Quick start guide]
+* A https://www.shortcutfoo.com/app/dojos/qutebrowser[free training course] to remember those key bindings.
 * link:FAQ.asciidoc[Frequently asked questions]
 * link:CONTRIBUTING.asciidoc[Contributing to qutebrowser]
 * link:INSTALL.asciidoc[INSTALL]
@@ -73,6 +70,9 @@ message to the
 https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[mailinglist] at
 mailto:qutebrowser@lists.qutebrowser.org[].
 
+There's also a https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser-announce[announce-only mailinglist]
+at mailto:qutebrowser-announce@lists.qutebrowser.org[].
+
 Contributions / Bugs
 --------------------
 
@@ -90,7 +90,7 @@ https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[mailinglist] at
 mailto:qutebrowser@lists.qutebrowser.org[].
 
 For security bugs, please contact me directly at mail@qutebrowser.org, GPG ID
-http://www.the-compiler.org/pubkey.asc[0xFD55A072].
+https://www.the-compiler.org/pubkey.asc[0xFD55A072].
 
 Requirements
 ------------
@@ -115,11 +115,8 @@ The following libraries are optional and provide a better user experience:
 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.
@@ -148,81 +145,132 @@ Contributors, sorted by the number of commits in descending order:
 // QUTE_AUTHORS_START
 * Florian Bruhin
 * Daniel Schadt
+* Ryan Roden-Corrent
+* Jakub Klinkovský
+* Jan Verbeek
 * Antoni Boucher
 * Lamar Pavel
+* Marshall Lochbaum
 * Bruno Oliveira
 * Alexander Cogneau
-* Martin Tournoij
 * Felix Van der Jeugt
+* Daniel Karbach
+* Martin Tournoij
+* Kevin Velghe
 * Raphael Pierzina
 * Joel Torstensson
 * Patric Schmitz
-* Claude
-* meles5
 * Tarcisio Fedrizzi
+* Claude
+* Corentin Julé
+* meles5
+* Philipp Hansch
+* Panagiotis Ktistakis
 * Artur Shaik
 * Nathan Isom
 * Thorsten Wißmann
-* Philipp Hansch
-* Kevin Velghe
 * Austin Anderson
+* Jimmy
+* Fritz Reichwald
+* Niklas Haas
+* Maciej Wołczyk
+* Spreadyy
 * Alexey "Averrin" Nabrodov
+* nanjekyejoannah
 * avk
 * ZDarian
 * Milan Svoboda
 * John ShaggyTwoDope Jenkins
-* Jimmy
-* Peter Vilim
 * Clayton Craft
+* Peter Vilim
+* knaggita
 * Oliver Caldwell
+* Julian Weigt
+* Sebastian Frysztak
 * Jonas Schürmann
-* Panagiotis Ktistakis
-* Jakub Klinkovský
-* skinnay
 * error800
+* Michael Hoang
+* Liam BEGUIN
+* Julie Engel
+* skinnay
 * Zach-Button
+* Tomasz Kramkowski
+* Samuel Walladge
+* Peter Rice
+* Nikolay Amiantov
+* Ismail S
 * Halfwit
+* David Vogt
+* Claire Cavanaugh
 * rikn00
+* kanikaa1234
+* haitaka
+* Nick Ginther
+* Michał Góral
 * Michael Ilsaas
 * Martin Zimmermann
+* Jussi Timperi
 * Brian Jackson
+* thuck
 * sbinix
 * neeasade
 * jnphilipp
 * Tobias Patzl
+* Stefan Tatschner
+* Samuel Loury
 * Peter Michely
+* Panashe M. Fundira
 * Link
 * Larry Hynes
 * Johannes Altmanninger
+* Jeremy Kaplan
+* Ismail
+* Edgar Hipp
+* Daryl Finlay
+* arza
+* adam
 * Samir Benmendil
-* Ryan Roden-Corrent
 * Regina Hug
 * Mathias Fussenegger
 * Marcelo Santos
-* Fritz V155 Reichwald
+* Joel Bradshaw
+* Jean-Louis Fuchs
 * Franz Fellner
-* Corentin Jule
+* Eric Drechsel
 * zwarag
 * xd1le
+* rsteube
+* rmortens
+* oniondreams
 * issue
 * haxwithaxe
 * evan
 * dylan araps
-* Tomasz Kramkowski
+* addictedtoflames
+* Xitian9
 * Tomas Orsava
+* Tom Janson
 * Tobias Werth
 * Tim Harder
 * Thiago Barroso Perrotta
-* Stefan Tatschner
 * Sorokin Alexei
-* Samuel Loury
+* Simon Désaulniers
+* Rok Mandeljc
+* Noah Huesser
+* Moez Bouhlel
 * Matthias Lisin
 * Marcel Schilling
+* Lazlow Carmichael
+* Ján Kobezda
+* Johannes Martinsson
 * Jean-Christophe Petkovich
+* Jay Kamat
 * Helen Sherwood-Taylor
 * HalosGhost
 * Gregor Pohl
 * Eivind Uggedal
+* Dietrich Daroch
+* Derek Sivers
 * Daniel Lu
 * Arseniy Seroka
 * Andy Balaam
@@ -231,7 +279,8 @@ Contributors, sorted by the number of commits in descending order:
 
 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
@@ -276,6 +325,7 @@ problems and helpful hints:
 
 Also, thanks to:
 
+* Everyone contributing to the link:doc/backers.asciidoc[crowdfunding].
 * Everyone who had the patience to test qutebrowser before v0.1.
 * Everyone triaging/fixing my bugs in the
 https://bugreports.qt.io/secure/Dashboard.jspa[Qt bugtracker]

codecov.yml

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

doc/backers.asciidoc

@@ -0,0 +1,172 @@
+Crowdfunding backers
+====================
+
+Mid-2016, qutebrowser did run a http://igg.me/at/qutebrowser[crowdfunding] for
+QtWebEngine support in qutebrowser.
+
+Thanks a lot to the following people who contributed to it:
+
+Gold sponsors
+-------------
+
+- Chris Salzberg
+- Clayton Craft
+- Jean-Louis Fuchs
+- Matthias Lisin
+- 1 Anonymous
+
+Day sponsors
+------------
+
+- Agent 42
+- Iggy Jackson
+- James B
+- Rudi Seitz
+- Tim „Das MooL“ Wegener
+- amd1212
+- gavtroy
+- 4 Anonymous
+
+Other sponsors
+--------------
+
+- AP M
+- Alessandro Balzano
+- Allan Nordhøy
+- Andor Uhlar
+- Andreas Leppert
+- Andreas Saga Romsdal
+- Andrew Rogers / tuxlovesyou
+- André Glüpker
+- Arian Sanusi
+- Arin Lares
+- Assaf Lavie
+- Baptiste Wicht
+- Benjamin Richter
+- Benjamin Schnitzler
+- Bernardo Kuri
+- Boris Kourtoukov
+- Brian Buccola
+- Bruno Oliveira
+- Bryan Gilbert
+- Cassandra Rebecca Ruppen
+- Charles Saternos
+- Chris H
+- Christian Karl
+- Christian Lange
+- Christian Strasser
+- Colin O'Brien
+- Corsin Pfister
+- Cosmin Popescu
+- Daniel Andersson
+- David Wilson
+- Demure Demeanor
+- Doug Stone-Weaver
+- Eero Kari
+- Enric Morales
+- Eric Krohn
+- Eskild Hustvedt
+- Federico Panico
+- Felix Van der Jeugt
+- Francis Tseng
+- Geir Isene
+- George Voronin
+- German Correa
+- Grady Martin
+- Gregor Böhl
+- Guilherme Stein
+- Hannes Doyle
+- Hasan Soydabas
+- Ian Scott
+- Jacob Boldman
+- Jacob Wikmark
+- Jan Verbeek
+- Jarrod Seccombe
+- Joel Bradshaw
+- Johannes Martinsson
+- Jonas Schürmann
+- Josh Medeiros
+- José Alberto Orejuela García
+- Julie Engel
+- Jörg Behrmann
+- Jørgen Skancke
+- Kevin Velghe
+- Konstantin Shmelkov
+- Kyle Frazer
+- Lukas Gierth
+- Mar v Leeuwaarde
+- Marek Roszman
+- Marius Betz
+- Marius Krämer
+- Markus Schmidinger
+- Martin Gabelmann
+- Martin Zimmermann
+- Mathias Fußenegger
+- Maxime Wack
+- Michał Góral
+- Nathan Isom
+- Nathanael Philipp
+- Nils Stål
+- Oliver Hope
+- Oskar Nyberg
+- Pablo Navarro
+- Panashe M. Fundira
+- Patric Schmitz
+- Pete M
+- Peter Smith
+- Phil Collins
+- Philipp Hansch
+- Philipp Kuhnz
+- Raphael Khaiat
+- Raphael Pierzina
+- Renan Guilherme
+- Rick Losie
+- Robert Cross
+- Roy Van Ginneken
+- Rupus Reinefjord
+- Ryan Roden-Corrent
+- Samir Benmendil
+- Simon Giotta
+- Stephen England
+- Sverrir H Steindorsson
+- Tarcisio Fedrizzi
+- Thorsten Wißmann
+- Timon Stampfli
+- Tjelvar Olsson
+- Tomasz Kramkowski
+- Tsukiko Tsutsukakushi
+- Vasilij Schneidermann
+- Vinney Cavallo
+- Wesly Grefrath
+- Will Ware
+- Yousaf Khurshid
+- Zach Schultz
+- averrin
+- ben hengst
+- colin
+- craigtski47
+- dag.robole
+- daniel.m.kao
+- diepfann3
+- eamonn oneil
+- esakaforever
+- francois47
+- glspisso
+- gmccoy4242
+- gtcee3
+- jonathf
+- lapinski.maciej
+- lauri.hakko
+- ljanzen
+- mutilx9
+- nussgipfel
+- oed
+- p p
+- r.c.bruno.andre
+- robert.perce
+- sghctoma
+- targy
+- freelancer
+- pupu
+- regines
+- 37 Anonymous

doc/help/commands.asciidoc

@@ -1,5 +1,23 @@
+// DO NOT EDIT THIS FILE DIRECTLY!
+// It is autogenerated from docstrings by running:
+//   $ python3 scripts/dev/src2asciidoc.py
+
 = Commands
 
+In qutebrowser, all keybindings are mapped to commands.
+
+Some commands are hidden, which means they don't show up in the command
+completion when pressing `:`, as they're typically not useful to run by hand.
+
+For command arguments, there are also some variables you can use:
+
+- `{url}` expands to the URL of the current page
+- `{url:pretty}` expands to the URL in decoded format
+- `{clipboard}` expands to the clipboard contents
+- `{primary}` expands to the primary selection contents
+
+It is possible to run or bind multiple commands by separating them with `;;`.
+
 == Normal commands
 .Quick reference
 [options="header",width="75%",cols="25%,75%"]
@@ -8,7 +26,7 @@
 |<<adblock-update,adblock-update>>|Update the adblock block lists.
 |<<back,back>>|Go back in the history of the current tab.
 |<<bind,bind>>|Bind a key to a command.
-|<<bookmark-add,bookmark-add>>|Save the current page as a bookmark.
+|<<bookmark-add,bookmark-add>>|Save the current page as a bookmark, or a specific url.
 |<<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.
@@ -20,28 +38,33 @@
 |<<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.
+|<<insert-text,insert-text>>|Insert text at cursor position.
 |<<inspector,inspector>>|Toggle the web inspector.
 |<<jseval,jseval>>|Evaluate a JavaScript string.
 |<<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.
 |<<print,print>>|Print the current/[count]th tab.
 |<<quickmark-add,quickmark-add>>|Add a new quickmark.
 |<<quickmark-del,quickmark-del>>|Delete a quickmark.
 |<<quickmark-load,quickmark-load>>|Load a quickmark.
 |<<quickmark-save,quickmark-save>>|Save the current page as a quickmark.
 |<<quit,quit>>|Quit qutebrowser.
+|<<record-macro,record-macro>>|Start or stop recording a macro.
 |<<reload,reload>>|Reload the current/[count]th tab.
 |<<repeat,repeat>>|Repeat a given command.
 |<<report,report>>|Report a bug in qutebrowser.
 |<<restart,restart>>|Restart qutebrowser while keeping existing tabs open.
+|<<run-macro,run-macro>>|Run a recorded macro.
 |<<save,save>>|Save configs and state.
 |<<search,search>>|Search for a text on the current page. With no text, clear results.
 |<<session-delete,session-delete>>|Delete a session.
@@ -55,16 +78,16 @@
 |<<tab-close,tab-close>>|Close the current/[count]th tab.
 |<<tab-detach,tab-detach>>|Detach the current tab to its own window.
 |<<tab-focus,tab-focus>>|Select the tab given as argument/[count].
-|<<tab-move,tab-move>>|Move the current tab.
+|<<tab-move,tab-move>>|Move the current tab according to the argument and [count].
 |<<tab-next,tab-next>>|Switch to the next tab, or switch [count] tabs forward.
 |<<tab-only,tab-only>>|Close all tabs except for the current one.
 |<<tab-prev,tab-prev>>|Switch to the previous tab, or switch [count] tabs back.
 |<<unbind,unbind>>|Unbind a keychain.
 |<<undo,undo>>|Re-open a closed tab (optionally skipping [count] closed tabs).
 |<<view-source,view-source>>|Show the source of the current page.
+|<<window-only,window-only>>|Close all windows except for the current one.
 |<<wq,wq>>|Save open pages and quit.
-|<<yank,yank>>|Yank the current URL/title to the clipboard or primary selection.
-|<<yank-selected,yank-selected>>|Yank the selected text to the clipboard or primary selection.
+|<<yank,yank>>|Yank something to the clipboard or primary selection.
 |<<zoom,zoom>>|Set the zoom level for the current tab.
 |<<zoom-in,zoom-in>>|Increase the zoom level for the current tab.
 |<<zoom-out,zoom-out>>|Decrease the zoom level for the current tab.
@@ -73,7 +96,7 @@
 === 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.
+This updates `~/.local/share/qutebrowser/blocked-hosts` with downloaded host lists and re-reads `~/.config/qutebrowser/blocked-hosts`.
 
 [[back]]
 === back
@@ -91,13 +114,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`).
@@ -107,27 +131,40 @@ Bind a key to a command.
 ==== 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.
+* This command does not replace variables like +\{url\}+.
 
 [[bookmark-add]]
 === bookmark-add
-Save the current page as a bookmark.
+Syntax: +:bookmark-add [*--toggle*] ['url'] ['title']+
+
+Save the current page as a bookmark, or a specific url.
+
+If no url and title are provided, then save the current page as a bookmark. If a url and title have been provided, then save the given url as a bookmark with the provided title. You can view all saved bookmarks on the link:qute://bookmarks[bookmarks page].
+
+==== positional arguments
+* +'url'+: url to save as a bookmark. If None, use url of current page.
+* +'title'+: title of the new bookmark.
+
+==== optional arguments
+* +*-t*+, +*--toggle*+: remove the bookmark instead of raising an error if it already exists.
+
 
 [[bookmark-del]]
 === bookmark-del
-Syntax: +:bookmark-del 'url'+
+Syntax: +:bookmark-del ['url']+
 
 Delete a bookmark.
 
 ==== positional arguments
-* +'url'+: The URL of the bookmark to delete.
+* +'url'+: The url of the bookmark to delete. If not given, use the current page's url.
+
 
 ==== note
 * This command does not split arguments after the last argument and handles quotes literally.
-* With this command, +;;+ is interpreted literally instead of splitting off a second command.
 
 [[bookmark-load]]
 === bookmark-load
-Syntax: +:bookmark-load [*--tab*] [*--bg*] [*--window*] 'url'+
+Syntax: +:bookmark-load [*--tab*] [*--bg*] [*--window*] [*--delete*] 'url'+
 
 Load a bookmark.
 
@@ -138,10 +175,10 @@ Load a bookmark.
 * +*-t*+, +*--tab*+: Load the bookmark in a new tab.
 * +*-b*+, +*--bg*+: Load the bookmark in a new background tab.
 * +*-w*+, +*--window*+: Load the bookmark in a new window.
+* +*-d*+, +*--delete*+: Whether to delete the bookmark afterwards.
 
 ==== 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
@@ -161,7 +198,7 @@ Close the current window.
 
 [[download]]
 === download
-Syntax: +:download [*--mhtml*] [*--dest* 'DEST'] ['url'] ['dest-old']+
+Syntax: +:download [*--mhtml*] [*--dest* 'dest'] ['url'] ['dest-old']+
 
 Download a given URL, or current page if no URL given.
 
@@ -199,11 +236,24 @@ The index of the download to delete.
 
 [[download-open]]
 === download-open
+Syntax: +:download-open ['cmdline']+
+
 Open the last/[count]th download.
 
+If no specific command is given, this will use the system's default application to open the file.
+
+==== positional arguments
+* +'cmdline'+: The command which should be used to open the file. A `{}` is expanded to the temporary file name. If no `{}` is
+ present, the filename is automatically appended to the
+ cmdline.
+
+
 ==== count
 The index of the download to open.
 
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+
 [[download-remove]]
 === download-remove
 Syntax: +:download-remove [*--all*]+
@@ -223,6 +273,22 @@ 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.
+
 [[fake-key]]
 === fake-key
 Syntax: +:fake-key [*--global*] 'keystring'+
@@ -275,16 +341,18 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--rapid*] ['group'] ['target'] ['args' ['args' ...]]+
+Syntax: +:hint [*--rapid*] [*--mode* 'mode'] [*--add-history*]
+     ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
 
 ==== positional arguments
-* +'group'+: The hinting mode to use. 
+* +'group'+: The element types to hint. 
 
  - `all`: All clickable elements.
  - `links`: Only links.
  - `images`: Only images.
+ - `inputs`: Only input fields.
  
 
 
@@ -330,11 +398,43 @@ Start hinting.
 * +*-r*+, +*--rapid*+: Whether to do rapid hinting. This is only possible with targets `tab` (with background-tabs=true), `tab-bg`,
  `window`, `run`, `hover`, `userscript` and `spawn`.
 
+* +*-m*+, +*--mode*+: The hinting mode to use. 
+
+ - `number`: Use numeric hints.
+ - `letter`: Use the chars in the hints->chars settings.
+ - `word`: Use hint words based on the html elements and the
+ extra words.
+ 
+
+
+* +*-a*+, +*--add-history*+: Whether to add the spawned or yanked link to the browsing history.
+
+
+==== 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.
 
+[[insert-text]]
+=== insert-text
+Syntax: +:insert-text 'text'+
+
+Insert text at cursor position.
+
+==== positional arguments
+* +'text'+: The text to insert.
+
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+
 [[inspector]]
 === inspector
 Toggle the web inspector.
@@ -343,7 +443,7 @@ Note: Due a bug in Qt, the inspector will show incorrect request headers in the
 
 [[jseval]]
 === jseval
-Syntax: +:jseval [*--quiet*] 'js-code'+
+Syntax: +:jseval [*--quiet*] [*--world* 'world'] 'js-code'+
 
 Evaluate a JavaScript string.
 
@@ -352,6 +452,8 @@ Evaluate a JavaScript string.
 
 ==== optional arguments
 * +*-q*+, +*--quiet*+: Don't show resulting JS object.
+* +*-w*+, +*--world*+: Ignored on QtWebKit. On QtWebEngine, a world ID or name to run the snippet in.
+
 
 ==== note
 * This command does not split arguments after the last argument and handles quotes literally.
@@ -370,6 +472,23 @@ Execute a command after some time.
 ==== 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.
+* This command does not replace variables like +\{url\}+.
+
+[[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
@@ -396,16 +515,24 @@ This tries to automatically click on typical _Previous Page_ or _Next Page_ link
 * +*-b*+, +*--bg*+: Open in a background tab.
 * +*-w*+, +*--window*+: Open in a new window.
 
+==== count
+For `increment` and `decrement`, the number to change the URL by. For `up`, the number of levels to go up in the URL.
+
+
 [[open]]
 === open
-Syntax: +:open [*--bg*] [*--tab*] [*--window*] ['url']+
+Syntax: +:open [*--implicit*] [*--bg*] [*--tab*] [*--window*] ['url']+
 
 Open a URL in the current/[count]th tab.
 
+If the URL contains newlines, each line gets opened in its own tab.
+
 ==== positional arguments
 * +'url'+: The URL to open.
 
 ==== optional arguments
+* +*-i*+, +*--implicit*+: If opening a new tab, treat the tab as implicit (like clicking on a link).
+
 * +*-b*+, +*--bg*+: Open in a new background tab.
 * +*-t*+, +*--tab*+: Open in a new tab.
 * +*-w*+, +*--window*+: Open in a new window.
@@ -415,30 +542,16 @@ 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
-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.
-* +*-b*+, +*--bg*+: Open in a background tab.
-* +*-w*+, +*--window*+: Open in new window.
 
 [[print]]
 === print
-Syntax: +:print [*--preview*]+
+Syntax: +:print [*--preview*] [*--pdf* 'file']+
 
 Print the current/[count]th tab.
 
 ==== optional arguments
 * +*-p*+, +*--preview*+: Show preview instead of printing.
+* +*-f*+, +*--pdf*+: The file path to write the PDF to.
 
 ==== count
 The tab index to print.
@@ -449,22 +562,25 @@ Syntax: +:quickmark-add 'url' 'name'+
 
 Add a new quickmark.
 
+You can view all saved quickmarks on the link:qute://bookmarks[bookmarks page].
+
 ==== positional arguments
 * +'url'+: The url to add as quickmark.
 * +'name'+: The name for the new quickmark.
 
 [[quickmark-del]]
 === quickmark-del
-Syntax: +:quickmark-del 'name'+
+Syntax: +:quickmark-del ['name']+
 
 Delete a quickmark.
 
 ==== positional arguments
-* +'name'+: The name of the quickmark to delete.
+* +'name'+: The name of the quickmark to delete. If not given, delete the quickmark for the current page (choosing one arbitrarily
+ if there are more than one).
+
 
 ==== 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
@@ -482,7 +598,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
@@ -492,6 +607,15 @@ Save the current page as a quickmark.
 === quit
 Quit qutebrowser.
 
+[[record-macro]]
+=== record-macro
+Syntax: +:record-macro ['register']+
+
+Start or stop recording a macro.
+
+==== positional arguments
+* +'register'+: Which register to store the macro in.
+
 [[reload]]
 === reload
 Syntax: +:reload [*--force*]+
@@ -517,6 +641,7 @@ Repeat a given command.
 ==== 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.
+* This command does not replace variables like +\{url\}+.
 
 [[report]]
 === report
@@ -526,6 +651,18 @@ Report a bug in qutebrowser.
 === restart
 Restart qutebrowser while keeping existing tabs open.
 
+[[run-macro]]
+=== run-macro
+Syntax: +:run-macro ['register']+
+
+Run a recorded macro.
+
+==== positional arguments
+* +'register'+: Which macro to run.
+
+==== count
+How many times to run the macro.
+
 [[save]]
 === save
 Syntax: +:save ['what' ['what' ...]]+
@@ -550,7 +687,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
@@ -597,7 +733,7 @@ Save a session.
 
 [[set]]
 === set
-Syntax: +:set [*--temp*] [*--print*] ['section'] ['option'] ['value']+
+Syntax: +:set [*--temp*] [*--print*] ['section'] ['option'] ['values' ['values' ...]]+
 
 Set an option.
 
@@ -606,7 +742,7 @@ If the option name ends with '?', the value of the option is shown instead. If t
 ==== positional arguments
 * +'section'+: The section where the option is in.
 * +'option'+: The name of the option.
-* +'value'+: The value to set.
+* +'values'+: The value to set, or the values to cycle through.
 
 ==== optional arguments
 * +*-t*+, +*--temp*+: Set value temporarily.
@@ -627,7 +763,6 @@ Preset the statusbar to some 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.
 
 [[spawn]]
 === spawn
@@ -635,8 +770,6 @@ Syntax: +:spawn [*--userscript*] [*--verbose*] [*--detach*] 'cmdline'+
 
 Spawn a command in a shell.
 
-Note the {url} variable which gets replaced by the current URL might be useful here.
-
 ==== positional arguments
 * +'cmdline'+: The commandline to execute.
 
@@ -652,7 +785,6 @@ Note the {url} variable which gets replaced by the current URL might be useful h
 
 ==== 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
@@ -673,13 +805,13 @@ Duplicate the current tab.
 
 [[tab-close]]
 === tab-close
-Syntax: +:tab-close [*--left*] [*--right*] [*--opposite*]+
+Syntax: +:tab-close [*--prev*] [*--next*] [*--opposite*]+
 
 Close the current/[count]th tab.
 
 ==== optional arguments
-* +*-l*+, +*--left*+: Force selecting the tab to the left of the current tab.
-* +*-r*+, +*--right*+: Force selecting the tab to the right of the current tab.
+* +*-p*+, +*--prev*+: Force selecting the tab before the current tab.
+* +*-n*+, +*--next*+: Force selecting the tab after the current tab.
 * +*-o*+, +*--opposite*+: Force selecting the tab in the opposite direction of what's configured in 'tabs->select-on-remove'.
 
 
@@ -696,10 +828,12 @@ Syntax: +:tab-focus ['index']+
 
 Select the tab given as argument/[count].
 
-If neither count nor index are given, it behaves like tab-next.
+If neither count nor index are given, it behaves like tab-next. If both are given, use count.
 
 ==== 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 (regardless of count).
+ Negative indices count from the end, such that -1 is the
+ last tab.
 
 
 ==== count
@@ -707,16 +841,20 @@ The tab index to focus, starting with 1.
 
 [[tab-move]]
 === tab-move
-Syntax: +:tab-move ['direction']+
+Syntax: +:tab-move ['index']+
 
-Move the current tab.
+Move the current tab according to the argument and [count].
+
+If neither is given, move it to the first position.
 
 ==== positional arguments
-* +'direction'+: `+` or `-` for relative moving, not given for absolute moving.
+* +'index'+: `+` or `-` to move relative to the current tab by count, or a default of 1 space.
+ A tab index to move to that index.
 
 
 ==== count
-If moving absolutely: New position (default: 0) If moving relatively: Offset.
+If moving relatively: Offset. If moving absolutely: New position (default: 0). This
+ overrides the index argument, if given.
 
 
 [[tab-next]]
@@ -728,13 +866,13 @@ How many tabs to switch forward.
 
 [[tab-only]]
 === tab-only
-Syntax: +:tab-only [*--left*] [*--right*]+
+Syntax: +:tab-only [*--prev*] [*--next*]+
 
 Close all tabs except for the current one.
 
 ==== optional arguments
-* +*-l*+, +*--left*+: Keep tabs to the left of the current.
-* +*-r*+, +*--right*+: Keep tabs to the right of the current.
+* +*-p*+, +*--prev*+: Keep tabs before the current.
+* +*-n*+, +*--next*+: Keep tabs after the current.
 
 [[tab-prev]]
 === tab-prev
@@ -762,6 +900,10 @@ Re-open a closed tab (optionally skipping [count] closed tabs).
 === view-source
 Show the source of the current page.
 
+[[window-only]]
+=== window-only
+Close all windows except for the current one.
+
 [[wq]]
 === wq
 Syntax: +:wq ['name']+
@@ -773,24 +915,25 @@ Save open pages and quit.
 
 [[yank]]
 === yank
-Syntax: +:yank [*--title*] [*--sel*] [*--domain*]+
+Syntax: +:yank [*--sel*] [*--keep*] ['what']+
 
-Yank the current URL/title to the clipboard or primary selection.
+Yank something to the clipboard or primary selection.
 
-==== optional arguments
-* +*-t*+, +*--title*+: Yank the title instead of the URL.
-* +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
-* +*-d*+, +*--domain*+: Yank only the scheme, domain, and port number.
+==== positional arguments
+* +'what'+: What to yank. 
+
+ - `url`: The current URL.
+ - `pretty-url`: The URL in pretty decoded form.
+ - `title`: The current page's title.
+ - `domain`: The current scheme, domain, and port number.
+ - `selection`: The selection under the cursor.
+ 
 
-[[yank-selected]]
-=== yank-selected
-Syntax: +:yank-selected [*--sel*] [*--keep*]+
 
-Yank the selected text to the clipboard or primary selection.
 
 ==== optional arguments
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
-* +*-k*+, +*--keep*+: If given, stay in visual mode after yanking.
+* +*-k*+, +*--keep*+: Stay in visual mode after yanking the selection.
 
 [[zoom]]
 === zoom
@@ -798,7 +941,7 @@ Syntax: +:zoom ['zoom']+
 
 Set the zoom level for the current tab.
 
-The zoom can be given as argument or as [count]. If neither of both is given, the zoom is set to the default zoom.
+The zoom can be given as argument or as [count]. If neither is given, the zoom is set to the default zoom. If both are given, use [count].
 
 ==== positional arguments
 * +'zoom'+: The zoom percentage to set.
@@ -827,16 +970,17 @@ How many steps to zoom out.
 |==============
 |Command|Description
 |<<clear-keychain,clear-keychain>>|Clear the currently entered key chain.
+|<<click-element,click-element>>|Click the element matching the given filter.
 |<<command-accept,command-accept>>|Execute the command currently in the commandline.
 |<<command-history-next,command-history-next>>|Go forward in the commandline history.
 |<<command-history-prev,command-history-prev>>|Go back in the commandline history.
 |<<completion-item-del,completion-item-del>>|Delete the current completion item.
-|<<completion-item-next,completion-item-next>>|Select the next completion item.
-|<<completion-item-prev,completion-item-prev>>|Select the previous completion item.
+|<<completion-item-focus,completion-item-focus>>|Shift the focus of the completion menu to another 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 a hint.
 |<<follow-selected,follow-selected>>|Follow the selected text.
+|<<jump-mark,jump-mark>>|Jump to the mark named by `key`.
 |<<leave-mode,leave-mode>>|Leave the mode we're currently in.
 |<<message-error,message-error>>|Show an error message in the statusbar.
 |<<message-info,message-info>>|Show an info message in the statusbar.
@@ -857,12 +1001,13 @@ 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.
+|<<prompt-item-focus,prompt-item-focus>>|Shift the focus of the prompt file completion menu to another item.
+|<<prompt-open-download,prompt-open-download>>|Immediately open a download.
+|<<repeat-command,repeat-command>>|Repeat the last executed command.
 |<<rl-backward-char,rl-backward-char>>|Move back a character.
 |<<rl-backward-delete-char,rl-backward-delete-char>>|Delete the character before the cursor.
+|<<rl-backward-kill-word,rl-backward-kill-word>>|Remove chars from the cursor to the beginning of the word.
 |<<rl-backward-word,rl-backward-word>>|Move back to the start of the current or previous word.
 |<<rl-beginning-of-line,rl-beginning-of-line>>|Move to the start of the line.
 |<<rl-delete-char,rl-delete-char>>|Delete the character after the cursor.
@@ -871,21 +1016,40 @@ How many steps to zoom out.
 |<<rl-forward-word,rl-forward-word>>|Move forward to the end of the next word.
 |<<rl-kill-line,rl-kill-line>>|Remove chars from the cursor to the end of the line.
 |<<rl-kill-word,rl-kill-word>>|Remove chars from the cursor to the end of the current word.
+|<<rl-unix-filename-rubout,rl-unix-filename-rubout>>|Remove chars from the cursor to the previous path separator.
 |<<rl-unix-line-discard,rl-unix-line-discard>>|Remove chars backward from the cursor to the beginning of the line.
 |<<rl-unix-word-rubout,rl-unix-word-rubout>>|Remove chars from the cursor to the beginning of the word.
 |<<rl-yank,rl-yank>>|Paste the most recently deleted text.
+|<<run-with-count,run-with-count>>|Run a command with the given count.
 |<<scroll,scroll>>|Scroll the current tab in the given direction.
 |<<scroll-page,scroll-page>>|Scroll the frame page-wise.
 |<<scroll-perc,scroll-perc>>|Scroll to a specific percentage of the page.
 |<<scroll-px,scroll-px>>|Scroll the current tab by 'count * dx/dy' pixels.
 |<<search-next,search-next>>|Continue the search to the ([count]th) next term.
 |<<search-prev,search-prev>>|Continue the search to the ([count]th) previous term.
+|<<set-mark,set-mark>>|Set a mark at the current scroll position in the current tab.
 |<<toggle-selection,toggle-selection>>|Toggle caret selection mode.
 |==============
 [[clear-keychain]]
 === clear-keychain
 Clear the currently entered key chain.
 
+[[click-element]]
+=== click-element
+Syntax: +:click-element [*--target* 'target'] 'filter' 'value'+
+
+Click the element matching the given filter.
+
+The given filter needs to result in exactly one element, otherwise, an error is shown.
+
+==== positional arguments
+* +'filter'+: How to filter the elements. id: Get an element based on its ID.
+
+* +'value'+: The value to filter for.
+
+==== optional arguments
+* +*-t*+, +*--target*+: How to open the clicked element (normal/tab/tab-bg/window).
+
 [[command-accept]]
 === command-accept
 Execute the command currently in the commandline.
@@ -902,13 +1066,14 @@ Go back in the commandline history.
 === completion-item-del
 Delete the current completion item.
 
-[[completion-item-next]]
-=== completion-item-next
-Select the next completion item.
+[[completion-item-focus]]
+=== completion-item-focus
+Syntax: +:completion-item-focus 'which'+
 
-[[completion-item-prev]]
-=== completion-item-prev
-Select the previous completion item.
+Shift the focus of the completion menu to another item.
+
+==== positional arguments
+* +'which'+: 'next', 'prev', 'next-category', or 'prev-category'.
 
 [[drop-selection]]
 === drop-selection
@@ -941,6 +1106,15 @@ Follow the selected text.
 ==== optional arguments
 * +*-t*+, +*--tab*+: Load the selected link in a new tab.
 
+[[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
+
 [[leave-mode]]
 === leave-mode
 Leave the mode we're currently in.
@@ -1071,21 +1245,48 @@ 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
+Syntax: +:prompt-accept ['value']+
+
 Accept the current prompt.
 
-[[prompt-no]]
-=== prompt-no
-Answer no to a yes/no prompt.
+==== positional arguments
+* +'value'+: If given, uses this value instead of the entered one. For boolean prompts, "yes"/"no" are accepted as value.
 
-[[prompt-yes]]
-=== prompt-yes
-Answer yes to a yes/no prompt.
+
+[[prompt-item-focus]]
+=== prompt-item-focus
+Syntax: +:prompt-item-focus 'which'+
+
+Shift the focus of the prompt file completion menu to another item.
+
+==== positional arguments
+* +'which'+: 'next', 'prev'
+
+[[prompt-open-download]]
+=== prompt-open-download
+Syntax: +:prompt-open-download ['cmdline']+
+
+Immediately open a download.
+
+If no specific command is given, this will use the system's default application to open the file.
+
+==== positional arguments
+* +'cmdline'+: The command which should be used to open the file. A `{}` is expanded to the temporary file name. If no `{}` is
+ present, the filename is automatically appended to the
+ cmdline.
+
+
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+
+[[repeat-command]]
+=== repeat-command
+Repeat the last executed command.
+
+==== count
+Which count to pass the command.
 
 [[rl-backward-char]]
 === rl-backward-char
@@ -1099,6 +1300,12 @@ Delete the character before the cursor.
 
 This acts like readline's backward-delete-char.
 
+[[rl-backward-kill-word]]
+=== rl-backward-kill-word
+Remove chars from the cursor to the beginning of the word.
+
+This acts like readline's backward-kill-word. Any non-alphanumeric character is considered a word delimiter.
+
 [[rl-backward-word]]
 === rl-backward-word
 Move back to the start of the current or previous word.
@@ -1147,6 +1354,12 @@ Remove chars from the cursor to the end of the current word.
 
 This acts like readline's kill-word.
 
+[[rl-unix-filename-rubout]]
+=== rl-unix-filename-rubout
+Remove chars from the cursor to the previous path separator.
+
+This acts like readline's unix-filename-rubout.
+
 [[rl-unix-line-discard]]
 === rl-unix-line-discard
 Remove chars backward from the cursor to the beginning of the line.
@@ -1157,7 +1370,7 @@ This acts like readline's unix-line-discard.
 === rl-unix-word-rubout
 Remove chars from the cursor to the beginning of the word.
 
-This acts like readline's unix-word-rubout.
+This acts like readline's unix-word-rubout. Whitespace is used as a word delimiter.
 
 [[rl-yank]]
 === rl-yank
@@ -1165,6 +1378,26 @@ Paste the most recently deleted text.
 
 This acts like readline's yank.
 
+[[run-with-count]]
+=== run-with-count
+Syntax: +:run-with-count 'count-arg' 'command'+
+
+Run a command with the given count.
+
+If run_with_count itself is run with a count, it multiplies count_arg.
+
+==== positional arguments
+* +'count-arg'+: The count to pass to the command.
+* +'command'+: The command to run, with optional args.
+
+==== count
+The count that run_with_count itself received.
+
+==== 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.
+* This command does not replace variables like +\{url\}+.
+
 [[scroll]]
 === scroll
 Syntax: +:scroll 'direction'+
@@ -1222,7 +1455,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
@@ -1241,6 +1474,15 @@ Continue the search to the ([count]th) previous term.
 ==== count
 How many elements to ignore.
 
+[[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
+
 [[toggle-selection]]
 === toggle-selection
 Toggle caret selection mode.
@@ -1259,6 +1501,9 @@ These commands are mainly intended for debugging. They are hidden if qutebrowser
 |<<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-log-capacity,debug-log-capacity>>|Change the number of log lines to be stored in RAM.
+|<<debug-log-filter,debug-log-filter>>|Change the log filter for console logging.
+|<<debug-log-level,debug-log-level>>|Change the log level for console logging.
 |<<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.
@@ -1301,6 +1546,33 @@ Dump the current page's content to a file.
 ==== optional arguments
 * +*-p*+, +*--plain*+: Write plain text instead of HTML.
 
+[[debug-log-capacity]]
+=== debug-log-capacity
+Syntax: +:debug-log-capacity 'capacity'+
+
+Change the number of log lines to be stored in RAM.
+
+==== positional arguments
+* +'capacity'+: Number of lines for the log.
+
+[[debug-log-filter]]
+=== debug-log-filter
+Syntax: +:debug-log-filter 'filters'+
+
+Change the log filter for console logging.
+
+==== positional arguments
+* +'filters'+: A comma separated list of logger names.
+
+[[debug-log-level]]
+=== debug-log-level
+Syntax: +:debug-log-level 'level'+
+
+Change the log level for console logging.
+
+==== positional arguments
+* +'level'+: The log level to set.
+
 [[debug-pyeval]]
 === debug-pyeval
 Syntax: +:debug-pyeval [*--quiet*] 's'+

doc/help/index.asciidoc

@@ -6,13 +6,13 @@ Documentation
 
 The following help pages are currently available:
 
-* link:quickstart.html[Quick start guide]
-* link:FAQ.html[Frequently asked questions]
-* link:CHANGELOG.html[Change Log]
+* link:../quickstart.html[Quick start guide]
+* link:../../FAQ.html[Frequently asked questions]
+* link:../../CHANGELOG.html[Change Log]
 * 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]
+* link:../userscripts.html[How to write userscripts]
+* link:../../CONTRIBUTING.html[Contributing to qutebrowser]
 
 Getting help
 ------------

doc/help/settings.asciidoc

@@ -1,3 +1,7 @@
+// DO NOT EDIT THIS FILE DIRECTLY!
+// It is autogenerated from docstrings by running:
+//   $ python3 scripts/dev/src2asciidoc.py
+
 = Settings
 
 .Quick reference for section ``general''
@@ -5,8 +9,9 @@
 |==============
 |Setting|Description
 |<<general-ignore-case,ignore-case>>|Whether to find text on a page case-insensitively.
-|<<general-wrap-search,wrap-search>>|Whether to wrap finding text to the top when arriving at the end.
 |<<general-startpage,startpage>>|The default page(s) to open at the start, separated by commas.
+|<<general-yank-ignored-url-parameters,yank-ignored-url-parameters>>|The URL parameters to strip with :yank url, separated by commas.
+|<<general-default-open-dispatcher,default-open-dispatcher>>|The default program used to open downloads. Set to an empty string to use the default internal handler.
 |<<general-default-page,default-page>>|The page to open if :open -t/-b/-w is used without URL. Use `about:blank` for a blank page.
 |<<general-auto-search,auto-search>>|Whether to start a search when something else than a URL is entered.
 |<<general-auto-save-config,auto-save-config>>|Whether to save the config automatically on quit.
@@ -20,6 +25,7 @@
 |<<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-new-instance-open-target.window,new-instance-open-target.window>>|Which window to choose when opening links as new tabs.
 |<<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.
@@ -33,22 +39,25 @@
 |<<ui-zoom-levels,zoom-levels>>|The available zoom levels, separated by commas.
 |<<ui-default-zoom,default-zoom>>|The default zoom level.
 |<<ui-downloads-position,downloads-position>>|Where to show the downloaded files.
+|<<ui-status-position,status-position>>|The position of the status bar.
 |<<ui-message-timeout,message-timeout>>|Time (in ms) to show messages in the statusbar for.
 |<<ui-message-unfocused,message-unfocused>>|Whether to show messages in unfocused windows.
 |<<ui-confirm-quit,confirm-quit>>|Whether to confirm quitting the application.
-|<<ui-display-statusbar-messages,display-statusbar-messages>>|Whether to display javascript statusbar messages.
 |<<ui-zoom-text-only,zoom-text-only>>|Whether the zoom factor on a frame applies only to the text or to all content.
 |<<ui-frame-flattening,frame-flattening>>|Whether to  expand each subframe to its contents.
-|<<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-user-stylesheet,user-stylesheet>>|User stylesheet to use (absolute filename or filename relative to the config directory). Will expand environment variables.
+|<<ui-hide-scrollbar,hide-scrollbar>>|Hide the main scrollbar.
 |<<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>>|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
+|<<ui-prompt-radius,prompt-radius>>|The rounding radius for the edges of prompts.
+|<<ui-prompt-filebrowser,prompt-filebrowser>>|Show a filebrowser in upload/download prompts.
 |==============
 
 .Quick reference for section ``network''
@@ -63,16 +72,17 @@
 |<<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.
+|<<network-netrc-file,netrc-file>>|Set location of a netrc-file for HTTP authentication. If empty, ~/.netrc is used.
 |==============
 
 .Quick reference for section ``completion''
 [options="header",width="75%",cols="25%,75%"]
 |==============
 |Setting|Description
-|<<completion-auto-open,auto-open>>|Automatically open completion when typing.
+|<<completion-show,show>>|When to show the autocompletion window.
 |<<completion-download-path-suggestion,download-path-suggestion>>|What to display in the download filename input.
 |<<completion-timestamp-format,timestamp-format>>|How to format timestamps (e.g. for history)
-|<<completion-show,show>>|Whether to show the autocompletion window.
 |<<completion-height,height>>|The height of the completion, in px or as percentage of the window.
 |<<completion-cmd-history-max-items,cmd-history-max-items>>|How many commands to save in the command history.
 |<<completion-web-history-max-items,web-history-max-items>>|How many URLs to show in the web history.
@@ -86,8 +96,8 @@
 [options="header",width="75%",cols="25%,75%"]
 |==============
 |Setting|Description
-|<<input-timeout,timeout>>|Timeout for ambiguous key bindings.
-|<<input-partial-timeout,partial-timeout>>|Timeout for partially typed key bindings.
+|<<input-timeout,timeout>>|Timeout (in milliseconds) for ambiguous key bindings.
+|<<input-partial-timeout,partial-timeout>>|Timeout (in milliseconds) for partially typed key bindings.
 |<<input-insert-mode-on-plugins,insert-mode-on-plugins>>|Whether to switch to insert mode when clicking flash and other plugins.
 |<<input-auto-leave-insert-mode,auto-leave-insert-mode>>|Whether to leave insert mode if a non-editable element is clicked.
 |<<input-auto-insert-mode,auto-insert-mode>>|Whether to automatically enter insert mode if an editable element is focused after page load.
@@ -148,12 +158,13 @@
 |<<content-allow-images,allow-images>>|Whether images are automatically loaded in web pages.
 |<<content-allow-javascript,allow-javascript>>|Enables or disables the running of JavaScript programs.
 |<<content-allow-plugins,allow-plugins>>|Enables or disables plugins in Web pages.
-|<<content-webgl,webgl>>|Enables or disables WebGL.
+|<<content-webgl,webgl>>|Enables or disables WebGL. For QtWebEngine, Qt/PyQt >= 5.7 is required for this setting.
 |<<content-css-regions,css-regions>>|Enable or disable support for CSS regions.
 |<<content-hyperlink-auditing,hyperlink-auditing>>|Enable or disable hyperlink auditing (<a ping>).
 |<<content-geolocation,geolocation>>|Allow websites to request geolocations.
 |<<content-notifications,notifications>>|Allow websites to show notifications.
-|<<content-javascript-can-open-windows,javascript-can-open-windows>>|Whether JavaScript programs can open new windows.
+|<<content-media-capture,media-capture>>|Allow websites to record audio/video.
+|<<content-javascript-can-open-windows-automatically,javascript-can-open-windows-automatically>>|Whether JavaScript programs can open new windows without user interaction.
 |<<content-javascript-can-close-windows,javascript-can-close-windows>>|Whether JavaScript programs can close windows.
 |<<content-javascript-can-access-clipboard,javascript-can-access-clipboard>>|Whether JavaScript programs can read or write to the clipboard.
 |<<content-ignore-javascript-prompt,ignore-javascript-prompt>>|Whether all javascript prompts should be ignored.
@@ -173,16 +184,18 @@
 |==============
 |Setting|Description
 |<<hints-border,border>>|CSS border value for hints.
-|<<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>>|Minimum number of chars used for hint strings.
-|<<hints-scatter,scatter>>|Whether to scatter hint key chains (like Vimium) or not (like dwb).
+|<<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-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,auto-follow>>|Controls when a hint can be automatically followed without the user pressing Enter.
+|<<hints-auto-follow-timeout,auto-follow-timeout>>|A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-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.
+|<<hints-hide-unmatched-rapid-hints,hide-unmatched-rapid-hints>>|Controls hiding unmatched hints in rapid mode.
 |==============
 
 .Quick reference for section ``colors''
@@ -205,12 +218,6 @@
 |<<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>>|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.
-|<<colors-statusbar.bg.warning,statusbar.bg.warning>>|Background color of the statusbar if there is a warning.
-|<<colors-statusbar.fg.prompt,statusbar.fg.prompt>>|Foreground color of the statusbar if there is a prompt.
-|<<colors-statusbar.bg.prompt,statusbar.bg.prompt>>|Background color of the statusbar if there is a prompt.
 |<<colors-statusbar.fg.insert,statusbar.fg.insert>>|Foreground color of the statusbar in insert mode.
 |<<colors-statusbar.bg.insert,statusbar.bg.insert>>|Background color of the statusbar in insert mode.
 |<<colors-statusbar.fg.command,statusbar.fg.command>>|Foreground color of the statusbar in command mode.
@@ -240,7 +247,7 @@
 |<<colors-tabs.indicator.error,tabs.indicator.error>>|Color for the tab indicator on errors..
 |<<colors-tabs.indicator.system,tabs.indicator.system>>|Color gradient interpolation system for the tab indicator.
 |<<colors-hints.fg,hints.fg>>|Font color for hints.
-|<<colors-hints.bg,hints.bg>>|Background color for hints.
+|<<colors-hints.bg,hints.bg>>|Background color for hints. Note that you can use a `rgba(...)` value for transparency.
 |<<colors-hints.fg.match,hints.fg.match>>|Font color for the matched part of hints.
 |<<colors-downloads.bg.bar,downloads.bg.bar>>|Background color for the download bar.
 |<<colors-downloads.fg.start,downloads.fg.start>>|Color gradient start for download text.
@@ -252,6 +259,21 @@
 |<<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.
+|<<colors-messages.fg.error,messages.fg.error>>|Foreground color of an error message.
+|<<colors-messages.bg.error,messages.bg.error>>|Background color of an error message.
+|<<colors-messages.border.error,messages.border.error>>|Border color of an error message.
+|<<colors-messages.fg.warning,messages.fg.warning>>|Foreground color a warning message.
+|<<colors-messages.bg.warning,messages.bg.warning>>|Background color of a warning message.
+|<<colors-messages.border.warning,messages.border.warning>>|Border color of an error message.
+|<<colors-messages.fg.info,messages.fg.info>>|Foreground color an info message.
+|<<colors-messages.bg.info,messages.bg.info>>|Background color of an info message.
+|<<colors-messages.border.info,messages.border.info>>|Border color of an info message.
+|<<colors-prompts.fg,prompts.fg>>|Foreground color for prompts.
+|<<colors-prompts.bg,prompts.bg>>|Background color for prompts.
+|<<colors-prompts.selected.bg,prompts.selected.bg>>|Background color for the selected item in filename prompts.
 |==============
 
 .Quick reference for section ``fonts''
@@ -260,6 +282,7 @@
 |Setting|Description
 |<<fonts-_monospace,_monospace>>|Default monospace fonts.
 |<<fonts-completion,completion>>|Font used in the completion widget.
+|<<fonts-completion.category,completion.category>>|Font used in the completion categories.
 |<<fonts-tabbar,tabbar>>|Font used in the tab bar.
 |<<fonts-statusbar,statusbar>>|Font used in the statusbar.
 |<<fonts-downloads,downloads>>|Font used for the downloadbar.
@@ -275,6 +298,11 @@
 |<<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.
+|<<fonts-messages.error,messages.error>>|Font used for error messages.
+|<<fonts-messages.warning,messages.warning>>|Font used for warning messages.
+|<<fonts-messages.info,messages.info>>|Font used for info messages.
+|<<fonts-prompts,prompts>>|Font used for prompts.
 |==============
 
 == general
@@ -292,22 +320,25 @@ Valid values:
 
 Default: +pass:[smart]+
 
-[[general-wrap-search]]
-=== wrap-search
-Whether to wrap finding text to the top when arriving at the end.
-
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[true]+
-
 [[general-startpage]]
 === startpage
 The default page(s) to open at the start, separated by commas.
 
-Default: +pass:[https://duckduckgo.com]+
+Default: +pass:[https://start.duckduckgo.com]+
+
+[[general-yank-ignored-url-parameters]]
+=== yank-ignored-url-parameters
+The URL parameters to strip with :yank url, separated by commas.
+
+Default: +pass:[ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content]+
+
+[[general-default-open-dispatcher]]
+=== default-open-dispatcher
+The default program used to open downloads. Set to an empty string to use the default internal handler.
+
+Any {} in the string will be expanded to the filename, else the filename will be appended.
+
+Default: empty
 
 [[general-default-page]]
 === default-page
@@ -370,11 +401,13 @@ Valid values:
 
 Default: +pass:[false]+
 
+This setting is only available with the QtWebKit backend.
+
 [[general-developer-extras]]
 === developer-extras
 Enable extra tools for Web developers.
 
-This needs to be enabled for `:inspector` to work and also adds an _Inspect_ entry to the context menu.
+This needs to be enabled for `:inspector` to work and also adds an _Inspect_ entry to the context menu. For QtWebEngine, see 'qutebrowser --help' instead.
 
 Valid values:
 
@@ -383,6 +416,8 @@ Valid values:
 
 Default: +pass:[false]+
 
+This setting is only available with the QtWebKit backend.
+
 [[general-print-element-backgrounds]]
 === print-element-backgrounds
 Whether the background color and images are also drawn when the page is printed.
@@ -394,6 +429,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[general-xss-auditing]]
 === xss-auditing
 Whether load requests should be monitored for cross-site scripting attempts.
@@ -418,6 +455,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[general-default-encoding]]
 === default-encoding
 Default encoding to use for websites.
@@ -440,6 +479,19 @@ Valid values:
 
 Default: +pass:[tab]+
 
+[[general-new-instance-open-target.window]]
+=== new-instance-open-target.window
+Which window to choose when opening links as new tabs.
+
+Valid values:
+
+ * +first-opened+: Open new tabs in the first (oldest) opened window.
+ * +last-opened+: Open new tabs in the last (newest) opened window.
+ * +last-focused+: Open new tabs in the most recently focused window.
+ * +last-visible+: Open new tabs in the most recently visible window.
+
+Default: +pass:[last-focused]+
+
 [[general-log-javascript-console]]
 === log-javascript-console
 How to log javascript console messages.
@@ -508,6 +560,17 @@ Valid values:
 
 Default: +pass:[top]+
 
+[[ui-status-position]]
+=== status-position
+The position of the status bar.
+
+Valid values:
+
+ * +top+
+ * +bottom+
+
+Default: +pass:[bottom]+
+
 [[ui-message-timeout]]
 === message-timeout
 Time (in ms) to show messages in the statusbar for.
@@ -538,17 +601,6 @@ Valid values:
 
 Default: +pass:[never]+
 
-[[ui-display-statusbar-messages]]
-=== display-statusbar-messages
-Whether to display javascript statusbar messages.
-
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[false]+
-
 [[ui-zoom-text-only]]
 === zoom-text-only
 Whether the zoom factor on a frame applies only to the text or to all content.
@@ -560,6 +612,8 @@ Valid values:
 
 Default: +pass:[false]+
 
+This setting is only available with the QtWebKit backend.
+
 [[ui-frame-flattening]]
 === frame-flattening
 Whether to  expand each subframe to its contents.
@@ -573,11 +627,24 @@ Valid values:
 
 Default: +pass:[false]+
 
+This setting is only available with the QtWebKit backend.
+
 [[ui-user-stylesheet]]
 === user-stylesheet
-User stylesheet to use (absolute filename, filename relative to the config directory or CSS string). Will expand environment variables.
+User stylesheet to use (absolute filename or filename relative to the config directory). Will expand environment variables.
 
-Default: +pass:[::-webkit-scrollbar { width: 0px; height: 0px; }]+
+Default: empty
+
+[[ui-hide-scrollbar]]
+=== hide-scrollbar
+Hide the main scrollbar.
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[true]+
 
 [[ui-css-media-type]]
 === css-media-type
@@ -585,6 +652,8 @@ Set the CSS media type.
 
 Default: empty
 
+This setting is only available with the QtWebKit backend.
+
 [[ui-smooth-scrolling]]
 === smooth-scrolling
 Whether to enable smooth scrolling for webpages.
@@ -629,20 +698,11 @@ The format to use for the window title. The following placeholders are defined:
 * `{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.
+* `{host}`: The host of the current web page.
+* `{backend}`: Either 'webkit' or 'webengine'
 
 Default: +pass:[{perc}{title}{title_sep}qutebrowser]+
 
-[[ui-hide-mouse-cursor]]
-=== hide-mouse-cursor
-Whether to hide the mouse cursor.
-
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[false]+
-
 [[ui-modal-js-dialog]]
 === modal-js-dialog
 Use standard JavaScript modal dialog for alert() and confirm()
@@ -665,6 +725,31 @@ Valid values:
 
 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
+
+[[ui-prompt-radius]]
+=== prompt-radius
+The rounding radius for the edges of prompts.
+
+Default: +pass:[8]+
+
+[[ui-prompt-filebrowser]]
+=== prompt-filebrowser
+Show a filebrowser in upload/download prompts.
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[true]+
+
 == network
 Settings related to the network.
 
@@ -697,6 +782,8 @@ Valid values:
 
 Default: +pass:[same-domain]+
 
+This setting is only available with the QtWebKit backend.
+
 [[network-user-agent]]
 === user-agent
 User agent to send. Empty to send the default.
@@ -716,6 +803,8 @@ Valid values:
 
 Default: +pass:[system]+
 
+This setting is only available with the QtWebKit backend.
+
 [[network-proxy-dns-requests]]
 === proxy-dns-requests
 Whether to send DNS requests over the configured proxy.
@@ -727,6 +816,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[network-ssl-strict]]
 === ssl-strict
 Whether to validate SSL handshakes.
@@ -750,19 +841,34 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
+[[network-custom-headers]]
+=== custom-headers
+Set custom headers for qutebrowser HTTP requests.
+
+Default: empty
+
+[[network-netrc-file]]
+=== netrc-file
+Set location of a netrc-file for HTTP authentication. If empty, ~/.netrc is used.
+
+Default: empty
+
 == completion
 Options related to completion and command history.
 
-[[completion-auto-open]]
-=== auto-open
-Automatically open completion when typing.
+[[completion-show]]
+=== show
+When to show the autocompletion window.
 
 Valid values:
 
- * +true+
- * +false+
+ * +always+: Whenever a completion is available.
+ * +auto+: Whenever a completion is requested.
+ * +never+: Never.
 
-Default: +pass:[true]+
+Default: +pass:[always]+
 
 [[completion-download-path-suggestion]]
 === download-path-suggestion
@@ -782,17 +888,6 @@ How to format timestamps (e.g. for history)
 
 Default: +pass:[%Y-%m-%d]+
 
-[[completion-show]]
-=== show
-Whether to show the autocompletion window.
-
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[true]+
-
 [[completion-height]]
 === height
 The height of the completion, in px or as percentage of the window.
@@ -854,15 +949,19 @@ Options related to input modes.
 
 [[input-timeout]]
 === timeout
-Timeout for ambiguous key bindings.
+Timeout (in milliseconds) 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.
+Timeout (in milliseconds) 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
@@ -970,11 +1069,11 @@ Which tab to select when the focused tab is removed.
 
 Valid values:
 
- * +left+: Select the tab on the left.
- * +right+: Select the tab on the right.
- * +previous+: Select the previously selected tab.
+ * +prev+: Select the tab which came before the closed one (left in horizontal, above in vertical).
+ * +next+: Select the tab which came after the closed one (right in horizontal, below in vertical).
+ * +last-used+: Select the previously selected tab.
 
-Default: +pass:[right]+
+Default: +pass:[next]+
 
 [[tabs-new-tab-position]]
 === new-tab-position
@@ -982,12 +1081,12 @@ How new tabs are positioned.
 
 Valid values:
 
- * +left+: On the left of the current tab.
- * +right+: On the right of the current tab.
- * +first+: At the left end.
- * +last+: At the right end.
+ * +prev+: Before the current tab.
+ * +next+: After the current tab.
+ * +first+: At the beginning.
+ * +last+: At the end.
 
-Default: +pass:[right]+
+Default: +pass:[next]+
 
 [[tabs-new-tab-position-explicit]]
 === new-tab-position-explicit
@@ -995,10 +1094,10 @@ How new tabs opened explicitly are positioned.
 
 Valid values:
 
- * +left+: On the left of the current tab.
- * +right+: On the right of the current tab.
- * +first+: At the left end.
- * +last+: At the right end.
+ * +prev+: Before the current tab.
+ * +next+: After the current tab.
+ * +first+: At the beginning.
+ * +last+: At the end.
 
 Default: +pass:[last]+
 
@@ -1127,6 +1226,8 @@ The format to use for the tab title. The following placeholders are defined:
 * `{index}`: The index of this tab.
 * `{id}`: The internal tab ID of this tab.
 * `{scroll_pos}`: The page scroll position.
+* `{host}`: The host of the current web page.
+* `{backend}`: Either 'webkit' or 'webengine'
 
 Default: +pass:[{index}: {title}]+
 
@@ -1207,6 +1308,8 @@ For more information about the feature, please refer to: http://webkit.org/blog/
 
 Default: empty
 
+This setting is only available with the QtWebKit backend.
+
 [[storage-object-cache-capacities]]
 === object-cache-capacities
 The capacities for the global memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity.
@@ -1219,18 +1322,24 @@ _totalCapacity_ specifies the maximum number of bytes that the cache should cons
 
 Default: empty
 
+This setting is only available with the QtWebKit backend.
+
 [[storage-offline-storage-default-quota]]
 === offline-storage-default-quota
 Default quota for new offline storage databases.
 
 Default: empty
 
+This setting is only available with the QtWebKit backend.
+
 [[storage-offline-web-application-cache-quota]]
 === offline-web-application-cache-quota
 Quota for the offline web application cache.
 
 Default: empty
 
+This setting is only available with the QtWebKit backend.
+
 [[storage-offline-storage-database]]
 === offline-storage-database
 Whether support for the HTML 5 offline storage feature is enabled.
@@ -1242,6 +1351,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[storage-offline-web-application-storage]]
 === offline-web-application-storage
 Whether support for the HTML 5 web application cache feature is enabled.
@@ -1257,6 +1368,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[storage-local-storage]]
 === local-storage
 Whether support for the HTML 5 local storage feature is enabled.
@@ -1314,14 +1427,14 @@ Default: +pass:[false]+
 
 [[content-webgl]]
 === webgl
-Enables or disables WebGL.
+Enables or disables WebGL. For QtWebEngine, Qt/PyQt >= 5.7 is required for this setting.
 
 Valid values:
 
  * +true+
  * +false+
 
-Default: +pass:[true]+
+Default: +pass:[false]+
 
 [[content-css-regions]]
 === css-regions
@@ -1334,6 +1447,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[content-hyperlink-auditing]]
 === hyperlink-auditing
 Enable or disable hyperlink auditing (<a ping>).
@@ -1369,9 +1484,23 @@ Valid values:
 
 Default: +pass:[ask]+
 
-[[content-javascript-can-open-windows]]
-=== javascript-can-open-windows
-Whether JavaScript programs can open new windows.
+[[content-media-capture]]
+=== media-capture
+Allow websites to record audio/video.
+
+Valid values:
+
+ * +true+
+ * +false+
+ * +ask+
+
+Default: +pass:[ask]+
+
+This setting is only available with the QtWebEngine backend.
+
+[[content-javascript-can-open-windows-automatically]]
+=== javascript-can-open-windows-automatically
+Whether JavaScript programs can open new windows without user interaction.
 
 Valid values:
 
@@ -1391,6 +1520,8 @@ Valid values:
 
 Default: +pass:[false]+
 
+This setting is only available with the QtWebKit backend.
+
 [[content-javascript-can-access-clipboard]]
 === javascript-can-access-clipboard
 Whether JavaScript programs can read or write to the clipboard.
@@ -1459,6 +1590,8 @@ Valid values:
 
 Default: +pass:[no-3rdparty]+
 
+This setting is only available with the QtWebKit backend.
+
 [[content-cookies-store]]
 === cookies-store
 Whether to store cookies.
@@ -1470,6 +1603,8 @@ Valid values:
 
 Default: +pass:[true]+
 
+This setting is only available with the QtWebKit backend.
+
 [[content-host-block-lists]]
 === host-block-lists
 List of URLs of lists which contain hosts to block.
@@ -1480,7 +1615,7 @@ The file can be in one of the following formats:
 - One host per line
 - A zip-file of any of the above, with either only one file, or a file named 'hosts' (with any extension).
 
-Default: +pass:[http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&amp;mimetype=plaintext]+
+Default: +pass:[https://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&amp;mimetype=plaintext]+
 
 [[content-host-blocking-enabled]]
 === host-blocking-enabled
@@ -1525,12 +1660,6 @@ CSS border value for hints.
 
 Default: +pass:[1px solid #E3BE23]+
 
-[[hints-opacity]]
-=== opacity
-Opacity for hints.
-
-Default: +pass:[0.7]+
-
 [[hints-mode]]
 === mode
 Mode to use for hints.
@@ -1557,7 +1686,7 @@ 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:
 
@@ -1585,14 +1714,22 @@ Default: +pass:[/usr/share/dict/words]+
 
 [[hints-auto-follow]]
 === auto-follow
-Follow a hint immediately when the hint text is completely matched.
+Controls when a hint can be automatically followed without the user pressing Enter.
 
 Valid values:
 
- * +true+
- * +false+
+ * +always+: Auto-follow whenever there is only a single hint on a page.
+ * +unique-match+: Auto-follow whenever there is a unique non-empty match in either the hint string (word mode) or filter (number mode).
+ * +full-match+: Follow the hint when the user typed the whole hint (letter, word or number mode) or the element's text (only in number mode).
+ * +never+: The user will always need to press Enter to follow a hint.
 
-Default: +pass:[true]+
+Default: +pass:[unique-match]+
+
+[[hints-auto-follow-timeout]]
+=== auto-follow-timeout
+A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-follow.
+
+Default: +pass:[0]+
 
 [[hints-next-regexes]]
 === next-regexes
@@ -1606,6 +1743,28 @@ 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:[python]+
+
+[[hints-hide-unmatched-rapid-hints]]
+=== hide-unmatched-rapid-hints
+Controls hiding unmatched hints in rapid mode.
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[true]+
+
 == 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.
@@ -1614,14 +1773,14 @@ The searchengine named `DEFAULT` is used when `general -> auto-search` is true a
 Aliases for commands.
 By default, no aliases are defined. Example which adds a new command `:qtb` to open qutebrowsers website:
 
-`qtb = open http://www.qutebrowser.org/`
+`qtb = open https://www.qutebrowser.org/`
 
 == colors
 Colors used in the UI.
 A value can be in one of the following format:
 
  * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB`
- * A SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification].
+ * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification].
  * transparent (no color)
  * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages)
  * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359)
@@ -1727,42 +1886,6 @@ Background color of the statusbar.
 
 Default: +pass:[black]+
 
-[[colors-statusbar.fg.error]]
-=== statusbar.fg.error
-Foreground color of the statusbar if there was an error.
-
-Default: +pass:[${statusbar.fg}]+
-
-[[colors-statusbar.bg.error]]
-=== statusbar.bg.error
-Background color of the statusbar if there was an error.
-
-Default: +pass:[red]+
-
-[[colors-statusbar.fg.warning]]
-=== statusbar.fg.warning
-Foreground color of the statusbar if there is a warning.
-
-Default: +pass:[${statusbar.fg}]+
-
-[[colors-statusbar.bg.warning]]
-=== statusbar.bg.warning
-Background color of the statusbar if there is a warning.
-
-Default: +pass:[darkorange]+
-
-[[colors-statusbar.fg.prompt]]
-=== statusbar.fg.prompt
-Foreground color of the statusbar if there is a prompt.
-
-Default: +pass:[${statusbar.fg}]+
-
-[[colors-statusbar.bg.prompt]]
-=== statusbar.bg.prompt
-Background color of the statusbar if there is a prompt.
-
-Default: +pass:[darkblue]+
-
 [[colors-statusbar.fg.insert]]
 === statusbar.fg.insert
 Foreground color of the statusbar in insert mode.
@@ -1946,9 +2069,9 @@ Default: +pass:[black]+
 
 [[colors-hints.bg]]
 === hints.bg
-Background color for hints.
+Background color for hints. Note that you can use a `rgba(...)` value for transparency.
 
-Default: +pass:[-webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFF785), color-stop(100%,#FFC542))]+
+Default: +pass:[qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8))]+
 
 [[colors-hints.fg.match]]
 === hints.fg.match
@@ -2030,6 +2153,98 @@ Background color for webpages if unset (or empty to use the theme's color)
 
 Default: +pass:[white]+
 
+This setting is only available with the QtWebKit backend.
+
+[[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%)]+
+
+[[colors-messages.fg.error]]
+=== messages.fg.error
+Foreground color of an error message.
+
+Default: +pass:[white]+
+
+[[colors-messages.bg.error]]
+=== messages.bg.error
+Background color of an error message.
+
+Default: +pass:[red]+
+
+[[colors-messages.border.error]]
+=== messages.border.error
+Border color of an error message.
+
+Default: +pass:[#bb0000]+
+
+[[colors-messages.fg.warning]]
+=== messages.fg.warning
+Foreground color a warning message.
+
+Default: +pass:[white]+
+
+[[colors-messages.bg.warning]]
+=== messages.bg.warning
+Background color of a warning message.
+
+Default: +pass:[darkorange]+
+
+[[colors-messages.border.warning]]
+=== messages.border.warning
+Border color of an error message.
+
+Default: +pass:[#d47300]+
+
+[[colors-messages.fg.info]]
+=== messages.fg.info
+Foreground color an info message.
+
+Default: +pass:[white]+
+
+[[colors-messages.bg.info]]
+=== messages.bg.info
+Background color of an info message.
+
+Default: +pass:[black]+
+
+[[colors-messages.border.info]]
+=== messages.border.info
+Border color of an info message.
+
+Default: +pass:[#333333]+
+
+[[colors-prompts.fg]]
+=== prompts.fg
+Foreground color for prompts.
+
+Default: +pass:[white]+
+
+[[colors-prompts.bg]]
+=== prompts.bg
+Background color for prompts.
+
+Default: +pass:[darkblue]+
+
+[[colors-prompts.selected.bg]]
+=== prompts.selected.bg
+Background color for the selected item in filename prompts.
+
+Default: +pass:[#308cc6]+
+
 == fonts
 Fonts used for the UI, with optional style/weight/size.
 
@@ -2049,6 +2264,12 @@ Font used in the completion widget.
 
 Default: +pass:[8pt ${_monospace}]+
 
+[[fonts-completion.category]]
+=== completion.category
+Font used in the completion categories.
+
+Default: +pass:[bold ${completion}]+
+
 [[fonts-tabbar]]
 === tabbar
 Font used in the tab bar.
@@ -2071,7 +2292,7 @@ Default: +pass:[8pt ${_monospace}]+
 === hints
 Font used for the hints.
 
-Default: +pass:[bold 13px Monospace]+
+Default: +pass:[bold 13px ${_monospace}]+
 
 [[fonts-debug-console]]
 === debug-console
@@ -2138,3 +2359,33 @@ 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}]+
+
+[[fonts-messages.error]]
+=== messages.error
+Font used for error messages.
+
+Default: +pass:[8pt ${_monospace}]+
+
+[[fonts-messages.warning]]
+=== messages.warning
+Font used for warning messages.
+
+Default: +pass:[8pt ${_monospace}]+
+
+[[fonts-messages.info]]
+=== messages.info
+Font used for info messages.
+
+Default: +pass:[8pt ${_monospace}]+
+
+[[fonts-prompts]]
+=== prompts
+Font used for prompts.
+
+Default: +pass:[8pt sans-serif]+

doc/quickstart.asciidoc

@@ -5,19 +5,36 @@ 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, `go` to edit the current URL)
+* 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"]
+* There's also a https://www.shortcutfoo.com/app/dojos/qutebrowser[free training
+  course] on shortcutfoo for the keybindings - note that you need to be in
+  insert mode (i) for it to work.
 * Run `:adblock-update` to download adblock lists and activate adblocking.
 * If you just cloned the repository, you'll need to run
 `scripts/asciidoc2html.py` to generate the documentation.
 * Go to the link:qute://settings[settings page] to set up qutebrowser the way you want it.
 * Subscribe to
-https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[the mailinglist]
-where there are weekly "what's new in qutebrowser" posts.
+https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[the mailinglist] or
+https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser-announce[the announce-only mailinglist].
 * Let me know what features you are missing or things that need (even small!)
 improvements.
 

doc/qutebrowser.1.asciidoc

@@ -7,7 +7,7 @@
 :man source: qutebrowser
 :man manual: qutebrowser manpage
 :toc:
-:homepage: http://www.qutebrowser.org/
+:homepage: https://www.qutebrowser.org/
 
 == NAME
 qutebrowser - a keyboard-driven, vim-like browser based on PyQt5 and QtWebKit.
@@ -38,17 +38,8 @@ show it.
 *-h*, *--help*::
     show this help message and exit
 
-*-c* 'CONFDIR', *--confdir* 'CONFDIR'::
-    Set config directory (empty for no config storage).
-
-*--datadir* 'DATADIR'::
-    Set data directory (empty for no data storage).
-
-*--cachedir* 'CACHEDIR'::
-    Set cache directory (empty for no cache storage).
-
 *--basedir* 'BASEDIR'::
-    Base directory for all storage. Other --*dir arguments are ignored if this is given.
+    Base directory for all storage.
 
 *-V*, *--version*::
     Show version and quit.
@@ -65,6 +56,12 @@ show it.
 *--target* '{auto,tab,tab-bg,tab-silent,tab-bg-silent,window}'::
     How URLs should be opened if there is already a qutebrowser instance running.
 
+*--backend* '{webkit,webengine}'::
+    Which backend to use (webengine backend is EXPERIMENTAL!).
+
+*--enable-webengine-inspector*::
+    Enable the web inspector for QtWebEngine. Note that this is a SECURITY RISK and you should not visit untrusted websites with the inspector turned on. See https://bugreports.qt.io/browse/QTBUG-50725 for more details.
+
 === debug arguments
 *-l* '{critical,error,warning,info,debug,vdebug}', *--loglevel* '{critical,error,warning,info,debug,vdebug}'::
     Set loglevel
@@ -78,9 +75,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.
 
@@ -102,23 +105,11 @@ show it.
 *--no-err-windows*::
     Don't show any error windows (used for tests/smoke.py).
 
-*--qt-name* 'NAME'::
-    Set the window name.
+*--qt-arg* 'NAME' 'VALUE'::
+    Pass an argument with a value to Qt. For example, you can do `--qt-arg geometry 650x555+200+300` to set the window geometry.
 
-*--qt-style* 'STYLE'::
-    Set the Qt GUI style to use.
-
-*--qt-stylesheet* 'STYLESHEET'::
-    Override the Qt application stylesheet.
-
-*--qt-widgetcount*::
-    Print debug message at the end about number of widgets left undestroyed and maximum number of widgets existed at the same time.
-
-*--qt-reverse*::
-    Set the application's layout direction to right-to-left.
-
-*--qt-qmljsdebugger* 'port:PORT[,block]'::
-    Activate the QML/JS debugger with a specified port. 'block' is optional and will make the application wait until a debugger connects to it.
+*--qt-flag* 'QT_FLAG'::
+    Pass an argument to Qt as flag.
 // QUTE_OPTIONS_END
 
 == FILES
@@ -146,7 +137,7 @@ https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser[mailinglist] at
 mailto:qutebrowser@lists.qutebrowser.org[] instead.
 
 For security bugs, please contact me directly at me@the-compiler.org, GPG ID
-http://www.the-compiler.org/pubkey.asc[0xFD55A072].
+https://www.the-compiler.org/pubkey.asc[0xFD55A072].
 
 == COPYRIGHT
 This program is free software: you can redistribute it and/or modify it under
@@ -162,9 +153,11 @@ You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.
 
 == RESOURCES
-* Website: http://www.qutebrowser.org/
+* Website: https://www.qutebrowser.org/
 * Mailinglist: mailto:qutebrowser@lists.qutebrowser.org[] /
 https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser
+* Announce-only mailinglist: mailto:qutebrowser-announce@lists.qutebrowser.org[] /
+https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser-announce
 * IRC: irc://irc.freenode.org/#qutebrowser[`#qutebrowser`] on
 http://freenode.net/[Freenode]
 * Github: https://github.com/The-Compiler/qutebrowser

doc/stacktrace.asciidoc

@@ -41,21 +41,8 @@ For Archlinux, no debug informations are provided. You can either compile Qt
 yourself (which will take a few hours even on a modern machine) or use
 debugging symbols compiled/packaged by me (x86_64 only).
 
-.To compile by yourself
-
-----
-$ git clone https://github.com/The-Compiler/qt-debug-pkgbuild.git
-$ cd qt-debug-pkgbuild
-$ git checkout symbols
-$ export DEBUG_CFLAGS='-ggdb3 -fvar-tracking-assignments -Og'
-$ export DEBUG_CXXFLAGS='-ggdb3 -fvar-tracking-assignments -Og'
-$ cd qt5
-$ makepkg -si --pkg qt5-base-debug,qt5-webkit-debug
-$ cd ../pyqt5
-$ makepkg -si --pkg pyqt5-common-debug,python-pyqt5-debug
-----
-
-.To install my pre-built packages
+To install my pre-built packages
+++++++++++++++++++++++++++++++++
 
 First download and sign the key:
 
@@ -76,12 +63,30 @@ Server = http://qutebrowser.org/qt-debug/$arch
 Then install the packages:
 
 ----
-# pacman -Suy 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 qt5-webengine-debug
 ----
 
 The `-debug` packages conflict with the non-debug variants - it's safe to
 remove them.
 
+To compile by yourself
+++++++++++++++++++++++
+
+Note that building Qt will likely take multiple hours, even on a recent system.
+I'd also expect it to take around 6 GB of RAM and 30 GB of disk space for a
+successful compile run.
+
+----
+$ git clone https://github.com/qutebrowser/qt-debug-pkgbuild.git
+$ cd qt-debug-pkgbuild
+$ export DEBUG_CFLAGS='-ggdb3 -fvar-tracking-assignments -Og'
+$ export DEBUG_CXXFLAGS='-ggdb3 -fvar-tracking-assignments -Og'
+$ cd qt5
+$ makepkg -si --pkg qt5-base-debug,qt5-webkit-debug,qt5-webengine-debug
+$ cd ../pyqt5
+$ makepkg -si --pkg pyqt5-common-debug,python-pyqt5-debug
+----
+
 Getting the stack trace
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -169,7 +174,7 @@ When you see the _qutebrowser.exe has stopped working_ window, do not click
 file displayed there.
 
 Now install
-http://www.microsoft.com/en-us/download/details.aspx?id=42933[DebugDiag] from
+https://www.microsoft.com/en-us/download/details.aspx?id=49924[DebugDiag] from
 Microsoft, then run the *DebugDiag 2 Analysis* tool. There, check
 *CrashHangAnalysis* and add your crash dump via *Add Data files*. Then click
 *Start analysis*.

doc/userscripts.asciidoc

@@ -22,6 +22,8 @@ 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.
 
+NOTE: On Windows, only userscripts with `com`, `bat`, or `exe` extensions will be launched.
+
 Getting information
 -------------------
 
@@ -33,13 +35,17 @@ The following environment variables will be set when a userscript is launched:
 - `QUTE_FIFO`: The FIFO or file to write commands to.
 - `QUTE_HTML`: Path of a file containing the HTML source of the current page.
 - `QUTE_TEXT`: Path of a file containing the plaintext of the current page.
+- `QUTE_CONFIG_DIR`: Path of the directory containing qutebrowser's configuration.
+- `QUTE_DATA_DIR`: Path of the directory containing qutebrowser's data.
+- `QUTE_DOWNLOAD_DIR`: Path of the downloads directory.
 
 In `command` mode:
 
 - `QUTE_URL`: The current URL.
 - `QUTE_TITLE`: The title of the current page.
 - `QUTE_SELECTED_TEXT`: The text currently selected on the page.
-- `QUTE_SELECTED_HTML` The HTML currently selected on the page.
+- `QUTE_SELECTED_HTML` The HTML currently selected on the page (not supported
+  with QtWebEngine).
 
 In `hints` mode:
 

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/cheatsheet.svg

@@ -33,17 +33,17 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.7582312"
-     inkscape:cx="875.18895"
+     inkscape:cx="382.46963"
      inkscape:cy="136.8726"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      width="1024px"
      height="640px"
      showgrid="false"
-     inkscape:window-width="1362"
-     inkscape:window-height="740"
+     inkscape:window-width="1400"
+     inkscape:window-height="1050"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:window-maximized="0"
@@ -2539,7 +2539,7 @@
            y="10"
            style="font-size:10px" /></flowRegion><flowPara
          id="flowPara5604"
-         style="font-size:13px">Website: http://www.qutebrowser.org/ </flowPara><flowPara
+         style="font-size:13px">Website: https://www.qutebrowser.org/ </flowPara><flowPara
          id="flowPara5595"
          style="font-size:13px">IRC: #qutebrowser on Freenode</flowPara><flowPara
          id="flowPara5597"
@@ -2834,7 +2834,7 @@
    style="font-style:normal;font-weight:bold;-inkscape-font-specification:'Sans Bold';fill:#ff0000"
    id="flowSpan5705-5-8-3">(6)</flowSpan>  opening:</flowPara><flowPara
          style="font-style:normal;font-size:10px;-inkscape-font-specification:Sans;fill:#000000"
-         id="flowPara5829-1">go  -  open based on cur. URL</flowPara><flowPara
+         id="flowPara5829-1">go  -  edit &amp; open current URL</flowPara><flowPara
          style="font-style:normal;font-size:10px;-inkscape-font-specification:Sans;fill:#000000"
          id="flowPara5703-8-2-8">gO  -  like <flowSpan
    style="font-style:italic;-inkscape-font-specification:'Sans Italic'"

misc/docker/archlinux/Dockerfile

@@ -1,35 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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 python3-pyqt5 python3-pyqt5.qtwebkit python-tox \
-                       python3-sip xvfb git python3-setuptools wget \
-                       herbstluftwm locales
-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

@@ -1,25 +0,0 @@
-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 python3-pyqt5 python3-pyqt5.qtwebkit python-tox \
-                       python3-sip xvfb git python3-setuptools wget \
-                       herbstluftwm language-pack-en
-
-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/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,75 @@
+# -*- 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'},
+             # https://github.com/pyinstaller/pyinstaller/blob/b78bfe530cdc2904f65ce098bdf2de08c9037abb/PyInstaller/hooks/hook-PyQt5.QtWebEngineWidgets.py#L24
+             bundle_identifier='org.qt-project.Qt.QtWebEngineCore')

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

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.3.1
+requests==2.12.4

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  # rq.filter: < 5.0.0

misc/requirements/requirements-cxfreeze.txt-raw

@@ -0,0 +1,5 @@
+cx-Freeze < 5.0.0
+
+# We'll probably switch to PyInstaller soon, and 5.x doesn't install without a
+# compiler?
+#@ filter: cx-Freeze < 5.0.0

misc/requirements/requirements-flake8.txt

@@ -0,0 +1,22 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+flake8==2.6.2  # rq.filter: < 3.0.0
+flake8-copyright==0.2.0
+flake8-debugger==1.4.0  # rq.filter: != 2.0.0
+flake8-deprecated==1.1
+flake8-docstrings==1.0.2
+flake8-future-import==0.4.3
+flake8-mock==0.3
+flake8-pep3101==1.0
+flake8-putty==0.4.0
+flake8-string-format==0.2.3
+flake8-tidy-imports==1.0.3
+flake8-tuple==0.2.12
+mccabe==0.5.3
+packaging==16.8
+pep8-naming==0.4.1
+pycodestyle==2.2.0
+pydocstyle==1.1.1
+pyflakes==1.3.0
+pyparsing==2.1.10
+six==1.10.0

misc/requirements/requirements-flake8.txt-raw

@@ -0,0 +1,24 @@
+flake8<3.0.0
+flake8-copyright
+flake8-debugger!=2.0.0
+flake8-deprecated
+flake8-docstrings
+flake8-future-import
+flake8-mock
+flake8-pep3101
+flake8-putty
+flake8-string-format
+flake8-tidy-imports
+flake8-tuple
+pep8-naming
+pydocstyle
+pyflakes
+
+# Pinned to 2.0.0 otherwise
+pycodestyle==2.2.0
+
+# Waiting until flake8-putty updated
+#@ filter: flake8 < 3.0.0
+
+# https://github.com/JBKahn/flake8-debugger/issues/5
+#@ filter: flake8-debugger != 2.0.0

misc/requirements/requirements-pyinstaller.txt

@@ -0,0 +1,3 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+-e git+https://github.com/edrex/pyinstaller.git@0fedc28f65d74e1f5ece453abdfb5ad54e9ac5ba#egg=PyInstaller

misc/requirements/requirements-pyinstaller.txt-raw

@@ -0,0 +1,2 @@
+# https://github.com/pyinstaller/pyinstaller/pull/2238
+-e git+https://github.com/edrex/pyinstaller.git@1984_add_QtWebEngineCore#egg=PyInstaller

misc/requirements/requirements-pylint-master.txt

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

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

@@ -0,0 +1,10 @@
+-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
+
+# 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,14 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+astroid==1.4.9
+github3.py==0.9.6
+isort==4.2.5
+lazy-object-proxy==1.2.2
+mccabe==0.5.3
+pylint==1.6.4
+./scripts/dev/pylint_checkers
+requests==2.12.4
+six==1.10.0
+uritemplate==3.0.0
+uritemplate.py==3.0.2
+wrapt==1.10.8

misc/requirements/requirements-pylint.txt-raw

@@ -0,0 +1,7 @@
+pylint
+./scripts/dev/pylint_checkers
+requests
+github3.py
+
+# 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.13.1
+pyroma==2.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-git.txt

@@ -0,0 +1,49 @@
+bzr+lp:beautifulsoup
+git+https://github.com/cherrypy/cherrypy.git
+hg+https://bitbucket.org/ned/coveragepy
+git+https://github.com/micheles/decorator.git
+git+https://github.com/pallets/flask.git
+git+https://github.com/miracle2k/python-glob2.git
+git+https://github.com/Runscope/httpbin.git
+git+https://github.com/HypothesisWorks/hypothesis-python.git
+git+https://github.com/pallets/itsdangerous.git
+git+https://bitbucket.org/zzzeek/mako.git
+git+https://github.com/r1chardj0n3s/parse.git
+git+https://github.com/jenisys/parse_type.git
+hg+https://bitbucket.org/pytest-dev/py
+git+https://github.com/pytest-dev/pytest.git@features
+git+https://github.com/pytest-dev/pytest-bdd.git
+
+# This is broken at the moment because logfail tries to access
+# LogCaptureHandler
+# git+https://github.com/eisensheng/pytest-catchlog.git
+pytest-catchlog==1.2.2
+
+git+https://github.com/pytest-dev/pytest-cov.git
+git+https://github.com/pytest-dev/pytest-faulthandler.git
+git+https://github.com/pytest-dev/pytest-instafail.git
+git+https://github.com/pytest-dev/pytest-mock.git
+git+https://github.com/pytest-dev/pytest-qt.git
+git+https://github.com/pytest-dev/pytest-repeat.git
+git+https://github.com/pytest-dev/pytest-rerunfailures.git
+git+https://github.com/abusalimov/pytest-travis-fold.git
+git+https://github.com/fschulze/pytest-warnings.git
+git+https://github.com/The-Compiler/pytest-xvfb.git
+hg+https://bitbucket.org/gutworth/six
+hg+https://bitbucket.org/jendrikseipp/vulture
+git+https://github.com/pallets/werkzeug.git
+
+
+## qutebrowser dependencies
+
+git+https://github.com/tartley/colorama.git
+hg+https://bitbucket.org/cthedot/cssutils
+git+https://github.com/pallets/jinja.git
+git+https://github.com/pallets/markupsafe.git
+hg+http://bitbucket.org/birkenfeld/pygments-main
+hg+https://bitbucket.org/fdik/pypeg
+
+# Fails to build:
+# gcc: error: ext/_yaml.c: No such file or directory
+# hg+https://bitbucket.org/xi/pyyaml
+PyYAML==3.12

misc/requirements/requirements-tests.txt

@@ -0,0 +1,36 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+beautifulsoup4==4.5.1
+CherryPy==8.6.0
+click==6.6
+coverage==4.3.1
+decorator==4.0.10
+EasyProcess==0.2.3
+Flask==0.12
+glob2==0.5
+httpbin==0.5.0
+hypothesis==3.6.1
+itsdangerous==0.24
+# Jinja2==2.8
+Mako==1.0.6
+# MarkupSafe==0.23
+parse==1.6.6
+parse-type==0.3.4
+py==1.4.32
+pytest==3.0.4  # rq.filter: != 3.0.5
+pytest-bdd==2.18.1
+pytest-catchlog==1.2.2
+pytest-cov==2.4.0
+pytest-faulthandler==1.3.1
+pytest-instafail==0.3.0
+pytest-mock==1.5.0
+pytest-qt==2.1.0
+pytest-repeat==0.4.1
+pytest-rerunfailures==2.1.0
+pytest-travis-fold==1.2.0
+pytest-warnings==0.2.0
+pytest-xvfb==1.0.0
+PyVirtualDisplay==0.2.1
+six==1.10.0
+vulture==0.11
+Werkzeug==0.11.13

misc/requirements/requirements-tests.txt-raw

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

misc/requirements/requirements-tox.txt

@@ -0,0 +1,6 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+pluggy==0.4.0
+py==1.4.32
+tox==2.5.0
+virtualenv==15.1.0

misc/requirements/requirements-tox.txt-raw

@@ -0,0 +1,4 @@
+tox
+
+# The latest tox release still depends on pluggy < 0.4...
+pluggy==0.4.0

misc/requirements/requirements-vulture.txt

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

misc/requirements/requirements-vulture.txt-raw

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

misc/userscripts/cast

@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+#
+# Behaviour
+#   Userscript for qutebrowser which casts the url passed in $1 to the default
+#   ChromeCast device in the network using the program `castnow`
+#
+# Usage
+#   You can launch the script from qutebrowser as follows:
+#       spawn --userscript ${PATH_TO_FILE} {url}
+#
+#   Then, you can control the chromecast by launching the simple command
+#   `castnow` in a shell which will connect to the running castnow instance.
+#
+#   For stopping the script, issue the command `pkill -f castnow` which would
+#   then let the rest of the userscript execute for cleaning temporary file.
+#
+# Thanks
+#   This userscript borrows Thorsten Wißmann's javascript code from his `mpv`
+#   userscript.
+#
+# Dependencies
+#   - castnow, https://github.com/xat/castnow
+#
+# Author
+#   Simon Désaulniers <sim.desaulniers@gmail.com>
+
+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
+}
+
+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\\">
+            The video is being cast on your ChromeCast device.
+            </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"
+
+tmpdir=$(mktemp -d)
+file_to_cast=${tmpdir}/qutecast
+
+# kill any running instance of castnow
+pkill -f /usr/bin/castnow
+
+# start youtube download in stream mode (-o -) into temporary file
+youtube-dl -qo - "$1" > ${file_to_cast} &
+ytdl_pid=$!
+
+msg info "Casting $1" >> "$QUTE_FIFO"
+# start castnow in stream mode to cast on ChromeCast
+tail -F "${file_to_cast}" | castnow -
+
+# cleanup remaining background process and file on disk
+kill ${ytdl_pid}
+rm -rf ${tmpdir}

misc/userscripts/dmenu_qutebrowser

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2015 Zach-Button <zachrey.button@gmail.com>
 #
@@ -39,10 +39,9 @@
 
 [ -z "$QUTE_URL" ] && QUTE_URL='http://google.com'
 
-url=$(echo "$QUTE_URL" | cat - ~/.config/qutebrowser/quickmarks ~/.local/share/qutebrowser/history | dmenu -l 15 -p qutebrowser)
-url=$(echo $url | sed -E 's/[^ ]+ +//g' | egrep "https?:" || echo $url)
+url=$(echo "$QUTE_URL" | cat - "$QUTE_CONFIG_DIR/quickmarks" "$QUTE_DATA_DIR/history" | dmenu -l 15 -p qutebrowser)
+url=$(echo "$url" | sed -E 's/[^ ]+ +//g' | egrep "https?:" || echo "$url")
 
 [ -z "${url// }" ] && exit
 
 echo "open $url" >> "$QUTE_FIFO" || qutebrowser "$url"
-

misc/userscripts/open_download

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 # 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
@@ -18,7 +18,10 @@
 # Thorsten Wißmann, 2015 (thorsten` on freenode)
 # Any feedback is welcome!
 
+set -e
+
 # open a file from the download directory using rofi
+DOWNLOAD_DIR=${DOWNLOAD_DIR:-$QUTE_DOWNLOAD_DIR}
 DOWNLOAD_DIR=${DOWNLOAD_DIR:-$HOME/Downloads}
 # the name of the rofi command
 ROFI_CMD=${ROFI_CMD:-rofi}
@@ -49,7 +52,7 @@ die() {
 if ! [ -d "$DOWNLOAD_DIR" ] ; then
     die "Download directory »$DOWNLOAD_DIR« not found!"
 fi
-if ! $(which "${ROFI_CMD}" > /dev/null ) ; then
+if ! which "${ROFI_CMD}" > /dev/null ; then
     die "Rofi command »${ROFI_CMD}« not found in PATH!"
 fi
 
@@ -109,5 +112,3 @@ fi
 msg info "Opening »$file« (of type $filetype) with ${application%.desktop}"
 
 xdg-open "$path" &
-
-

misc/userscripts/password_fill

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 help() {
     blink=$'\e[1;31m' reset=$'\e[0m'
 cat <<EOF
@@ -22,7 +22,7 @@ Pass backend: (see also passwordstore.org)
   must be contained in a later line beginning with "user:", "login:", or
   "username:" (configurable by the user_pattern variable).
 
-Behaviour:
+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
@@ -39,6 +39,7 @@ Configuration:
 EOF
 }
 
+set -o errexit
 set -o pipefail
 shopt -s nocasematch # make regexp matching in bash case insensitive
 
@@ -61,7 +62,7 @@ die() {
 }
 
 javascript_escape() {
-    # print the first argument in a escaped way, such that it can savely
+    # print the first argument in an escaped way, such that it can safely
     # be used within javascripts double quotes
     sed "s,[\\\'\"],\\\&,g" <<< "$1"
 }
@@ -80,7 +81,7 @@ javascript_escape() {
 # between different paths on the same domain.
 
 simplify_url() {
-    simple_url="${1##*://}" # remove protocoll specification
+    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
@@ -89,7 +90,7 @@ simplify_url() {
 
 # no_entries_found() is called if the first query_entries() call did not find
 # any matching entries. Multiple implementations are possible:
-# The easiest behaviour is to quit:
+# The easiest behavior is to quit:
 #no_entries_found() {
 #    if [ 0 -eq "${#files[@]}" ] ; then
 #        die "No entry found for »$simple_url«"
@@ -106,7 +107,7 @@ simplify_url() {
 #     fi
 # }
 
-# Another beahviour is to drop another level of subdomains until search hits
+# 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
@@ -170,7 +171,7 @@ choose_entry_random() {
 # 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 entrie in it
+# whether to show the menu if there is only one entry in it
 menu_if_one_entry=0
 choose_entry_menu() {
     local nr=${#files[@]}
@@ -245,7 +246,7 @@ pass_backend() {
             done < <(find -L "$PREFIX" -iname '*.gpg' -print0)
         fi
         if ((match_filename)) ; then
-            # add entries wth matching filepath
+            # add entries with matching filepath
             while read -r passfile ; do
                 passfile="${passfile#$PREFIX}"
                 passfile="${passfile#/}"
@@ -341,10 +342,14 @@ cat <<EOF
         for (var j = 0; j < inputs.length; j++) {
             var input = inputs[j];
             if (input.type == "text" || input.type == "email") {
+                input.focus();
                 input.value = "$(javascript_escape "${username}")";
+                input.blur();
             }
             if (input.type == "password") {
+                input.focus();
                 input.value = "$(javascript_escape "${password}")";
+                input.blur();
             }
         }
     };

misc/userscripts/qutebrowser_viewsource

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2015 Zach-Button <zachrey.button@gmail.com>
 #
@@ -17,16 +17,16 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# 
+#
 # This script fetches the unprocessed HTML source for a page and opens it in vim.
 #	:bind gf spawn --userscript qutebrowser_viewsource
 #
 # Caveat: Does not use authentication of any kind. Add it in if you want it to.
 #
 
-path=/tmp/qutebrowser_$(mktemp XXXXXXXX).html
+path=$(mktemp --tmpdir qutebrowser_XXXXXXXX.html)
 
-curl "$QUTE_URL" > $path
+curl "$QUTE_URL" > "$path"
 urxvt -e vim "$path"
 
 rm "$path"

misc/userscripts/qutedmenu

@@ -7,7 +7,6 @@
 # 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
 
@@ -15,17 +14,17 @@ create_menu() {
     # Check quickmarks
     while read -r url; do
         printf -- '%s\n' "$url"
-    done < "$confdir"/qutebrowser/quickmarks
+    done < "$QUTE_CONFIG_DIR"/quickmarks
 
     # Next bookmarks
     while read -r url _; do
         printf -- '%s\n' "$url"
-    done < "$confdir"/qutebrowser/bookmarks/urls
+    done < "$QUTE_CONFIG_DIR"/bookmarks/urls
 
     # Finally history
     while read -r _ url; do
         printf -- '%s\n' "$url"
-    done < "$datadir"/qutebrowser/history
+    done < "$QUTE_DATA_DIR"/history
     }
 
 get_selection() {

misc/userscripts/readability

@@ -0,0 +1,25 @@
+#!/usr/bin/env python2
+#
+# Executes python-readability on current page and opens the summary as new tab.
+#
+# Usage:
+#   :spawn --userscript readability
+#
+from __future__ import absolute_import
+import codecs, os
+from readability.readability import Document
+
+tmpfile=os.path.expanduser('~/.local/share/qutebrowser/userscripts/readability.html')
+if not os.path.exists(os.path.dirname(tmpfile)):
+    os.makedirs(os.path.dirname(tmpfile))
+
+with codecs.open(os.environ['QUTE_HTML'], 'r', 'utf-8') as source:
+    doc = Document(source.read())
+    content = doc.summary().replace('<html>', '<html><head><title>%s</title></head>' % doc.title())
+
+    with codecs.open(tmpfile, 'w', 'utf-8') as target:
+        target.write('<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />')
+        target.write(content)
+
+    with open(os.environ['QUTE_FIFO'], 'w') as fifo:
+        fifo.write('open -t %s' % tmpfile)

misc/userscripts/rss

@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Copyright 2016 Jan Verbeek (blyxxyz) <ring@openmailbox.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+# This script keeps track of URLs in RSS feeds and opens new ones.
+# New feeds can be added with ':spawn -u /path/to/userscripts/rss add' or
+# ':spawn -u /path/to/userscripts/rss <url>'.
+# New items can be opened with ':spawn -u /path/to/userscripts/rss'.
+# The script doesn't really parse XML, and searches for things that look like
+# item links. It might open things that aren't real links, and it might miss
+# real links.
+
+config_dir="$HOME/.qute-rss"
+
+add_feed () {
+    touch "feeds"
+    if grep -Fq "$1" "feeds"; then
+        notice "$1 is saved already."
+    else
+        printf "%s\n" "$1" >> "feeds"
+    fi
+}
+
+# Show an error message and exit
+fail () {
+    echo "message-error '$*'" > "$QUTE_FIFO"
+    exit 1
+}
+
+# Get a sorted list of item URLs from a RSS feed
+get_items () {
+    $curl "$@" | grep "$text_only" -zo -e '<guid[^<>]*>[^<>]*</guid>' \
+                      -e '<link[^<>]*>[^<>]*</link>' \
+                      -e '<link[^<>]*href="[^"]*"' |
+        grep "$text_only" -o 'http[^<>"]*' | sort | uniq
+}
+
+# Show an info message
+notice () {
+    echo "message-info '$*'" > "$QUTE_FIFO"
+}
+
+# Update a database of a feed and open new URLs
+read_items () {
+    cd read_urls
+    feed_file="$(echo "$1" | tr -d /)"
+    feed_temp_file="$(mktemp "$feed_file.tmp.XXXXXXXXXX")"
+    feed_new_items="$(mktemp "$feed_file.new.XXXXXXXXXX")"
+    get_items "$1" > "$feed_temp_file"
+    if [ ! -s "$feed_temp_file" ]; then
+        notice "No items found for $1."
+        rm "$feed_temp_file" "$feed_new_items"
+    elif [ ! -f "$feed_file" ]; then
+        notice "$1 is a new feed. All items will be marked as read."
+        mv "$feed_temp_file" "$feed_file"
+        rm "$feed_new_items"
+    else
+        sort -o "$feed_file" "$feed_file"
+        comm -2 -3 "$feed_temp_file" "$feed_file" | tee "$feed_new_items"
+        cat "$feed_new_items" >> "$feed_file"
+        sort -o "$feed_file" "$feed_file"
+        rm "$feed_temp_file" "$feed_new_items"
+    fi | while read item; do
+        echo "open -t $item" > "$QUTE_FIFO"
+    done
+}
+
+if [ ! -d "$config_dir/read_urls" ]; then
+    notice "Creating configuration directory."
+    mkdir -p "$config_dir/read_urls"
+fi
+
+cd "$config_dir"
+
+if [ $# != 0 ]; then
+    for arg in "$@"; do
+        if [ "$arg" = "add" ]; then
+            add_feed "$QUTE_URL"
+        else
+            add_feed "$arg"
+        fi
+    done
+    exit
+fi
+
+if [ ! -f "feeds" ]; then
+    fail "Add feeds by running ':spawn -u rss add' or ':spawn -u rss <url>'."
+fi
+
+if curl --version >&-; then
+    curl="curl -sL"
+elif wget --version >&-; then
+    curl="wget -qO -"
+else
+    fail "Either curl or wget is needed to run this script."
+fi
+
+# Detect GNU grep so we can force it to treat everything as text
+if < /dev/null grep --help 2>&1 | grep -q -- -a; then
+    text_only="-a"
+fi
+
+while read feed_url; do
+    read_items "$feed_url" &
+done < "$config_dir/feeds"
+
+wait

misc/userscripts/taskadd

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+#
+# Behavior:
+#   Userscript for qutebrowser which adds a task to taskwarrior.
+#   If run as a command (:spawn --userscript taskadd), it creates a new task
+#   with the description equal to the current page title and annotates it with
+#   the current page url. Additional arguments are passed along so you can add
+#   mods to the task (e.g. priority, due date, tags).
+#
+#   Example:
+#       :spawn --userscript taskadd due:eod pri:H
+#
+#   To enable passing along extra args, I suggest using a mapping like:
+#       :bind <somekey> set-cmd-text -s :spawn --userscript taskadd
+#
+#   If run from hint mode, it uses the selected hint text as the description
+#   and the selected hint url as the annotation.
+#
+# Ryan Roden-Corrent (rcorre), 2016
+# Any feedback is welcome!
+#
+# For more info on Taskwarrior, see http://taskwarrior.org/
+
+# use either the current page title or the hint text as the task description
+[[ $QUTE_MODE == 'hints' ]] && title=$QUTE_SELECTED_TEXT || title=$QUTE_TITLE
+
+# try to add the task and grab the output
+msg="$(task add $title $@ 2>&1)"
+
+if [[ $? == 0 ]]; then
+    # annotate the new task with the url, send the output back to the browser
+    task +LATEST annotate "$QUTE_URL"
+    echo "message-info '$msg'" >> $QUTE_FIFO
+else
+    echo "message-error '$msg'" >> $QUTE_FIFO
+fi

misc/userscripts/view_in_mpv

@@ -1,6 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 #
-# Behaviour:
+# 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
@@ -24,6 +24,8 @@
 # Thorsten Wißmann, 2015 (thorsten` on freenode)
 # Any feedback is welcome!
 
+set -e
+
 if [ -z "$QUTE_FIFO" ] ; then
     cat 1>&2 <<EOF
 Error: $0 can not be run as a standalone script.

pytest.ini

@@ -1,6 +1,5 @@
 [pytest]
-norecursedirs = .tox .venv
-addopts = --strict -rfEw --faulthandler-timeout=70 --instafail
+addopts = --strict -rfEw --faulthandler-timeout=70 --instafail --pythonwarnings error
 markers =
     gui: Tests using the GUI (e.g. spawning widgets)
     posix: Tests which only can run on a POSIX OS.
@@ -11,12 +10,18 @@ markers =
     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.
-    skip: Always skipped test.
-    pyqt531_or_newer: Needs PyQt 5.3.1 or newer.
+    integration: Tests which test a bigger portion of code
+    end2end: End to end tests which run qutebrowser as subprocess
     xfail_norun: xfail the test with out running it
     ci: Tests which should only run on CI.
-    flaky: Tests which are flaky and should be rerun
+    qtwebengine_todo: Features still missing with QtWebEngine
+    qtwebengine_skip: Tests not applicable with QtWebEngine
+    qtwebkit_skip: Tests not applicable with QtWebKit
+    qtwebengine_flaky: Tests which are flaky (and currently skipped) with QtWebEngine
+    qtwebengine_osx_xfail: Tests which fail on OS X with QtWebEngine
+    js_prompt: Tests needing to display a javascript prompt
+    issue2183: https://github.com/The-Compiler/qutebrowser/issues/2183
+    this: Used to mark tests during development
 qt_log_level_fail = WARNING
 qt_log_ignore =
     ^SpellCheck: .*
@@ -25,6 +30,9 @@ qt_log_ignore =
     ^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"
+    ^propsReply "Method \\"GetAll\\" with signature \\"s\\" on interface \\"org\.freedesktop\.DBus\.Properties\\" doesn't exist\\n"
+    ^nmReply "Method \\"GetDevices\\" with signature \\"\\" on interface \\"org\.freedesktop\.NetworkManager\\" doesn't exist\\n"
+    ^"Object path cannot be empty"
     ^virtual void QSslSocketBackendPrivate::transmit\(\) SSL write failed with error: -9805
     ^virtual void QSslSocketBackendPrivate::transmit\(\) SSLRead failed with: -9805
     ^Type conversion already registered from type .*
@@ -32,10 +40,11 @@ qt_log_ignore =
     ^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
-qt_wait_signal_raising = true
+    ^load glyph failed
+    ^Error when parsing the netrc file
+    ^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=
 xfail_strict = true

qutebrowser.desktop

@@ -8,3 +8,4 @@ Exec=qutebrowser %u
 Terminal=false
 StartupNotify=false
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
+Keywords=Browser

qutebrowser/__init__.py

@@ -28,7 +28,7 @@ __copyright__ = "Copyright 2014-2016 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (0, 6, 0)
+__version_info__ = (0, 9, 0)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit."
 

qutebrowser/app.py

@@ -31,11 +31,10 @@ import atexit
 import datetime
 import tokenize
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWebKit import QWebSettings
-from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon, QCursor, QWindow
+from PyQt5.QtWidgets import QApplication, QWidget
+from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon, QWindow
 from PyQt5.QtCore import (pyqtSlot, qInstallMessageHandler, QTimer, QUrl,
-                          QObject, Qt, QEvent, pyqtSignal)
+                          QObject, QEvent, pyqtSignal)
 try:
     import hunter
 except ImportError:
@@ -46,10 +45,14 @@ 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
-from qutebrowser.browser import urlmarks, cookies, cache, adblock, history
-from qutebrowser.browser.network import qutescheme, proxy, networkmanager
-from qutebrowser.mainwindow import mainwindow
-from qutebrowser.misc import readline, ipc, savemanager, sessions, crashsignal
+from qutebrowser.browser import (urlmarks, adblock, history, browsertab,
+                                 downloads)
+from qutebrowser.browser.webkit import cookies, cache
+from qutebrowser.browser.webkit.network import networkmanager
+from qutebrowser.keyinput import macros
+from qutebrowser.mainwindow import mainwindow, prompt
+from qutebrowser.misc import (readline, ipc, savemanager, sessions,
+                              crashsignal, earlyinit)
 from qutebrowser.misc import utilcmds  # pylint: disable=unused-import
 from qutebrowser.utils import (log, version, message, utils, qtutils, urlutils,
                                objreg, usertypes, standarddir, error, debug)
@@ -61,15 +64,6 @@ qApp = None
 
 def run(args):
     """Initialize everything and run the application."""
-    if args.version:
-        print(version.version(short=True))
-        print()
-        print()
-        print(qutebrowser.__copyright__)
-        print()
-        print(version.GPL_BOILERPLATE.strip())
-        sys.exit(usertypes.Exit.ok)
-
     if args.temp_basedir:
         args.basedir = tempfile.mkdtemp(prefix='qutebrowser-basedir-')
 
@@ -83,6 +77,13 @@ def run(args):
     qApp.setApplicationVersion(qutebrowser.__version__)
     qApp.lastWindowClosed.connect(quitter.on_last_window_closed)
 
+    log.init.debug("Initializing directories...")
+    standarddir.init(args)
+
+    if args.version:
+        print(version.version())
+        sys.exit(usertypes.Exit.ok)
+
     crash_handler = crashsignal.CrashHandler(
         app=qApp, quitter=quitter, args=args, parent=qApp)
     crash_handler.activate()
@@ -152,12 +153,13 @@ def init(args, crash_handler):
     config_obj = objreg.get('config')
     config_obj.style_changed.connect(style.get_stylesheet.cache_clear)
     qApp.focusChanged.connect(on_focus_changed)
-    qApp.focusChanged.connect(message.on_focus_changed)
 
     QDesktopServices.setUrlHandler('http', open_desktopservices_url)
     QDesktopServices.setUrlHandler('https', open_desktopservices_url)
     QDesktopServices.setUrlHandler('qute', open_desktopservices_url)
 
+    macros.init()
+
     log.init.debug("Init done!")
     crash_handler.raise_crashdlg()
 
@@ -166,7 +168,7 @@ 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):
+    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)
@@ -184,8 +186,7 @@ def _process_args(args):
         try:
             config_obj.set('temp', sect, opt, val)
         except (configexc.Error, configparser.Error) as e:
-            message.error('current', "set: {} - {}".format(
-                e.__class__.__name__, e))
+            message.error("set: {} - {}".format(e.__class__.__name__, e))
 
     if not args.override_restore:
         _load_session(args.session)
@@ -201,6 +202,9 @@ def _process_args(args):
     _open_startpage()
     _open_quickstart(args)
 
+    delta = datetime.datetime.now() - earlyinit.START_TIME
+    log.init.debug("Init finished after {}s".format(delta.total_seconds()))
+
 
 def _load_session(name):
     """Load the default session.
@@ -220,10 +224,9 @@ def _load_session(name):
     try:
         session_manager.load(name)
     except sessions.SessionNotFoundError:
-        message.error('current', "Session {} not found!".format(name))
+        message.error("Session {} not found!".format(name))
     except sessions.SessionError as e:
-        message.error('current', "Failed to load session {}: {}".format(
-            name, e))
+        message.error("Failed to load session {}: {}".format(name, e))
     try:
         del state_config['general']['session']
     except KeyError:
@@ -244,12 +247,7 @@ def process_pos_args(args, via_ipc=False, cwd=None, target_arg=None):
         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 instead of None. This behavior is
-                    caused by the PyQt signal
-                    ``got_args = pyqtSignal(list, str, str)``
-                    used in the misc.ipc.IPCServer class. PyQt converts the
-                    None value into a null QString and then back to an empty
-                    python string
+                    will be an empty string.
     """
     if via_ipc and not args:
         win_id = mainwindow.get_window(via_ipc, force_window=True)
@@ -275,14 +273,17 @@ def process_pos_args(args, via_ipc=False, cwd=None, target_arg=None):
             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))
+                message.error("Error in startup argument '{}': {}".format(
+                    cmd, e))
             else:
-                background = open_target in ('tab-bg', 'tab-bg-silent')
-                tabbed_browser.tabopen(url, background=background)
+                background = open_target in ['tab-bg', 'tab-bg-silent']
+                tabbed_browser.tabopen(url, background=background,
+                                       explicit=True)
 
 
 def _open_startpage(win_id=None):
@@ -307,8 +308,7 @@ def _open_startpage(win_id=None):
                 try:
                     url = urlutils.fuzzy_url(urlstr, do_search=False)
                 except urlutils.InvalidUrlError as e:
-                    message.error('current', "Error when opening startpage: "
-                                  "{}".format(e))
+                    message.error("Error when opening startpage: {}".format(e))
                     tabbed_browser.tabopen(QUrl('about:blank'))
                 else:
                     tabbed_browser.tabopen(url)
@@ -320,8 +320,8 @@ def _open_quickstart(args):
     Args:
         args: The argparse namespace.
     """
-    if args.datadir is not None or args.basedir is not None:
-        # With --datadir or --basedir given, don't open quickstart.
+    if args.basedir is not None:
+        # With --basedir given, don't open quickstart.
         return
     state_config = objreg.get('state-config')
     try:
@@ -332,7 +332,7 @@ def _open_quickstart(args):
         tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                     window='last-focused')
         tabbed_browser.tabopen(
-            QUrl('http://www.qutebrowser.org/quickstart.html'))
+            QUrl('https://www.qutebrowser.org/quickstart.html'))
         state_config['general']['quickstart-done'] = '1'
 
 
@@ -345,40 +345,29 @@ def _save_version():
 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):
-        try:
-            objreg.delete('last-focused-main-window')
-        except KeyError:
-            pass
-        qApp.restoreOverrideCursor()
-    else:
+        return
+
+    if not isinstance(new, QWidget):
+        log.misc.debug("on_focus_changed called with non-QWidget {!r}".format(
+            new))
+        return
+
+    window = new.window()
+    if isinstance(window, mainwindow.MainWindow):
         objreg.register('last-focused-main-window', window, update=True)
-        _maybe_hide_mouse_cursor()
+        # A focused window must also be visible, and in this case we should
+        # consider it as the most recently looked-at window
+        objreg.register('last-visible-main-window', window, update=True)
 
 
-@pyqtSlot(QUrl)
 def open_desktopservices_url(url):
-    """Handler to open an URL via QDesktopServices."""
+    """Handler to open a URL via QDesktopServices."""
     win_id = mainwindow.get_window(via_ipc=True, force_window=False)
     tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                 window=win_id)
     tabbed_browser.tabopen(url)
 
 
-@config.change_filter('ui', 'hide-mouse-cursor', function=True)
-def _maybe_hide_mouse_cursor():
-    """Hide the mouse cursor if it isn't yet and it's configured."""
-    if config.get('ui', 'hide-mouse-cursor'):
-        if qApp.overrideCursor() is not None:
-            return
-        qApp.setOverrideCursor(QCursor(Qt.BlankCursor))
-    else:
-        qApp.restoreOverrideCursor()
-
-
 def _init_modules(args, crash_handler):
     """Initialize all 'modules' which need to be initialized.
 
@@ -386,60 +375,71 @@ def _init_modules(args, crash_handler):
         args: The argparse namespace.
         crash_handler: The CrashHandler instance.
     """
-    # pylint: disable=too-many-statements
+    log.init.debug("Initializing prompts...")
+    prompt.init()
+
     log.init.debug("Initializing save manager...")
     save_manager = savemanager.SaveManager(qApp)
     objreg.register('save-manager', save_manager)
     save_manager.add_saveable('version', _save_version)
+
     log.init.debug("Initializing network...")
     networkmanager.init()
+
     log.init.debug("Initializing readline-bridge...")
     readline_bridge = readline.ReadlineBridge()
     objreg.register('readline-bridge', readline_bridge)
-    log.init.debug("Initializing directories...")
-    standarddir.init(args)
+
     log.init.debug("Initializing config...")
     config.init(qApp)
     save_manager.init_autosave()
+
     log.init.debug("Initializing web history...")
     history.init(qApp)
+
     log.init.debug("Initializing crashlog...")
     if not args.no_err_windows:
         crash_handler.handle_segfault()
+
     log.init.debug("Initializing sessions...")
     sessions.init(qApp)
-    log.init.debug("Initializing js-bridge...")
-    js_bridge = qutescheme.JSBridge(qApp)
-    objreg.register('js-bridge', js_bridge)
+
     log.init.debug("Initializing websettings...")
-    websettings.init()
+    websettings.init(args)
+
     log.init.debug("Initializing adblock...")
     host_blocker = adblock.HostBlocker()
     host_blocker.read_hosts()
     objreg.register('host-blocker', host_blocker)
+
     log.init.debug("Initializing quickmarks...")
     quickmark_manager = urlmarks.QuickmarkManager(qApp)
     objreg.register('quickmark-manager', quickmark_manager)
+
     log.init.debug("Initializing bookmarks...")
     bookmark_manager = urlmarks.BookmarkManager(qApp)
     objreg.register('bookmark-manager', bookmark_manager)
-    log.init.debug("Initializing proxy...")
-    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(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)
+    # Init backend-specific stuff
+    browsertab.init(args)
 
 
 def _init_late_modules(args):
@@ -478,7 +478,6 @@ class Quitter:
         self._shutting_down = False
         self._args = args
 
-    @pyqtSlot()
     def on_last_window_closed(self):
         """Slot which gets invoked when the last window was closed."""
         self.shutdown(last_window=True)
@@ -493,12 +492,12 @@ class Quitter:
         else:
             path = os.path.abspath(os.path.dirname(qutebrowser.__file__))
             if not os.path.isdir(path):
-                # Probably running from an python egg.
+                # Probably running from a python egg.
                 return
 
         for dirpath, _dirnames, filenames in os.walk(path):
             for fn in filenames:
-                if os.path.splitext(fn)[1] == '.py':
+                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')
 
@@ -526,7 +525,7 @@ class Quitter:
             cwd = os.path.join(os.path.abspath(os.path.dirname(
                                qutebrowser.__file__)), '..')
             if not os.path.isdir(cwd):
-                # Probably running from an python egg. Let's fallback to
+                # Probably running from a python egg. Let's fallback to
                 # cwd=None and see if that works out.
                 # See https://github.com/The-Compiler/qutebrowser/issues/323
                 cwd = None
@@ -554,8 +553,9 @@ class Quitter:
             argdict['session'] = session
             argdict['override_restore'] = False
         # Ensure :restart works with --temp-basedir
-        argdict['temp_basedir'] = False
-        argdict['temp_basedir_restarted'] = True
+        if self._args.temp_basedir:
+            argdict['temp_basedir'] = False
+            argdict['temp_basedir_restarted'] = True
 
         # Dump the data
         data = json.dumps(argdict)
@@ -647,13 +647,7 @@ class Quitter:
             session_manager.save(sessions.default, last_window=last_window,
                                  load_next_time=True)
 
-        deferrer = False
-        for win_id in objreg.window_registry:
-            prompter = objreg.get('prompter', None, scope='window',
-                                  window=win_id)
-            if prompter is not None and prompter.shutdown():
-                deferrer = True
-        if deferrer:
+        if prompt.prompt_queue.shutdown():
             # If shutdown was called while we were asking a question, we're in
             # a still sub-eventloop (which gets quit now) and not in the main
             # one.
@@ -702,9 +696,7 @@ class Quitter:
                         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('')
+        websettings.shutdown()
         # Re-enable faulthandler to stdout, then remove crash log
         log.destroy.debug("Deactivating crash log...")
         objreg.get('crash-handler').destroy_crashlogfile()
@@ -713,6 +705,8 @@ class Quitter:
                 not restart):
             atexit.register(shutil.rmtree, self._args.basedir,
                             ignore_errors=True)
+        # Delete temp download dir
+        downloads.temp_download_manager.cleanup()
         # If we don't kill our custom handler here we might get segfaults
         log.destroy.debug("Deactivating message handler...")
         qInstallMessageHandler(None)
@@ -723,8 +717,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.
 
@@ -740,6 +734,7 @@ class Application(QApplication):
 
     Attributes:
         _args: ArgumentParser instance.
+        _last_focus_object: The last focused object's repr.
     """
 
     new_window = pyqtSignal(mainwindow.MainWindow)
@@ -750,6 +745,8 @@ class Application(QApplication):
         Args:
             Argument namespace from argparse.
         """
+        self._last_focus_object = None
+
         qt_args = qtutils.get_args(args)
         log.init.debug("Qt arguments: {}, based on {}".format(qt_args, args))
         super().__init__(qt_args)
@@ -766,7 +763,10 @@ class Application(QApplication):
     @pyqtSlot(QObject)
     def on_focus_object_changed(self, obj):
         """Log when the focus object changed."""
-        log.misc.debug("Focus object changed: {!r}".format(obj))
+        output = repr(obj)
+        if self._last_focus_object != output:
+            log.misc.debug("Focus object changed: {}".format(output))
+        self._last_focus_object = output
 
     def __repr__(self):
         return utils.get_repr(self)

qutebrowser/browser/__init__.py

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

qutebrowser/browser/adblock.py

@@ -26,9 +26,10 @@ import posixpath
 import zipfile
 import fnmatch
 
+from qutebrowser.browser import downloads
 from qutebrowser.config import config
 from qutebrowser.utils import objreg, standarddir, log, message
-from qutebrowser.commands import cmdutils, cmdexc
+from qutebrowser.commands import cmdutils
 
 
 def guess_zip_filename(zf):
@@ -48,7 +49,7 @@ def guess_zip_filename(zf):
 
 
 def get_fileobj(byte_io):
-    """Get an usable file object to read the hosts file from."""
+    """Get a usable file object to read the hosts file from."""
     byte_io.seek(0)  # rewind downloaded file
     if zipfile.is_zipfile(byte_io):
         byte_io.seek(0)  # rewind what zipfile.is_zipfile did
@@ -112,16 +113,11 @@ class HostBlocker:
         self._done_count = 0
 
         data_dir = standarddir.data()
-        if data_dir is None:
-            self._local_hosts_file = None
-        else:
-            self._local_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')
+        self._config_hosts_file = os.path.join(config_dir, 'blocked-hosts')
 
         objreg.get('config').changed.connect(self.on_config_changed)
 
@@ -144,7 +140,7 @@ class HostBlocker:
         Return:
             True if a read was attempted, False otherwise
         """
-        if filename is None or not os.path.exists(filename):
+        if not os.path.exists(filename):
             return False
 
         try:
@@ -160,9 +156,6 @@ class HostBlocker:
         """Read hosts from the existing blocked-hosts file."""
         self._blocked_hosts = set()
 
-        if self._local_hosts_file is None:
-            return
-
         self._read_hosts_file(self._config_hosts_file,
                               self._config_blocked_hosts)
 
@@ -173,25 +166,22 @@ class HostBlocker:
             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.")
+                message.info("Run :adblock-update to get adblock lists.")
 
-    @cmdutils.register(instance='host-blocker', win_id='win_id')
-    def adblock_update(self, win_id):
+    @cmdutils.register(instance='host-blocker')
+    def adblock_update(self):
         """Update the adblock block lists.
 
-        This updates ~/.local/share/qutebrowser/blocked-hosts with downloaded
-        host lists and re-reads ~/.config/qutebrowser/blocked-hosts.
+        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._done_count = 0
         urls = config.get('content', 'host-block-lists')
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window='last-focused')
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window='last-focused')
         if urls is None:
             return
         for url in urls:
@@ -199,8 +189,8 @@ class HostBlocker:
                 try:
                     fileobj = open(url.path(), 'rb')
                 except OSError as e:
-                    message.error(win_id, "adblock: Error while reading {}: "
-                                  "{}".format(url.path(), e.strerror))
+                    message.error("adblock: Error while reading {}: {}".format(
+                        url.path(), e.strerror))
                     continue
                 download = FakeDownload(fileobj)
                 self._in_progress.append(download)
@@ -208,7 +198,8 @@ class HostBlocker:
             else:
                 fobj = io.BytesIO()
                 fobj.name = 'adblock: ' + url.host()
-                download = download_manager.get(url, fileobj=fobj,
+                target = downloads.FileObjDownloadTarget(fobj)
+                download = download_manager.get(url, target=target,
                                                 auto_remove=True)
                 self._in_progress.append(download)
                 download.finished.connect(
@@ -229,8 +220,8 @@ class HostBlocker:
             f = get_fileobj(byte_io)
         except (OSError, UnicodeDecodeError, zipfile.BadZipFile,
                 zipfile.LargeZipFile) as e:
-            message.error('current', "adblock: Error while reading {}: {} - "
-                          "{}".format(byte_io.name, e.__class__.__name__, e))
+            message.error("adblock: Error while reading {}: {} - {}".format(
+                byte_io.name, e.__class__.__name__, e))
             return
         for line in f:
             line_count += 1
@@ -258,7 +249,7 @@ class HostBlocker:
                 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(
+            message.error("adblock: {} read errors for {}".format(
                 error_count, byte_io.name))
 
     def on_lists_downloaded(self):
@@ -266,8 +257,8 @@ class HostBlocker:
         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))
+            message.info("adblock: Read {} hosts from {} sources.".format(
+                len(self._blocked_hosts), self._done_count))
 
     @config.change_filter('content', 'host-block-lists')
     def on_config_changed(self):
@@ -276,8 +267,10 @@ class HostBlocker:
         if urls is None:
             try:
                 os.remove(self._local_hosts_file)
-            except OSError:
-                log.misc.exception("Failed to delete 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/browsertab.py

@@ -0,0 +1,749 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Base class for a wrapper over QWebView/QWebEngineView."""
+
+import itertools
+
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, QObject, QSizeF
+from PyQt5.QtGui import QIcon
+from PyQt5.QtWidgets import QWidget, QApplication
+
+from qutebrowser.keyinput import modeman
+from qutebrowser.config import config
+from qutebrowser.utils import utils, objreg, usertypes, log, qtutils
+from qutebrowser.misc import miscwidgets
+from qutebrowser.browser import mouse, hints
+
+
+tab_id_gen = itertools.count(0)
+
+
+def create(win_id, parent=None):
+    """Get a QtWebKit/QtWebEngine tab object.
+
+    Args:
+        win_id: The window ID where the tab will be shown.
+        parent: The Qt parent to set.
+    """
+    # Importing modules here so we don't depend on QtWebEngine without the
+    # argument and to avoid circular imports.
+    mode_manager = modeman.instance(win_id)
+    if objreg.get('args').backend == 'webengine':
+        from qutebrowser.browser.webengine import webenginetab
+        tab_class = webenginetab.WebEngineTab
+    else:
+        from qutebrowser.browser.webkit import webkittab
+        tab_class = webkittab.WebKitTab
+    return tab_class(win_id=win_id, mode_manager=mode_manager, parent=parent)
+
+
+def init(args):
+    """Initialize backend-specific modules."""
+    if args.backend == 'webengine':
+        from qutebrowser.browser.webengine import webenginetab
+        webenginetab.init()
+    else:
+        from qutebrowser.browser.webkit import webkittab
+        webkittab.init()
+
+
+class WebTabError(Exception):
+
+    """Base class for various errors."""
+
+
+class UnsupportedOperationError(WebTabError):
+
+    """Raised when an operation is not supported with the given backend."""
+
+
+class TabData:
+
+    """A simple namespace with a fixed set of attributes.
+
+    Attributes:
+        keep_icon: Whether the (e.g. cloned) icon should not be cleared on page
+                   load.
+        inspector: The QWebInspector used for this webview.
+        viewing_source: Set if we're currently showing a source view.
+        override_target: Override for open_target for fake clicks (like hints).
+                         Only used for QtWebKit.
+    """
+
+    def __init__(self):
+        self.keep_icon = False
+        self.viewing_source = False
+        self.inspector = None
+        self.override_target = None
+
+
+class AbstractPrinting:
+
+    """Attribute of AbstractTab for printing the page."""
+
+    def __init__(self):
+        self._widget = None
+
+    def check_pdf_support(self):
+        raise NotImplementedError
+
+    def check_printer_support(self):
+        raise NotImplementedError
+
+    def to_pdf(self, filename):
+        raise NotImplementedError
+
+    def to_printer(self, printer):
+        raise NotImplementedError
+
+
+class AbstractSearch(QObject):
+
+    """Attribute of AbstractTab for doing searches.
+
+    Attributes:
+        text: The last thing this view was searched for.
+        _flags: The flags of the last search (needs to be set by subclasses).
+        _widget: The underlying WebView widget.
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self._widget = None
+        self.text = None
+
+    def search(self, text, *, ignore_case=False, reverse=False,
+               result_cb=None):
+        """Find the given text on the page.
+
+        Args:
+            text: The text to search for.
+            ignore_case: Search case-insensitively. (True/False/'smart')
+            reverse: Reverse search direction.
+            result_cb: Called with a bool indicating whether a match was found.
+        """
+        raise NotImplementedError
+
+    def clear(self):
+        """Clear the current search."""
+        raise NotImplementedError
+
+    def prev_result(self, *, result_cb=None):
+        """Go to the previous result of the current search.
+
+        Args:
+            result_cb: Called with a bool indicating whether a match was found.
+        """
+        raise NotImplementedError
+
+    def next_result(self, *, result_cb=None):
+        """Go to the next result of the current search.
+
+        Args:
+            result_cb: Called with a bool indicating whether a match was found.
+        """
+        raise NotImplementedError
+
+
+class AbstractZoom(QObject):
+
+    """Attribute of AbstractTab for controlling zoom.
+
+    Attributes:
+        _neighborlist: A NeighborList with the zoom levels.
+        _default_zoom_changed: Whether the zoom was changed from the default.
+    """
+
+    def __init__(self, win_id, parent=None):
+        super().__init__(parent)
+        self._widget = None
+        self._win_id = win_id
+        self._default_zoom_changed = False
+        self._init_neighborlist()
+        objreg.get('config').changed.connect(self._on_config_changed)
+
+        # # FIXME:qtwebengine is this needed?
+        # # For some reason, this signal doesn't get disconnected automatically
+        # # when the WebView is destroyed on older PyQt versions.
+        # # See https://github.com/The-Compiler/qutebrowser/issues/390
+        # self.destroyed.connect(functools.partial(
+        #     cfg.changed.disconnect, self.init_neighborlist))
+
+    @pyqtSlot(str, str)
+    def _on_config_changed(self, section, option):
+        if section == 'ui' and option in ['zoom-levels', 'default-zoom']:
+            if not self._default_zoom_changed:
+                factor = float(config.get('ui', 'default-zoom')) / 100
+                self._set_factor_internal(factor)
+            self._default_zoom_changed = False
+            self._init_neighborlist()
+
+    def _init_neighborlist(self):
+        """Initialize self._neighborlist."""
+        levels = config.get('ui', 'zoom-levels')
+        self._neighborlist = usertypes.NeighborList(
+            levels, mode=usertypes.NeighborList.Modes.edge)
+        self._neighborlist.fuzzyval = config.get('ui', 'default-zoom')
+
+    def offset(self, offset):
+        """Increase/Decrease the zoom level by the given offset.
+
+        Args:
+            offset: The offset in the zoom level list.
+
+        Return:
+            The new zoom percentage.
+        """
+        level = self._neighborlist.getitem(offset)
+        self.set_factor(float(level) / 100, fuzzyval=False)
+        return level
+
+    def _set_factor_internal(self, factor):
+        raise NotImplementedError
+
+    def set_factor(self, factor, *, fuzzyval=True):
+        """Zoom to a given zoom factor.
+
+        Args:
+            factor: The zoom factor as float.
+            fuzzyval: Whether to set the NeighborLists fuzzyval.
+        """
+        if fuzzyval:
+            self._neighborlist.fuzzyval = int(factor * 100)
+        if factor < 0:
+            raise ValueError("Can't zoom to factor {}!".format(factor))
+        self._default_zoom_changed = True
+        self._set_factor_internal(factor)
+
+    def factor(self):
+        raise NotImplementedError
+
+    def set_default(self):
+        default_zoom = config.get('ui', 'default-zoom')
+        self._set_factor_internal(float(default_zoom) / 100)
+
+
+class AbstractCaret(QObject):
+
+    """Attribute of AbstractTab for caret browsing."""
+
+    def __init__(self, win_id, tab, mode_manager, parent=None):
+        super().__init__(parent)
+        self._tab = tab
+        self._win_id = win_id
+        self._widget = None
+        self.selection_enabled = False
+        mode_manager.entered.connect(self._on_mode_entered)
+        mode_manager.left.connect(self._on_mode_left)
+
+    def _on_mode_entered(self, mode):
+        raise NotImplementedError
+
+    def _on_mode_left(self):
+        raise NotImplementedError
+
+    def move_to_next_line(self, count=1):
+        raise NotImplementedError
+
+    def move_to_prev_line(self, count=1):
+        raise NotImplementedError
+
+    def move_to_next_char(self, count=1):
+        raise NotImplementedError
+
+    def move_to_prev_char(self, count=1):
+        raise NotImplementedError
+
+    def move_to_end_of_word(self, count=1):
+        raise NotImplementedError
+
+    def move_to_next_word(self, count=1):
+        raise NotImplementedError
+
+    def move_to_prev_word(self, count=1):
+        raise NotImplementedError
+
+    def move_to_start_of_line(self):
+        raise NotImplementedError
+
+    def move_to_end_of_line(self):
+        raise NotImplementedError
+
+    def move_to_start_of_next_block(self, count=1):
+        raise NotImplementedError
+
+    def move_to_start_of_prev_block(self, count=1):
+        raise NotImplementedError
+
+    def move_to_end_of_next_block(self, count=1):
+        raise NotImplementedError
+
+    def move_to_end_of_prev_block(self, count=1):
+        raise NotImplementedError
+
+    def move_to_start_of_document(self):
+        raise NotImplementedError
+
+    def move_to_end_of_document(self):
+        raise NotImplementedError
+
+    def toggle_selection(self):
+        raise NotImplementedError
+
+    def drop_selection(self):
+        raise NotImplementedError
+
+    def has_selection(self):
+        raise NotImplementedError
+
+    def selection(self, html=False):
+        raise NotImplementedError
+
+    def follow_selected(self, *, tab=False):
+        raise NotImplementedError
+
+
+class AbstractScroller(QObject):
+
+    """Attribute of AbstractTab to manage scroll position."""
+
+    perc_changed = pyqtSignal(int, int)
+
+    def __init__(self, tab, parent=None):
+        super().__init__(parent)
+        self._tab = tab
+        self._widget = None
+        self.perc_changed.connect(self._log_scroll_pos_change)
+
+    @pyqtSlot()
+    def _log_scroll_pos_change(self):
+        log.webview.vdebug("Scroll position changed to {}".format(
+            self.pos_px()))
+
+    def _init_widget(self, widget):
+        self._widget = widget
+
+    def pos_px(self):
+        raise NotImplementedError
+
+    def pos_perc(self):
+        raise NotImplementedError
+
+    def to_perc(self, x=None, y=None):
+        raise NotImplementedError
+
+    def to_point(self, point):
+        raise NotImplementedError
+
+    def delta(self, x=0, y=0):
+        raise NotImplementedError
+
+    def delta_page(self, x=0, y=0):
+        raise NotImplementedError
+
+    def up(self, count=1):
+        raise NotImplementedError
+
+    def down(self, count=1):
+        raise NotImplementedError
+
+    def left(self, count=1):
+        raise NotImplementedError
+
+    def right(self, count=1):
+        raise NotImplementedError
+
+    def top(self):
+        raise NotImplementedError
+
+    def bottom(self):
+        raise NotImplementedError
+
+    def page_up(self, count=1):
+        raise NotImplementedError
+
+    def page_down(self, count=1):
+        raise NotImplementedError
+
+    def at_top(self):
+        raise NotImplementedError
+
+    def at_bottom(self):
+        raise NotImplementedError
+
+
+class AbstractHistory:
+
+    """The history attribute of a AbstractTab."""
+
+    def __init__(self, tab):
+        self._tab = tab
+        self._history = None
+
+    def __len__(self):
+        return len(self._history)
+
+    def __iter__(self):
+        return iter(self._history.items())
+
+    def current_idx(self):
+        raise NotImplementedError
+
+    def back(self):
+        raise NotImplementedError
+
+    def forward(self):
+        raise NotImplementedError
+
+    def can_go_back(self):
+        raise NotImplementedError
+
+    def can_go_forward(self):
+        raise NotImplementedError
+
+    def serialize(self):
+        """Serialize into an opaque format understood by self.deserialize."""
+        raise NotImplementedError
+
+    def deserialize(self, data):
+        """Serialize from a format produced by self.serialize."""
+        raise NotImplementedError
+
+    def load_items(self, items):
+        """Deserialize from a list of WebHistoryItems."""
+        raise NotImplementedError
+
+
+class AbstractElements:
+
+    """Finding and handling of elements on the page."""
+
+    def __init__(self, tab):
+        self._widget = None
+        self._tab = tab
+
+    def find_css(self, selector, callback, *, only_visible=False):
+        """Find all HTML elements matching a given selector async.
+
+        Args:
+            callback: The callback to be called when the search finished.
+            selector: The CSS selector to search for.
+            only_visible: Only show elements which are visible on screen.
+        """
+        raise NotImplementedError
+
+    def find_id(self, elem_id, callback):
+        """Find the HTML element with the given ID async.
+
+        Args:
+            callback: The callback to be called when the search finished.
+            elem_id: The ID to search for.
+        """
+        raise NotImplementedError
+
+    def find_focused(self, callback):
+        """Find the focused element on the page async.
+
+        Args:
+            callback: The callback to be called when the search finished.
+                      Called with a WebEngineElement or None.
+        """
+        raise NotImplementedError
+
+    def find_at_pos(self, pos, callback):
+        """Find the element at the given position async.
+
+        This is also called "hit test" elsewhere.
+
+        Args:
+            pos: The QPoint to get the element for.
+            callback: The callback to be called when the search finished.
+                      Called with a WebEngineElement or None.
+        """
+        raise NotImplementedError
+
+
+class AbstractTab(QWidget):
+
+    """A wrapper over the given widget to hide its API and expose another one.
+
+    We use this to unify QWebView and QWebEngineView.
+
+    Class attributes:
+        WIDGET_CLASS: The class of the main widget recieving events.
+                      Needs to be overridden by subclasses.
+
+    Attributes:
+        history: The AbstractHistory for the current tab.
+        registry: The ObjectRegistry associated with this tab.
+
+        _load_status: loading status of this page
+                      Accessible via load_status() method.
+        _has_ssl_errors: Whether SSL errors happened.
+                         Needs to be set by subclasses.
+
+        for properties, see WebView/WebEngineView docs.
+
+    Signals:
+        See related Qt signals.
+
+        new_tab_requested: Emitted when a new tab should be opened with the
+                           given URL.
+        load_status_changed: The loading status changed
+    """
+
+    window_close_requested = pyqtSignal()
+    link_hovered = pyqtSignal(str)
+    load_started = pyqtSignal()
+    load_progress = pyqtSignal(int)
+    load_finished = pyqtSignal(bool)
+    icon_changed = pyqtSignal(QIcon)
+    title_changed = pyqtSignal(str)
+    load_status_changed = pyqtSignal(str)
+    new_tab_requested = pyqtSignal(QUrl)
+    url_changed = pyqtSignal(QUrl)
+    shutting_down = pyqtSignal()
+    contents_size_changed = pyqtSignal(QSizeF)
+    add_history_item = pyqtSignal(QUrl, QUrl, str)  # url, requested url, title
+
+    WIDGET_CLASS = None
+
+    def __init__(self, win_id, mode_manager, parent=None):
+        self.win_id = win_id
+        self.tab_id = next(tab_id_gen)
+        super().__init__(parent)
+
+        self.registry = objreg.ObjectRegistry()
+        tab_registry = objreg.get('tab-registry', scope='window',
+                                  window=win_id)
+        tab_registry[self.tab_id] = self
+        objreg.register('tab', self, registry=self.registry)
+
+        # self.history = AbstractHistory(self)
+        # self.scroller = AbstractScroller(self, parent=self)
+        # self.caret = AbstractCaret(win_id=win_id, tab=self,
+        #                            mode_manager=mode_manager, parent=self)
+        # self.zoom = AbstractZoom(win_id=win_id)
+        # self.search = AbstractSearch(parent=self)
+        # self.printing = AbstractPrinting()
+        # self.elements = AbstractElements(self)
+
+        self.data = TabData()
+        self._layout = miscwidgets.WrapperLayout(self)
+        self._widget = None
+        self._progress = 0
+        self._has_ssl_errors = False
+        self._mode_manager = mode_manager
+        self._load_status = usertypes.LoadStatus.none
+        self._mouse_event_filter = mouse.MouseEventFilter(
+            self, widget_class=self.WIDGET_CLASS, parent=self)
+        self.backend = None
+
+        # FIXME:qtwebengine  Should this be public api via self.hints?
+        #                    Also, should we get it out of objreg?
+        hintmanager = hints.HintManager(win_id, self.tab_id, parent=self)
+        objreg.register('hintmanager', hintmanager, scope='tab',
+                        window=self.win_id, tab=self.tab_id)
+
+    def _set_widget(self, widget):
+        # pylint: disable=protected-access
+        self._widget = widget
+        self._layout.wrap(self, widget)
+        self.history._history = widget.history()
+        self.scroller._init_widget(widget)
+        self.caret._widget = widget
+        self.zoom._widget = widget
+        self.search._widget = widget
+        self.printing._widget = widget
+        self.elements._widget = widget
+
+        self._install_event_filter()
+        self.zoom.set_default()
+
+    def _install_event_filter(self):
+        raise NotImplementedError
+
+    def _set_load_status(self, val):
+        """Setter for load_status."""
+        if not isinstance(val, usertypes.LoadStatus):
+            raise TypeError("Type {} is no LoadStatus member!".format(val))
+        log.webview.debug("load status for {}: {}".format(repr(self), val))
+        self._load_status = val
+        self.load_status_changed.emit(val.name)
+
+    def _event_target(self):
+        """Return the widget events should be sent to."""
+        raise NotImplementedError
+
+    def send_event(self, evt):
+        """Send the given event to the underlying widget.
+
+        The event will be sent via QApplication.postEvent.
+        Note that a posted event may not be re-used in any way!
+        """
+        # This only gives us some mild protection against re-using events, but
+        # it's certainly better than a segfault.
+        if getattr(evt, 'posted', False):
+            raise AssertionError("Can't re-use an event which was already "
+                                 "posted!")
+        recipient = self._event_target()
+        evt.posted = True
+        QApplication.postEvent(recipient, evt)
+
+    @pyqtSlot(QUrl)
+    def _on_url_changed(self, url):
+        """Update title when URL has changed and no title is available."""
+        if url.isValid() and not self.title():
+            self.title_changed.emit(url.toDisplayString())
+        self.url_changed.emit(url)
+
+    @pyqtSlot()
+    def _on_load_started(self):
+        self._progress = 0
+        self._has_ssl_errors = False
+        self.data.viewing_source = False
+        self._set_load_status(usertypes.LoadStatus.loading)
+        self.load_started.emit()
+
+    def _handle_auto_insert_mode(self, ok):
+        """Handle auto-insert-mode after loading finished."""
+        if not config.get('input', 'auto-insert-mode') or not ok:
+            return
+
+        cur_mode = self._mode_manager.mode
+        if cur_mode == usertypes.KeyMode.insert:
+            return
+
+        def _auto_insert_mode_cb(elem):
+            """Called from JS after finding the focused element."""
+            if elem is None:
+                log.webview.debug("No focused element!")
+                return
+            if elem.is_editable():
+                modeman.enter(self.win_id, usertypes.KeyMode.insert,
+                              'load finished', only_if_normal=True)
+
+        self.elements.find_focused(_auto_insert_mode_cb)
+
+    @pyqtSlot(bool)
+    def _on_load_finished(self, ok):
+        if ok and not self._has_ssl_errors:
+            if self.url().scheme() == 'https':
+                self._set_load_status(usertypes.LoadStatus.success_https)
+            else:
+                self._set_load_status(usertypes.LoadStatus.success)
+
+        elif ok:
+            self._set_load_status(usertypes.LoadStatus.warn)
+        else:
+            self._set_load_status(usertypes.LoadStatus.error)
+        self.load_finished.emit(ok)
+        if not self.title():
+            self.title_changed.emit(self.url().toDisplayString())
+        self._handle_auto_insert_mode(ok)
+
+    @pyqtSlot()
+    def _on_history_trigger(self):
+        """Emit add_history_item when triggered by backend-specific signal."""
+        raise NotImplementedError
+
+    @pyqtSlot(int)
+    def _on_load_progress(self, perc):
+        self._progress = perc
+        self.load_progress.emit(perc)
+
+    @pyqtSlot()
+    def _on_ssl_errors(self):
+        self._has_ssl_errors = True
+
+    def url(self, requested=False):
+        raise NotImplementedError
+
+    def progress(self):
+        return self._progress
+
+    def load_status(self):
+        return self._load_status
+
+    def _openurl_prepare(self, url):
+        qtutils.ensure_valid(url)
+        self.title_changed.emit(url.toDisplayString())
+
+    def openurl(self, url):
+        raise NotImplementedError
+
+    def reload(self, *, force=False):
+        raise NotImplementedError
+
+    def stop(self):
+        raise NotImplementedError
+
+    def clear_ssl_errors(self):
+        raise NotImplementedError
+
+    def dump_async(self, callback, *, plain=False):
+        """Dump the current page to a file ascync.
+
+        The given callback will be called with the result when dumping is
+        complete.
+        """
+        raise NotImplementedError
+
+    def run_js_async(self, code, callback=None, *, world=None):
+        """Run javascript async.
+
+        The given callback will be called with the result when running JS is
+        complete.
+
+        Args:
+            code: The javascript code to run.
+            callback: The callback to call with the result, or None.
+            world: A world ID (int or usertypes.JsWorld member) to run the JS
+                   in the main world or in another isolated world.
+        """
+        raise NotImplementedError
+
+    def shutdown(self):
+        raise NotImplementedError
+
+    def title(self):
+        raise NotImplementedError
+
+    def icon(self):
+        raise NotImplementedError
+
+    def set_html(self, html, base_url):
+        raise NotImplementedError
+
+    def networkaccessmanager(self):
+        """Get the QNetworkAccessManager for this tab.
+
+        This is only implemented for QtWebKit.
+        For QtWebEngine, always returns None.
+        """
+        raise NotImplementedError
+
+    def __repr__(self):
+        try:
+            url = utils.elide(self.url().toDisplayString(QUrl.EncodeUnicode),
+                              100)
+        except AttributeError:
+            url = '<AttributeError>'
+        return utils.get_repr(self, tab_id=self.tab_id, url=url)

qutebrowser/browser/downloadview.py

@@ -83,7 +83,7 @@ class DownloadView(QListView):
         self.setFlow(QListView.LeftToRight)
         self.setSpacing(1)
         self._menu = None
-        model = objreg.get('download-manager', scope='window', window=win_id)
+        model = objreg.get('download-model', scope='window', window=win_id)
         model.rowsInserted.connect(functools.partial(update_geometry, self))
         model.rowsRemoved.connect(functools.partial(update_geometry, self))
         model.dataChanged.connect(functools.partial(update_geometry, self))
@@ -113,7 +113,7 @@ class DownloadView(QListView):
         item = self.model().data(index, downloads.ModelRole.item)
         if item.done and item.successful:
             item.open_file()
-            self.model().remove_item(item)
+            item.remove()
 
     def _get_menu_actions(self, item):
         """Get the available context menu actions for a given DownloadItem.
@@ -135,8 +135,7 @@ class DownloadView(QListView):
                 actions.append(("Open", item.open_file))
             else:
                 actions.append(("Retry", item.retry))
-            actions.append(("Remove",
-                            functools.partial(model.remove_item, item)))
+            actions.append(("Remove", item.remove))
         else:
             actions.append(("Cancel", item.cancel))
         if model.can_clear():

qutebrowser/browser/history.py

@@ -22,45 +22,111 @@
 import time
 import collections
 
-from PyQt5.QtCore import pyqtSignal, QUrl
-from PyQt5.QtWebKit import QWebHistoryInterface
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, QObject
 
-from qutebrowser.utils import utils, objreg, standarddir, log
+from qutebrowser.commands import cmdutils
+from qutebrowser.utils import (utils, objreg, standarddir, log, qtutils,
+                               usertypes)
 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, 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()))
+
+        # https://github.com/The-Compiler/qutebrowser/issues/670
+        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 WebHistory(QObject):
 
-    """A QWebHistoryInterface which supports being written to disk.
+    """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.
         _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.
@@ -68,23 +134,27 @@ 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._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
@@ -94,14 +164,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."""
@@ -110,52 +177,45 @@ class WebHistory(QWebHistoryInterface):
             return
         self._initial_read_started = True
 
-        if standarddir.data() is None:
-            self._initial_read_done = True
-            self.async_read_done.emit()
-            return
-
         with self._lineparser.open():
             for line in self._lineparser:
                 yield
-                data = line.rstrip().split(maxsplit=1)
-                if not data:
-                    # empty line
+
+                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."""
@@ -169,36 +229,59 @@ class WebHistory(QWebHistoryInterface):
         self._lineparser.save()
         self._saved_count = len(self._new_history)
 
-    def addHistoryEntry(self, url_string):
-        """Called by WebKit when an URL should be added to the history.
+    @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()
+
+    @pyqtSlot(QUrl, QUrl, str)
+    def add_from_tab(self, url, requested_url, title):
+        """Add a new history entry as slot, called from a BrowserTab."""
+        no_formatting = QUrl.UrlFormattingOption(0)
+        if (requested_url.isValid() and
+                not requested_url.matches(url, no_formatting)):
+            # If the url of the page is different than the url of the link
+            # originally clicked, save them both.
+            self.add_url(requested_url, title, redirect=True)
+        self.add_url(url, title)
+
+    def add_url(self, url, title="", *, redirect=False, atime=None):
+        """Called via add_from_tab when a URL should be added to the history.
 
         Args:
-            url_string: An url as string to add to the history.
+            url: A 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 not url.isValid():
+            log.misc.warning("Ignoring invalid URL being added to history")
+            return
+
+        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.
@@ -206,6 +289,11 @@ 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)
+
+    used_backend = usertypes.arg2backend[objreg.get('args').backend]
+    if used_backend == usertypes.Backend.QtWebKit:
+        from qutebrowser.browser.webkit import webkithistory
+        webkithistory.init(history)

qutebrowser/browser/inspector.py

@@ -17,31 +17,53 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Customized QWebInspector."""
+"""Base class for a QtWebKit/QtWebEngine web inspector."""
 
 import base64
 import binascii
 
-from PyQt5.QtWebKitWidgets import QWebInspector
+from PyQt5.QtWidgets import QWidget
 
 from qutebrowser.utils import log, objreg
+from qutebrowser.misc import miscwidgets
 
 
-class WebInspector(QWebInspector):
+def create(parent=None):
+    """Get a WebKitInspector/WebEngineInspector.
+
+    Args:
+        parent: The Qt parent to set.
+    """
+    # Importing modules here so we don't depend on QtWebEngine without the
+    # argument and to avoid circular imports.
+    if objreg.get('args').backend == 'webengine':
+        from qutebrowser.browser.webengine import webengineinspector
+        return webengineinspector.WebEngineInspector(parent)
+    else:
+        from qutebrowser.browser.webkit import webkitinspector
+        return webkitinspector.WebKitInspector(parent)
+
+
+class WebInspectorError(Exception):
+
+    """Raised when the inspector could not be initialized."""
+
+    pass
+
+
+class AbstractWebInspector(QWidget):
 
     """A customized WebInspector which stores its geometry."""
 
     def __init__(self, parent=None):
         super().__init__(parent)
+        self._widget = None
+        self._layout = miscwidgets.WrapperLayout(self)
         self._load_state_geometry()
 
-    def closeEvent(self, e):
-        """Save the geometry when closed."""
-        state_config = objreg.get('state-config')
-        data = bytes(self.saveGeometry())
-        geom = base64.b64encode(data).decode('ASCII')
-        state_config['geometry']['inspector'] = geom
-        super().closeEvent(e)
+    def _set_widget(self, widget):
+        self._widget = widget
+        self._layout.wrap(self, widget)
 
     def _load_state_geometry(self):
         """Load the geometry from the state file."""
@@ -59,3 +81,21 @@ class WebInspector(QWebInspector):
             ok = self.restoreGeometry(geom)
             if not ok:
                 log.init.warning("Error while loading geometry.")
+
+    def closeEvent(self, e):
+        """Save the geometry when closed."""
+        state_config = objreg.get('state-config')
+        data = bytes(self.saveGeometry())
+        geom = base64.b64encode(data).decode('ASCII')
+        state_config['geometry']['inspector'] = geom
+        super().closeEvent(e)
+
+    def inspect(self, page):
+        """Inspect the given QWeb(Engine)Page."""
+        raise NotImplementedError
+
+    def toggle(self, page):
+        if self._widget.isVisible():
+            self.hide()
+        else:
+            self.inspect(page)

qutebrowser/browser/mouse.py

@@ -0,0 +1,209 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Mouse handling for a browser tab."""
+
+
+from qutebrowser.config import config
+from qutebrowser.utils import message, log, usertypes
+from qutebrowser.keyinput import modeman
+
+
+from PyQt5.QtCore import QObject, QEvent, Qt, QTimer
+
+
+class ChildEventFilter(QObject):
+
+    """An event filter re-adding MouseEventFilter on ChildEvent.
+
+    This is needed because QtWebEngine likes to randomly change its
+    focusProxy...
+
+    FIXME:qtwebengine Add a test for this happening
+
+    Attributes:
+        _filter: The event filter to install.
+        _widget: The widget expected to send out childEvents.
+    """
+
+    def __init__(self, eventfilter, widget, parent=None):
+        super().__init__(parent)
+        self._filter = eventfilter
+        assert widget is not None
+        self._widget = widget
+
+    def eventFilter(self, obj, event):
+        """Act on ChildAdded events."""
+        if event.type() == QEvent.ChildAdded:
+            child = event.child()
+            log.mouse.debug("{} got new child {}, installing filter".format(
+                obj, child))
+            assert obj is self._widget
+            child.installEventFilter(self._filter)
+        return False
+
+
+class MouseEventFilter(QObject):
+
+    """Handle mouse events on a tab.
+
+    Attributes:
+        _widget_class: The class of the main widget getting the events.
+                       All other events are ignored.
+        _tab: The browsertab object this filter is installed on.
+        _handlers: A dict of handler functions for the handled events.
+        _ignore_wheel_event: Whether to ignore the next wheelEvent.
+        _check_insertmode_on_release: Whether an insertmode check should be
+                                      done when the mouse is released.
+    """
+
+    def __init__(self, tab, *, widget_class, parent=None):
+        super().__init__(parent)
+        self._widget_class = widget_class
+        self._tab = tab
+        self._handlers = {
+            QEvent.MouseButtonPress: self._handle_mouse_press,
+            QEvent.MouseButtonRelease: self._handle_mouse_release,
+            QEvent.Wheel: self._handle_wheel,
+            QEvent.ContextMenu: self._handle_context_menu,
+        }
+        self._ignore_wheel_event = False
+        self._check_insertmode_on_release = False
+
+    def _handle_mouse_press(self, e):
+        """Handle pressing of a mouse button."""
+        is_rocker_gesture = (config.get('input', 'rocker-gestures') and
+                             e.buttons() == Qt.LeftButton | Qt.RightButton)
+
+        if e.button() in [Qt.XButton1, Qt.XButton2] or is_rocker_gesture:
+            self._mousepress_backforward(e)
+            return True
+
+        self._ignore_wheel_event = True
+        self._tab.elements.find_at_pos(e.pos(), self._mousepress_insertmode_cb)
+
+        return False
+
+    def _handle_mouse_release(self, _e):
+        """Handle releasing of a mouse button."""
+        # We want to make sure we check the focus element after the WebView is
+        # updated completely.
+        QTimer.singleShot(0, self._mouserelease_insertmode)
+        return False
+
+    def _handle_wheel(self, e):
+        """Zoom on Ctrl-Mousewheel.
+
+        Args:
+            e: The QWheelEvent.
+        """
+        if self._ignore_wheel_event:
+            # See https://github.com/The-Compiler/qutebrowser/issues/395
+            self._ignore_wheel_event = False
+            return True
+
+        if e.modifiers() & Qt.ControlModifier:
+            divider = config.get('input', 'mouse-zoom-divider')
+            factor = self._tab.zoom.factor() + (e.angleDelta().y() / divider)
+            if factor < 0:
+                return False
+            perc = int(100 * factor)
+            message.info("Zoom level: {}%".format(perc))
+            self._tab.zoom.set_factor(factor)
+
+        return False
+
+    def _handle_context_menu(self, _e):
+        """Suppress context menus if rocker gestures are turned on."""
+        return config.get('input', 'rocker-gestures')
+
+    def _mousepress_insertmode_cb(self, elem):
+        """Check if the clicked element is editable."""
+        if elem is None:
+            # Something didn't work out, let's find the focus element after
+            # a mouse release.
+            log.mouse.debug("Got None element, scheduling check on "
+                            "mouse release")
+            self._check_insertmode_on_release = True
+            return
+
+        if elem.is_editable():
+            log.mouse.debug("Clicked editable element!")
+            modeman.enter(self._tab.win_id, usertypes.KeyMode.insert,
+                          'click', only_if_normal=True)
+        else:
+            log.mouse.debug("Clicked non-editable element!")
+            if config.get('input', 'auto-leave-insert-mode'):
+                modeman.leave(self._tab.win_id, usertypes.KeyMode.insert,
+                              'click', maybe=True)
+
+    def _mouserelease_insertmode(self):
+        """If we have an insertmode check scheduled, handle it."""
+        if not self._check_insertmode_on_release:
+            return
+        self._check_insertmode_on_release = False
+
+        def mouserelease_insertmode_cb(elem):
+            """Callback which gets called from JS."""
+            if elem is None:
+                log.mouse.debug("Element vanished!")
+                return
+
+            if elem.is_editable():
+                log.mouse.debug("Clicked editable element (delayed)!")
+                modeman.enter(self._tab.win_id, usertypes.KeyMode.insert,
+                              'click-delayed', only_if_normal=True)
+            else:
+                log.mouse.debug("Clicked non-editable element (delayed)!")
+                if config.get('input', 'auto-leave-insert-mode'):
+                    modeman.leave(self._tab.win_id, usertypes.KeyMode.insert,
+                                  'click-delayed', maybe=True)
+
+        self._tab.elements.find_focused(mouserelease_insertmode_cb)
+
+    def _mousepress_backforward(self, e):
+        """Handle back/forward mouse button presses.
+
+        Args:
+            e: The QMouseEvent.
+        """
+        if e.button() in [Qt.XButton1, Qt.LeftButton]:
+            # Back button on mice which have it, or rocker gesture
+            if self._tab.history.can_go_back():
+                self._tab.history.back()
+            else:
+                message.error("At beginning of history.")
+        elif e.button() in [Qt.XButton2, Qt.RightButton]:
+            # Forward button on mice which have it, or rocker gesture
+            if self._tab.history.can_go_forward():
+                self._tab.history.forward()
+            else:
+                message.error("At end of history.")
+
+    def eventFilter(self, obj, event):
+        """Filter events going to a QWeb(Engine)View."""
+        evtype = event.type()
+        if evtype not in self._handlers:
+            return False
+        if not isinstance(obj, self._widget_class):
+            log.mouse.debug("Ignoring {} to {} which is not an instance of "
+                            "{}".format(event.__class__.__name__, obj,
+                                        self._widget_class))
+            return False
+        return self._handlers[evtype](event)

qutebrowser/browser/navigate.py

@@ -0,0 +1,147 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Implementation of :navigate."""
+
+import posixpath
+
+from qutebrowser.browser import webelem
+from qutebrowser.config import config
+from qutebrowser.utils import objreg, urlutils, log, message, qtutils
+
+
+class Error(Exception):
+
+    """Raised when the navigation can't be done."""
+
+
+def incdec(url, count, inc_or_dec):
+    """Helper method for :navigate when `where' is increment/decrement.
+
+    Args:
+        url: The current url.
+        count: How much to increment or decrement by.
+        inc_or_dec: Either 'increment' or 'decrement'.
+        tab: Whether to open the link in a new tab.
+        background: Open the link in a new background tab.
+        window: Open the link in a new window.
+    """
+    segments = set(config.get('general', 'url-incdec-segments'))
+    try:
+        new_url = urlutils.incdec_number(url, inc_or_dec, count,
+                                         segments=segments)
+    except urlutils.IncDecError as error:
+        raise Error(error.msg)
+    return new_url
+
+
+def path_up(url, count):
+    """Helper method for :navigate when `where' is up.
+
+    Args:
+        url: The current url.
+        count: The number of levels to go up in the url.
+    """
+    path = url.path()
+    if not path or path == '/':
+        raise Error("Can't go up!")
+    for _i in range(0, min(count, path.count('/'))):
+        path = posixpath.join(path, posixpath.pardir)
+    url.setPath(path)
+    return url
+
+
+def _find_prevnext(prev, elems):
+    """Find a prev/next element in the given list of elements."""
+    # First check for <link rel="prev(ious)|next">
+    rel_values = ('prev', 'previous') if prev else ('next')
+    for e in elems:
+        if e.tag_name() != 'link' or 'rel' not in e:
+            continue
+        if e['rel'] in rel_values:
+            log.hints.debug("Found {!r} with rel={}".format(e, e['rel']))
+            return e
+
+    # Then check for regular links/buttons.
+    filterfunc = webelem.FILTERS[webelem.Group.prevnext]
+    elems = [e for e in elems if e.tag_name() != 'link' and filterfunc(e)]
+    option = 'prev-regexes' if prev else 'next-regexes'
+    if not elems:
+        return None
+    for regex in config.get('hints', option):
+        log.hints.vdebug("== Checking regex '{}'.".format(regex.pattern))
+        for e in elems:
+            text = str(e)
+            if not text:
+                continue
+            if regex.search(text):
+                log.hints.debug("Regex '{}' matched on '{}'.".format(
+                    regex.pattern, text))
+                return e
+            else:
+                log.hints.vdebug("No match on '{}'!".format(text))
+    return None
+
+
+def prevnext(*, browsertab, win_id, baseurl, prev=False,
+             tab=False, background=False, window=False):
+    """Click a "previous"/"next" element on the page.
+
+    Args:
+        browsertab: The WebKitTab/WebEngineTab of the page.
+        baseurl: The base URL of the current tab.
+        prev: True to open a "previous" link, False to open a "next" link.
+        tab: True to open in a new tab, False for the current tab.
+        background: True to open in a background tab.
+        window: True to open in a new window, False for the current one.
+    """
+    def _prevnext_cb(elems):
+        if elems is None:
+            message.error("There was an error while getting hint elements")
+            return
+
+        elem = _find_prevnext(prev, elems)
+        word = 'prev' if prev else 'forward'
+
+        if elem is None:
+            message.error("No {} links found!".format(word))
+            return
+        url = elem.resolve_url(baseurl)
+        if url is None:
+            message.error("No {} links found!".format(word))
+            return
+        qtutils.ensure_valid(url)
+
+        if window:
+            from qutebrowser.mainwindow import mainwindow
+            new_window = mainwindow.MainWindow()
+            new_window.show()
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                        window=new_window.win_id)
+            tabbed_browser.tabopen(url, background=False)
+        elif tab:
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                        window=win_id)
+            tabbed_browser.tabopen(url, background=background)
+        else:
+            browsertab.openurl(url)
+
+    selector = ', '.join([webelem.SELECTORS[webelem.Group.links],
+                          webelem.SELECTORS[webelem.Group.prevnext]])
+    browsertab.elements.find_css(selector, _prevnext_cb)

qutebrowser/browser/network/pac.py

@@ -0,0 +1,305 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Evaluation of PAC scripts."""
+
+import sys
+import functools
+
+from PyQt5.QtCore import (QObject, pyqtSignal, pyqtSlot)
+from PyQt5.QtNetwork import (QNetworkProxy, QNetworkRequest, QHostInfo,
+                             QNetworkReply, QNetworkAccessManager,
+                             QHostAddress)
+from PyQt5.QtQml import QJSEngine, QJSValue
+
+from qutebrowser.utils import log, utils, qtutils
+
+
+class ParseProxyError(Exception):
+
+    """Error while parsing PAC result string."""
+
+    pass
+
+
+class EvalProxyError(Exception):
+
+    """Error while evaluating PAC script."""
+
+    pass
+
+
+def _js_slot(*args):
+    """Wrap a methods as a JavaScript function.
+
+    Register a PACContext method as a JavaScript function, and catch
+    exceptions returning them as JavaScript Error objects.
+
+    Args:
+        args: Types of method arguments.
+
+    Return: Wrapped method.
+    """
+    def _decorator(method):
+        @functools.wraps(method)
+        def new_method(self, *args, **kwargs):
+            try:
+                return method(self, *args, **kwargs)
+            except:
+                e = str(sys.exc_info()[0])
+                log.network.exception("PAC evaluation error")
+                # pylint: disable=protected-access
+                return self._error_con.callAsConstructor([e])
+                # pylint: enable=protected-access
+        return pyqtSlot(*args, result=QJSValue)(new_method)
+    return _decorator
+
+
+class _PACContext(QObject):
+
+    """Implementation of PAC API functions that require native calls.
+
+    See https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Necko/Proxy_Auto-Configuration_(PAC)_file
+    """
+
+    JS_DEFINITIONS = """
+        function dnsResolve(host) {
+            return PAC.dnsResolve(host);
+        }
+
+        function myIpAddress() {
+            return PAC.myIpAddress();
+        }
+    """
+
+    def __init__(self, engine):
+        """Create a new PAC API implementation instance.
+
+        Args:
+            engine: QJSEngine which is used for running PAC.
+        """
+        super().__init__(parent=engine)
+        self._engine = engine
+        self._error_con = engine.globalObject().property("Error")
+
+    @_js_slot(str)
+    def dnsResolve(self, host):
+        """Resolve a DNS hostname.
+
+        Resolves the given DNS hostname into an IP address, and returns it
+        in the dot-separated format as a string.
+
+        Args:
+            host: hostname to resolve.
+        """
+        ips = QHostInfo.fromName(host)
+        if ips.error() != QHostInfo.NoError or not ips.addresses():
+            err_f = "Failed to resolve host during PAC evaluation: {}"
+            log.network.info(err_f.format(host))
+            return QJSValue(QJSValue.NullValue)
+        else:
+            return ips.addresses()[0].toString()
+
+    @_js_slot()
+    def myIpAddress(self):
+        """Get host IP address.
+
+        Return the server IP address of the current machine, as a string in
+        the dot-separated integer format.
+        """
+        return QHostAddress(QHostAddress.LocalHost).toString()
+
+
+class PACResolver(object):
+
+    """Evaluate PAC script files and resolve proxies."""
+
+    @staticmethod
+    def _parse_proxy_host(host_str):
+        host, _colon, port_str = host_str.partition(':')
+        try:
+            port = int(port_str)
+        except ValueError:
+            raise ParseProxyError("Invalid port number")
+        return (host, port)
+
+    @staticmethod
+    def _parse_proxy_entry(proxy_str):
+        """Parse one proxy string entry, as described in PAC specification."""
+        config = [c.strip() for c in proxy_str.split(' ') if c]
+        if not config:
+            raise ParseProxyError("Empty proxy entry")
+        elif config[0] == "DIRECT":
+            if len(config) != 1:
+                raise ParseProxyError("Invalid number of parameters for " +
+                                      "DIRECT")
+            return QNetworkProxy(QNetworkProxy.NoProxy)
+        elif config[0] == "PROXY":
+            if len(config) != 2:
+                raise ParseProxyError("Invalid number of parameters for PROXY")
+            host, port = PACResolver._parse_proxy_host(config[1])
+            return QNetworkProxy(QNetworkProxy.HttpProxy, host, port)
+        elif config[0] == "SOCKS":
+            if len(config) != 2:
+                raise ParseProxyError("Invalid number of parameters for SOCKS")
+            host, port = PACResolver._parse_proxy_host(config[1])
+            return QNetworkProxy(QNetworkProxy.Socks5Proxy, host, port)
+        else:
+            err = "Unknown proxy type: {}"
+            raise ParseProxyError(err.format(config[0]))
+
+    @staticmethod
+    def _parse_proxy_string(proxy_str):
+        proxies = proxy_str.split(';')
+        return [PACResolver._parse_proxy_entry(x) for x in proxies]
+
+    def _evaluate(self, js_code, js_file):
+        ret = self._engine.evaluate(js_code, js_file)
+        if ret.isError():
+            err = "JavaScript error while evaluating PAC file: {}"
+            raise EvalProxyError(err.format(ret.toString()))
+
+    def __init__(self, pac_str):
+        """Create a PAC resolver.
+
+        Args:
+            pac_str: JavaScript code containing PAC resolver.
+        """
+        self._engine = QJSEngine()
+
+        self._ctx = _PACContext(self._engine)
+        self._engine.globalObject().setProperty(
+            "PAC", self._engine.newQObject(self._ctx))
+        self._evaluate(_PACContext.JS_DEFINITIONS, "pac_js_definitions")
+        self._evaluate(utils.read_file("javascript/pac_utils.js"), "pac_utils")
+        proxy_config = self._engine.newObject()
+        proxy_config.setProperty("bindings", self._engine.newObject())
+        self._engine.globalObject().setProperty("ProxyConfig", proxy_config)
+
+        self._evaluate(pac_str, "pac")
+        global_js_object = self._engine.globalObject()
+        self._resolver = global_js_object.property("FindProxyForURL")
+        if not self._resolver.isCallable():
+            err = "Cannot resolve FindProxyForURL function, got '{}' instead"
+            raise EvalProxyError(err.format(self._resolver.toString()))
+
+    def resolve(self, query):
+        """Resolve a proxy via PAC.
+
+        Args:
+            query: QNetworkProxyQuery.
+
+        Return:
+            A list of QNetworkProxy objects in order of preference.
+        """
+        result = self._resolver.call([query.url().toString(),
+                                      query.peerHostName()])
+        result_str = result.toString()
+        if not result.isString():
+            err = "Got strange value from FindProxyForURL: '{}'"
+            raise EvalProxyError(err.format(result_str))
+        return self._parse_proxy_string(result_str)
+
+
+class PACFetcher(QObject):
+
+    """Asynchronous fetcher of PAC files."""
+
+    finished = pyqtSignal()
+
+    def __init__(self, url, parent=None):
+        """Resolve a PAC proxy from URL.
+
+        Args:
+            url: QUrl of a PAC proxy.
+        """
+        super().__init__(parent)
+
+        pac_prefix = "pac+"
+
+        assert url.scheme().startswith(pac_prefix)
+        url.setScheme(url.scheme()[len(pac_prefix):])
+
+        self._manager = QNetworkAccessManager()
+        self._manager.setProxy(QNetworkProxy(QNetworkProxy.NoProxy))
+        self._reply = self._manager.get(QNetworkRequest(url))
+        self._reply.finished.connect(self._finish)
+        self._pac = None
+        self._error_message = None
+
+    @pyqtSlot()
+    def _finish(self):
+        if self._reply.error() != QNetworkReply.NoError:
+            error = "Can't fetch PAC file from URL, error code {}: {}"
+            self._error_message = error.format(
+                self._reply.error(), self._reply.errorString())
+            log.network.error(self._error_message)
+        else:
+            try:
+                pacscript = bytes(self._reply.readAll()).decode("utf-8")
+            except UnicodeError as e:
+                error = "Invalid encoding of a PAC file: {}"
+                self._error_message = error.format(e)
+                log.network.exception(self._error_message)
+            try:
+                self._pac = PACResolver(pacscript)
+                log.network.debug("Successfully evaluated PAC file.")
+            except EvalProxyError as e:
+                error = "Error in PAC evaluation: {}"
+                self._error_message = error.format(e)
+                log.network.exception(self._error_message)
+        self._manager = None
+        self._reply = None
+        self.finished.emit()
+
+    def _wait(self):
+        """Wait until a reply from the remote server is received."""
+        if self._manager is not None:
+            loop = qtutils.EventLoop()
+            self.finished.connect(loop.quit)
+            loop.exec_()
+
+    def fetch_error(self):
+        """Check if PAC script is successfully fetched.
+
+        Return None iff PAC script is downloaded and evaluated successfully,
+        error string otherwise.
+        """
+        self._wait()
+        return self._error_message
+
+    def resolve(self, query):
+        """Resolve a query via PAC.
+
+        Args: QNetworkProxyQuery.
+
+        Return a list of QNetworkProxy objects in order of preference.
+        """
+        self._wait()
+        try:
+            return self._pac.resolve(query)
+        except (EvalProxyError, ParseProxyError) as e:
+            log.network.exception("Error in PAC resolution: {}.".format(e))
+            # .invalid is guaranteed to be inaccessible in RFC 6761.
+            # Port 9 is for DISCARD protocol -- DISCARD servers act like
+            # /dev/null.
+            # Later NetworkManager.createRequest will detect this and display
+            # an error message.
+            error_host = "pac-resolve-error.qutebrowser.invalid"
+            return QNetworkProxy(QNetworkProxy.HttpProxy, error_host, 9)