release 0.4.1

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

.build.yml

@@ -2,6 +2,11 @@ image: archlinux
 packages:
   - rust
   - libpulse
+  - alsa-lib
+  - fontconfig
+  - libxkbcommon
+sources:
+  - https://git.sr.ht/~kennylevinsen/wldash
 tasks:
   - rustfmt-check: |
       cd wldash

.gitea/workflows/release.yml

@@ -0,0 +1,114 @@
+name: Release
+
+# A `v*` tag builds the package on each architecture's own runner
+# (x86_64 on ergo's bare runner, aarch64 on klokka's) and uploads it
+# to the [uhhm] Arch registry, like uhhm/gdo and bl/djdeck. Hosts then
+# `pacman -S wldash`. The tag has to agree with PKGBUILD's pkgver and
+# Cargo.toml's version, and CHANGELOG.md has to have the section; a
+# release with the tag's notes is created from the x86_64 job.
+
+on:
+  push:
+    tags: ["v*"]
+
+jobs:
+  package:
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+            runs-on: bare
+            # The bare runner's shared toolchain and caches, with the
+            # writable cargo home uhhm/iris and uhhm/gdo use.
+            cargo_home: /var/local/cargo-target/iris-cargo-home
+            rustc_wrapper: /usr/bin/sccache
+            rustup_home: /var/local/rustup
+            target_dir: /var/local/cargo-target
+          - arch: aarch64
+            runs-on: aarch64
+            # klokka's host runner: rustup's stable (step below), defaults everywhere.
+            cargo_home: ""
+            rustc_wrapper: ""
+            rustup_home: ""
+            target_dir: ""
+    runs-on: ${{ matrix.runs-on }}
+    env:
+      CARGO_HOME: ${{ matrix.cargo_home }}
+      RUSTC_WRAPPER: ${{ matrix.rustc_wrapper }}
+      RUSTUP_HOME: ${{ matrix.rustup_home }}
+      CARGO_TARGET_DIR: ${{ matrix.target_dir }}
+      PATH: /var/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/bin
+      SCCACHE_DIR: /var/local/sccache
+      SCCACHE_SERVER_PORT: "4228"
+    steps:
+      # v4 built-in checkout: native Go, needs no Node (the aarch64 host runner
+      # has none) and keeps the token out of a fetch URL.
+      - name: Checkout
+        uses: builtin:checkout
+
+      # klokka's runner has rustup but no default toolchain, so its cargo
+      # proxy refuses to run without this.
+      - name: Install Rust stable (aarch64)
+        if: matrix.arch == 'aarch64'
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Check tag matches pkgver and Cargo.toml
+        run: |
+          want="${GITHUB_REF_NAME#v}"
+          have=$(sed -n 's/^pkgver=//p' PKGBUILD)
+          [ "$want" = "$have" ] || { echo "tag $GITHUB_REF_NAME != pkgver $have" >&2; exit 1; }
+          cargo_ver=$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)
+          [ "$want" = "$cargo_ver" ] || { echo "tag $GITHUB_REF_NAME != Cargo.toml version $cargo_ver" >&2; exit 1; }
+          notes=$(awk -v v="$want" '/^## /{p = ($2 == v)} p' CHANGELOG.md | tail -n +2)
+          [ -n "$(printf "%s" "$notes" | tr -d "[:space:]")" ] || { echo "CHANGELOG.md has no section for $GITHUB_REF_NAME" >&2; exit 1; }
+
+      # Bare runners are never mutated by CI: wldash's system libraries
+      # (dbus, libpulse, libxkbcommon, fontconfig, wayland) must already be
+      # installed on the host. Fail loud if one is missing.
+      - name: Check system build deps
+        run: |
+          missing=""
+          for lib in dbus-1 libpulse xkbcommon fontconfig wayland-client; do
+            pkg-config --exists "$lib" || missing="$missing $lib"
+          done
+          [ -z "$missing" ] || { echo "::error::bare runner missing:$missing — install once on the host" >&2; exit 1; }
+
+      # -d: cargo is the shared toolchain, not a pacman package the
+      # runner could verify. Builds and tests from the checkout. Empty
+      # env values above are unset here so cargo's defaults apply.
+      - name: Build package
+        run: |
+          for v in CARGO_HOME RUSTC_WRAPPER RUSTUP_HOME CARGO_TARGET_DIR; do
+            eval "[ -n \"\$$v\" ]" || unset "$v"
+          done
+          makepkg -f -d --noconfirm
+
+      # REGISTRY_TOKEN is a write:package token for bl, a secret on this
+      # repo. The registry namespace is always bl: pacman.conf's [uhhm]
+      # points at /api/packages/bl/arch/uhhm. Without the secret the build
+      # still runs so the tag is verified; re-run the job once it is set.
+      - name: Publish to the Arch package registry
+        run: |
+          set -euo pipefail
+          if [ -z "${{ secrets.REGISTRY_TOKEN }}" ]; then
+            echo "::warning::REGISTRY_TOKEN not set — skipping Arch registry publish"
+            exit 0
+          fi
+          for pkg in $(makepkg --packagelist); do
+            echo "==> $pkg"
+            curl --fail-with-body --user "bl:${{ secrets.REGISTRY_TOKEN }}" \
+              --upload-file "$pkg" \
+              "${{ gitea.server_url }}/api/packages/bl/arch/uhhm"
+          done
+
+      - name: Release notes
+        if: matrix.arch == 'x86_64'
+        run: |
+          set -euo pipefail
+          tag="${{ github.ref_name }}"
+          api="${{ github.server_url }}/api/v1/repos/${{ github.repository }}"
+          auth="Authorization: token ${{ secrets.GITHUB_TOKEN }}"
+          notes=$(awk -v v="${tag#v}" '/^## /{p = ($2 == v)} p' CHANGELOG.md | tail -n +2)
+          body=$(jq -n --arg tag "$tag" --arg notes "$notes" '{tag_name: $tag, name: $tag, body: $notes}')
+          curl -sf -X POST -H "$auth" -H 'Content-Type: application/json' -d "$body" "$api/releases" > /dev/null \
+            || echo "release $tag exists"

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+liberapay: kennylevinsen

.gitignore

@@ -1,2 +1 @@
 /target
-**/*.rs.bk

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+## 0.4.1 (2026-10-03)
+
+- No more desktop-file cache: wldash scanned `~/.cache/wldash/desktop.json` (on NFS for shared homes, and stale after every package install) and needed a manual `--desktop-refresh`. Desktop files are now scanned on a background thread at every start, a few milliseconds over local `/usr/share`. `--desktop-refresh` is a no-op kept for key bindings; `simd-json` is gone.
+- Calculator history and the Escape-saved prompt moved from `$XDG_CACHE_HOME/wldash` to `$XDG_STATE_HOME/wldash` (`~/.local/state`), where small roaming state belongs; old files are still read.
+- Launcher: `Type=Link` entries open their URL with `xdg-open`; `Terminal=true` entries run inside `$TERMINAL -e` when that variable is set.
+
+## 0.4.0 (2026-10-03)
+
+First release of the project.uhhm.no fork, packaged for the `[uhhm]` Arch registry. Numbering: upstream's old code base was tagged up to v0.3.0 and the rewrite called itself 0.2.0; this fork continues above both so pacman sees a monotonic version.
+
+- Launcher: the prompt cursor was a byte offset in some places and a grapheme index in others, so typing æøå and then End or another key crashed wldash. The cursor is grapheme-based everywhere, Up stops at the last row, mouse selection can't underflow, and all desktop Exec field codes (`%i`, `%c`, `%k`, `%%`, ...) are stripped.
+- No more aborting on machines without a backlight, battery or PulseAudio: `/sys/class/backlight` itself was taken for a device, UPower's always-present DisplayDevice for a battery, and a failed audio connection panicked a thread (fatal with `panic = "abort"`).
+- Redraws: `Geometry::expand` computed the damage height from the wrong field; buffer refcounts no longer underflow; `wl_shm_pool`s are destroyed on resize.
+- Input: a key-repeat rate of 0 divided by zero; Escape is now seen by the launcher first so the prompt is saved for Ctrl+R; the first layer-surface configure always lays out.
+- Config: `/etc/wldash/config.yml` takes precedence over `~/.config/wldash/config.yml` when present (machine-local layout on NFS-shared homes); `--config` overrides both. Errors print one line and exit 1 instead of panicking.
+- Housekeeping: `memmap` → `memmap2`, unused `shlex` dropped, zero rustc/clippy warnings, rustfmt applied, unit tests for the prompt, Exec parsing and geometry.
+
+## 0.2.0
+
+Upstream (kennylevinsen/wldash) rewrite, the state this fork started from.

Cargo.toml

@@ -1,43 +1,41 @@
 [package]
 name = "wldash"
-version = "0.2.0"
-authors = ["Kenny Levinsen <kl@kl.wtf>"]
-edition = "2018"
+version = "0.4.1"
+edition = "2024"
 
 [profile.release]
+#debug = true
 lto = "fat"
+panic = "abort"
 
 [features]
-default = ["alsa-widget", "pulseaudio-widget", "yaml-cfg", "json-cfg"]
-damage_debug = []
-
-yaml-cfg = ["serde_yaml"]
-json-cfg = ["serde_json"]
-
-alsa-widget = ["alsa"]
-pulseaudio-widget = ["libpulse-binding"]
+default = ["fontconfig"]
 
 [dependencies]
-smithay-client-toolkit = "0.6.4"
-byteorder = "1.3"
-rusttype = "0.7"
+wayland-client = { version = "0.30", features = ["calloop", "log"] }
+wayland-protocols = { version = "0.30", features = ["client", "unstable", "staging"] }
+wayland-protocols-wlr = { version = "0.1", features = ["client"] }
+nix = "0.26" # 0.27 is breaking
+memmap2 = "0.9"
+fontconfig = { version = "0.8.0", optional = true }
+rusttype = "0.9"
+# fontdue = "0.7"
+calloop = { version = "0.10" } # update breaks
 chrono = "0.4"
-nix = "0.15"
-memmap = "0.7"
-os_pipe = "0.8"
-wayland-client = { version = "0.23", features = ["dlopen"] }
-wayland-protocols = { version = "0.23", features = ["client", "unstable_protocols"] }
-dbus = "0.6"
-fuzzy-matcher = "0.2"
-lazy_static = "1.4"
-rcalc_lib = { version = "0.9" }
-rust-ini = "0.13"
-shlex = "0.1"
-timerfd = "1.0.0"
+
+walkdir = "2.4"
+
+unicode-segmentation = "1.10"
+fuzzy-matcher = "0.3"
+
+xkbcommon = { version = "0.8", features = ["wayland"] }
+
+rcalc_lib = "1.0"
+
+#alsa = { version = "0.7", optional = true }
+dbus = "0.9"
+libpulse-binding = "2.28"
 
 serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0", optional = true }
-serde_yaml = { version = "0.8", optional = true }
+serde_yaml = "0.9"
 
-libpulse-binding = { version = "2.11", optional = true }
-alsa = { version = "0.3.0", optional = true }

PKGBUILD

@@ -0,0 +1,40 @@
+# Maintainer: Bendik Aagaard Lynghaug <bendik.lynghaug@gmail.com>
+# Built from the tagged checkout by .gitea/workflows/release.yml, once
+# per architecture, and uploaded to the [uhhm] registry on
+# project.uhhm.no (namespace bl). pkgver is the version; the tag has
+# to agree with it and with Cargo.toml.
+pkgname=wldash
+pkgver=0.4.1
+pkgrel=1
+pkgdesc="Dashboard/launcher/control-panel for wlroots-style Wayland compositors (layer-shell)"
+arch=('x86_64' 'aarch64')
+url="https://project.uhhm.no/bl/wldash"
+license=('GPL-3.0-only')
+depends=('glibc' 'gcc-libs' 'dbus' 'libpulse' 'libxkbcommon' 'fontconfig' 'wayland')
+makedepends=('cargo')
+optdepends=('upower: battery widget'
+            'pipewire-pulse: volume widget (or pulseaudio)')
+# !lto: Cargo.toml already does lto = "fat"; makepkg's -flto in RUSTFLAGS
+# would only fight it. !debug: panic = "abort" release, nothing to strip.
+options=('!debug' '!lto')
+
+# Sources are the checkout itself: makepkg resolves local sources by
+# basename next to the PKGBUILD, so the tagged tree CI builds from is
+# the source of truth, as in uhhm/gdo.
+
+build() {
+    cd "$startdir"
+    cargo build --release --locked
+}
+
+check() {
+    cd "$startdir"
+    cargo test --release --locked
+}
+
+package() {
+    cd "$startdir"
+    install -Dm755 "${CARGO_TARGET_DIR:-target}/release/wldash" "$pkgdir/usr/bin/wldash"
+    install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

README.md

@@ -1,19 +1,34 @@
 # wldash
 
+![screenshot](https://git.sr.ht/~kennylevinsen/wldash/blob/master/assets/screenshot.jpg)
+
 A dashboard/launcher/control-panel thing for Wayland. Requires wlr-layer-shell-unstable-v1.
 
 Consider this alpha-quality: While it works, *everything* is subject to change with a moments notice. You may end up pulling in the latest changes, and *poof*, wldash suddenly turns into an artisan espresso machine.
 
+## Rewrite note
+
+wldash has received a significant rewrite. The old version is available in the wldash1 branch for now.
+
+## This fork
+
+This is a maintained fork of [kennylevinsen/wldash](https://github.com/kennylevinsen/wldash)
+living at <https://project.uhhm.no/bl/wldash>. On top of upstream it fixes a number of
+crashes (non-ASCII input in the launcher, machines without a backlight, battery or
+PulseAudio, key-repeat rate 0, ...), corrects redraw damage tracking, and prefers a
+machine-local `/etc/wldash/config.yml` over the per-user config when present, which keeps
+per-host layouts apart on NFS-shared homes.
+
 ## How to use
 
-1. Checkout: `git clone https://github.com/kennylevinsen/wldash`
+1. Checkout: `git clone https://project.uhhm.no/bl/wldash`
 2. Build: `cargo build --release`
 3. Put somewhere: `cp target/release/wldash /usr/local/bin/wldash`
 4. Run: `wldash`
 
-To see the default configuration, run `wldash print-config`. To configure, place a file in `$XDG_CONFIG_HOME/wldash/config.yaml` (or if `XDG_CONFIG_HOME` is not set, `~/.config/wldash/config.yaml`). JSON is also currently supported.
+To generate a new default configuration, run `wldash --write-default-config`. To configure, edit `$XDG_CONFIG_HOME/wldash/config.yml` (or if `XDG_CONFIG_HOME` is not set, `~/.config/wldash/config.yml`). If `/etc/wldash/config.yml` exists it takes precedence over the per-user file; `--config FILE` overrides both.
 
-Notable settings: `outptuMode` can be `active` or `all`, `scale` can be set to `2` to half the buffer size, and the widgets (and their layout) can be configured.
+Desktop files are scanned every time wldash starts (on a background thread), so there is no cache to refresh; `--desktop-refresh` is kept as a no-op for old key bindings. Calculator history and the prompt saved on Escape live in `$XDG_STATE_HOME/wldash` (`~/.local/state/wldash`); older installs' files under `~/.cache/wldash` are still read.
 
 For more info, look in `src/config.rs`.
 
@@ -54,12 +69,14 @@ Using backlight sys file, only visible of backlight is detected. Scroll to adjus
 Loads desktop files from the usual locations.
 
 The launcher also accepts prefix operators to change its mode:
+
 - `!`: Arbitrary command
 - `=`: Calculator based on rcalc_lib. See https://docs.rs/rcalc_lib/0.9.3/rcalc_lib/
 
 ## Notable missing features:
 
 - Scaling of any kind - all sizes are currently hardcoded in pixels
-- Configurability
-- Cleanup and reorganization
-- Proper line editor for the launcher
+
+## How to discuss
+
+Go to #kennylevinsen @ irc.libera.chat to discuss, or use [~kennylevinsen/public-inbox@lists.sr.ht](https://lists.sr.ht/~kennylevinsen/public-inbox).

config.json

@@ -1,55 +0,0 @@
-{
-	"widget": {
-		"margin": {
-			"margins": [20,20,20,20],
-			"widget": {
-				"verticalLayout": [{
-					"horizontalLayout": [{
-						"margin": {
-							"margins": [0,88,0,32],
-							"widget": {
-								"verticalLayout": [
-									{"date": {"font_size": 64.0}},
-									{"clock": {"font_size": 256.0}}
-								]
-							}
-						}
-					},{
-						"verticalLayout": [{
-							"margin": {
-								"margins": [0,0,0,8],
-								"widget": {"battery": {"font_size": 24.0,"length": 600}}
-							}
-						},{
-							"margin": {
-								"margins": [0,0,0,8],
-								"widget": {"backlight": {"font_size": 24.0,"length": 600}}
-							}
-						},{
-							"margin": {
-								"margins": [0,0,0,8],
-								"widget": {"pulseAudio": {"font_size": 24.0,"length": 600}}
-							}
-						}]
-					}
-				]},
-				{"calendar": {"font_size": 16.0,"sections": 3}},
-				{"launcher": {
-					"font_size": 32.0,
-					"length": 1200, 
-	            "app_opener": "swaymsg exec ",
-	            "term_opener": "alacritty -e ",
-	            "url_opener": "xdg-open "
-	         }}
-			]}
-		}
-	},
-	"outputMode": "active",
-	"scale": 1,
-	"background": {
-		"red": 0,
-		"green": 0,
-		"blue": 0,
-		"opacity": 0.9
-	}
-}

config.yaml

@@ -1,49 +0,0 @@
-outputMode: active
-scale: 1
-background:
-  red: 0.0
-  green: 0.0
-  blue: 0.0
-  opacity: 0.9
-widget:
-  margin:
-    margins: [20, 20, 20, 20]
-    widget:
-      verticalLayout:
-        - horizontalLayout:
-            - margin:
-                margins: [0, 88, 0, 32]
-                widget:
-                  verticalLayout:
-                    - date:
-                        font_size: 64.0
-                    - clock:
-                        font_size: 256.0
-            - verticalLayout:
-                - margin:
-                    margins: [0, 0, 0, 8]
-                    widget:
-                      battery:
-                        font_size: 24.0
-                        length: 600
-                - margin:
-                    margins: [0, 0, 0, 8]
-                    widget:
-                      backlight:
-                        font_size: 24.0
-                        length: 600
-                - margin:
-                    margins: [0, 0, 0, 8]
-                    widget:
-                      pulseAudio:
-                        font_size: 24.0
-                        length: 600
-        - calendar:
-            font_size: 16.0
-            sections: 3
-        - launcher:
-            font_size: 32.0
-            length: 1200
-            app_opener: "swaymsg exec "
-            term_opener: "alacritty -e "
-            url_opener: "xdg-open "

fonts/wqy-microhei/ChangeLog.txt

@@ -1,38 +0,0 @@
-
-==========================================================
-
-                 Wen Quan Yi Micro Hei
-
-                     ChangeLog
-
-----------------------------------------------------------
-
-WenQuanYi Micro Hei ChangeLog:
-
-== WenQuanYi Micro Hei 0.2 (BigBang), FangQ <fangq nmr mgh harvard edu> ==
-
- 2009/05/25  Updated contributor list in the NB and announced beta release
- 2009/05/18  fixed hinting instr for M/N in MicroHeiMono by copying cvt table (F
-angQ)
- 2009/05/16  added Micro Hei Mono by merging with Droid Sans Mono (FangQ)
- 2009/05/15  rename uni00B9 to onesuperior to match the it in DroidSans (FangQ)
- 2009/05/10  updated documentations (FangQ)
- 2009/05/09  scale MicroHei to EM=2048 before merging to Droid Sans, keep
-             all hinting and kerning info. (FangQ)
- 2009/04/12  imported Chinese punctuations from UmeGothic (FangQ)
- 2009/02/08  all characters in U4E00~U9FC3 were complete (review panel, wanghong
-)
- 2009/01/16  Micro Hei nightly-build became active (FangQ)
- 2009/01/15  GBK glyph review process started (FangQ)
- 2009/01/03  Fontopia supported sub-contour editing (FangQ)
- 2008/12/31  GBK char-set completed 90%, CJK Ext. A became online
- 2008/12/29  project publicly announcement (FangQ)
- 2008/12/09  Droid Font license confirmed (Apache2 as committed in git)
- 2008/12/03  add theme and rename as Fontopia (FangQ)
- 2008/11/23  Droid extension GUI milestone reached (mozbug, FangQ)
- 2008/11/07  initial upload of BezierGlyph/Bezier_lib.js script (mozbug)
- 2008/11/06  code point and script preparation (mozbug)
- 2008/10/21  project conceptualized (FangQ)
-
-
-

fonts/wqy-microhei/LICENSE_Apache2.txt

@@ -1,122 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this 
-document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common 
-control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the 
-direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the 
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, 
-documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not 
-limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a 
-copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which 
-the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. 
-For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by 
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to 
-that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner 
-or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, 
-"submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including 
-but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are 
-managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is 
-conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor 
-and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a 
-perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works 
-of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, 
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, 
-use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable 
-by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with 
-the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim 
-or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or 
-contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the 
-date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without 
-modifications, and in Source or Object form, provided that You meet the following conditions:
-
-   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-   3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and 
-attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative 
-Works; and
-
-   4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must 
-include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to 
-any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the 
-Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display 
-generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for 
-informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You 
-distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot 
-be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions 
-for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, 
-reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the 
-Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. 
-Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have 
-executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the 
-Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of 
-the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each 
-Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
-implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A 
-PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume 
-any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, 
-unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be 
-liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as 
-a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, 
-work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has 
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, 
-and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this 
-License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf 
-of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred 
-by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" 
-replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment 
-syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed 
-page" as the copyright notice for easier identification within third-party archives.
-Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
-except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
-required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, 
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing 
-permissions and limitations under the License.

fonts/wqy-microhei/LICENSE_GPLv3.txt

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

fonts/wqy-microhei/README.txt

@@ -1,378 +0,0 @@
-
-==========================================================
-
-                 Wen Quan Yi Micro Hei
-
-                    Release Notes
-
-----------------------------------------------------------
-
-Summary:
-
-    Author   : WenQuanYi Project Contributors
-    Webpage  : http://wenq.org/en/ or http://wqy.sourceforge.net/en/
-    Font Name: WenQuanYi Micro Hei
-    Version  : 0.2.0-beta (Big-Bang)
-    Release  : 0
-    Copyright  Digitized data copyright © 2007, Google Corporation.
-               Copyright © 2008-2009, WenQuanYi Project Board of
-               Trustees, All rights reserved.
-
-               Droid Sans Fallback extension interface
-               ( http://wenq.org/index.cgi?Fontopia(cn) ),
-               copyright © 2008-2009 mozbug and Qianqian Fang
-    License  : This font is licensed under Apache2.0 or GPLv3
-               with font embedding exceptions (see Appendix B).
-               Read LICENSE_Apache2.txt and LICENSE_GPLv3.txt for details
-
-----------------------------------------------------------
-
-Table of Content
-
- I.    About this font
- II.   Development History
- III.  Credits
- IV.   Language Coverage
- V.    About "WenQuanYi Project"
- VI.   Links
- VII.  Appendix
-
-----------------------------------------------------------
-
-
- I. About this font
-
-WenQuanYi Micro Hei font family is a Sans-Serif style (also known as Hei,
-Gothic or Dotum among the Chinese/Japanese/Korean users) high quality
-CJK outline font. It was derived from "Droid Sans Fallback", "Droid
-Sans" and "Droid Sans Mono" released by Google Corp. This font package
-contains two faces, "Micro Hei" and "Micro Hei Mono", in form of a
-True-Type Collection (ttc) file. All the unified CJK Han glyphs, i.e.
-GBK Hanzi, in the range of U+4E00-U+9FC3 defined in Unicode Standard 5.1
-are covered, with additional support to many other international
-languages such as Latin, Extended Latin, Hanguls and Kanas. The font
-file is extremely compact (~5M) compared with most known CJK fonts.
-As a result, it can be used for hand-held devices or embedded systems, or
-used on PC with a significantly small memory footprint. Because both
-font faces carry hinting and kerning instructions for Latin glyphs,
-they are the excellent choices for desktop fonts.
-
-
- II. Development History
-
-The original Droid Sans Fallback font contain 16,000 Unified Han glyphs,
-and was officially released by Google under Apache2 license on Dec. 9,
-2008 [2]. With a Javascript-based web interface, Fontopia(TM) [1], developed
-by mozbug and Qianqian Fang, the WenQuanYi contributors had completed
-over 10,000 new glyphs by combining the spline contours from the existing
-Droid Han glyphs. By the end of 2008, project phase-1 had almost
-completed, and phase-2 for CJK Extension A (U+3400-U+4DB5) was brought
-online on Dec. 29, 2009. A review panel was formed to reinforce the
-quality of all submitted glyphs [3]. In Jan. 2009, the reviewers
-had redone over 2000 Hanzi and completed all the missing characters.
-The nightly-build font has become online since Jan. 16. As of Feb. 2009, there
-has been over 5500 CJK Extension A Han glyphs completed, which led this
-font toward a complete GB18030 coverage.
-
-In this font, we incorporated the high quality Latin glyphs from "Droid Sans"
-and "Droid Sans Mono", which contain not only a better coverage but also
-the additional hinting and kerning information. The EM of MicroHei
-and MicroHeiMono fonts were unified to 2048 to retain all the advanced
-typesetting features.
-
-
- III. Credits
-
-We cordially thank Google(TM) for generously releasing Droid fonts to
-public under an open-source license. Google purchased the font from
-Ascenders Corp. (which was originally designed by a Chinese company).
-
-The project for extending the Droid fonts is based on the web-based
-glyph-composing applet [1], created by mozbug and Qianqian Fang
-jointly. They are constantly improving this application targeting at
-a web-based collaborative font development environment.
-
-Over a thousand anonymous contributors have participated the project;
-they submitted over 10,000 new Hanzi glyphs and many modifications.
-The full update history of the glyphs can be found at [4].
-
-The key members of the review panel, i.e. lsz, FangQ, kmc, Xhacker,
-philacorns, and an "anonymous" (as requested) contributor, had
-spent significant amount of efforts to redesign nearly half of the
-submitted glyphs. We appreciate the incredible effort from this team
-to make this font available. The detailed review credit can be found
-at [3]
-
-
- IV.    Language Coverage
-
-The following table is based on the locale data provided by fontconfig
-(generated by langcover.pl from Dejavu Project
-http://dejavu.sourceforge.net/wiki/index.php/Font_utilities).
-  ----------------------------------------------------------------
-    Locale                                           MicroHei
-  ----------------------------------------------------------------
-  aa     Afar                                     100% (62/62)
-  ab     Abkhazia                                 100% (90/90)
-  af     Afrikaans                                100% (69/69)
-  am     Amharic                                       (0/264)
-  ar     Arabic                                        (0/125)
-  as                                                   (0/89)
-  ast    Asturian                                 100% (72/72)
-  ava    Avaric                                   100% (67/67)
-  ay     Aymara                                   100% (60/60)
-  az     Azerbaijani                               98% (146/148)
-  az-ir  Azerbaijani in Iran                           (0/130)
-  ba     Bashkir                                  100% (82/82)
-  bam    Bambara                                   90% (54/60)
-  be     Byelorussian                             100% (68/68)
-  bg     Bulgarian                                100% (60/60)
-  bh     Bihari (Devanagari script)                    (0/68)
-  bho    Bhojpuri (Devanagari script)                  (0/68)
-  bi     Bislama                                  100% (58/58)
-  bin    Edo or Bini                              100% (78/78)
-  bn     Bengali                                       (0/89)
-  bo     Tibetan                                       (0/95)
-  br     Breton                                   100% (64/64)
-  bs     Bosnian                                  100% (62/62)
-  bua    Buriat (Buryat)                          100% (70/70)
-  ca     Catalan                                  100% (74/74)
-  ce     Chechen                                  100% (67/67)
-  ch     Chamorro                                 100% (58/58)
-  chm    Mari (Lower Cheremis / Upper Cheremis)   100% (76/76)
-  chr    Cherokee                                      (0/85)
-  co     Corsican                                 100% (85/85)
-  cs     Czech                                    100% (82/82)
-  cu     Old Church Slavonic                      100% (103/103)
-  cv     Chuvash                                  100% (74/74)
-  cy     Welsh                                    100% (78/78)
-  da     Danish                                   100% (70/70)
-  de     German                                   100% (60/60)
-  dz     Dzongkha                                      (0/95)
-  el     Greek                                    100% (70/70)
-  en     English                                  100% (73/73)
-  eo     Esperanto                                100% (64/64)
-  es     Spanish                                  100% (67/67)
-  et     Estonian                                 100% (64/64)
-  eu     Basque                                   100% (56/56)
-  fa     Persian                                       (0/129)
-  fi     Finnish                                  100% (63/63)
-  fj     Fijian                                   100% (52/52)
-  fo     Faroese                                  100% (68/68)
-  fr     French                                   100% (85/85)
-  ful    Fulah (Fula)                              87% (54/62)
-  fur    Friulian                                 100% (66/66)
-  fy     Frisian                                  100% (75/75)
-  ga     Irish                                     82% (66/80)
-  gd     Scots Gaelic                             100% (70/70)
-  gez    Ethiopic (Geez)                               (0/218)
-  gl     Galician                                 100% (66/66)
-  gn     Guarani                                  100% (70/70)
-  gu     Gujarati                                      (0/78)
-  gv     Manx Gaelic                              100% (54/54)
-  ha     Hausa                                     86% (52/60)
-  haw    Hawaiian                                  98% (62/63)
-  he     Hebrew                                        (0/27)
-  hi     Hindi (Devanagari script)                     (0/68)
-  ho     Hiri Motu                                100% (52/52)
-  hr     Croatian                                 100% (62/62)
-  hu     Hungarian                                100% (70/70)
-  hy     Armenian                                      (0/77)
-  ia     Interlingua                              100% (52/52)
-  ibo    Igbo                                     100% (58/58)
-  id     Indonesian                               100% (54/54)
-  ie     Interlingue                              100% (52/52)
-  ik     Inupiaq (Inupiak, Eskimo)                100% (68/68)
-  io     Ido                                      100% (52/52)
-  is     Icelandic                                100% (70/70)
-  it     Italian                                  100% (73/73)
-  iu     Inuktitut                                     (0/161)
-  ja     Japanese                                  99% (6526/6538)
-  ka     Georgian                                      (0/33)
-  kaa    Kara-Kalpak (Karakalpak)                 100% (78/78)
-  ki     Kikuyu                                   100% (56/56)
-  kk     Kazakh                                   100% (77/77)
-  kl     Greenlandic                              100% (81/81)
-  km     Khmer                                         (0/70)
-  kn     Kannada                                       (0/80)
-  ko     Korean                                   100% (2443/2443)
-  kok    Kokani (Devanagari script)                    (0/68)
-  ks     Kashmiri (Devanagari script)                  (0/68)
-  ku     Kurdish                                  100% (64/64)
-  ku-ir  Kurdish in Iran                               (0/32)
-  kum    Kumyk                                    100% (66/66)
-  kv     Komi (Komi-Permyak/Komi-Siryan)          100% (70/70)
-  kw     Cornish                                   96% (62/64)
-  ky     Kirgiz                                   100% (70/70)
-  la     Latin                                    100% (68/68)
-  lb     Luxembourgish (Letzeburgesch)            100% (75/75)
-  lez    Lezghian (Lezgian)                       100% (67/67)
-  ln     Lingala                                   92% (75/81)
-  lo     Lao                                           (0/65)
-  lt     Lithuanian                               100% (70/70)
-  lv     Latvian                                  100% (78/78)
-  mg     Malagasy                                 100% (56/56)
-  mh     Marshallese                              100% (62/62)
-  mi     Maori                                     96% (62/64)
-  mk     Macedonian                               100% (42/42)
-  ml     Malayalam                                     (0/78)
-  mn     Mongolian                                     (0/130)
-  mo     Moldavian                                 98% (126/128)
-  mr     Marathi (Devanagari script)                   (0/68)
-  mt     Maltese                                  100% (72/72)
-  my     Burmese (Myanmar)                             (0/48)
-  nb     Norwegian Bokmal                         100% (70/70)
-  nds    Low Saxon                                100% (59/59)
-  ne     Nepali (Devanagari script)                    (0/68)
-  nl     Dutch                                    100% (83/83)
-  nn     Norwegian Nynorsk                        100% (76/76)
-  no     Norwegian (Bokmal)                       100% (70/70)
-  ny     Chichewa                                 100% (54/54)
-  oc     Occitan                                  100% (70/70)
-  om     Oromo or Galla                           100% (52/52)
-  or     Oriya                                         (0/79)
-  os     Ossetic                                  100% (66/66)
-  pa     Punjabi (Gurumukhi script)                    (0/63)
-  pl     Polish                                   100% (70/70)
-  ps-af  Pashto in Afghanistan                         (0/49)
-  ps-pk  Pashto in Pakistan                            (0/49)
-  pt     Portuguese                               100% (83/83)
-  rm     Rhaeto-Romance (Romansch)                100% (66/66)
-  ro     Romanian                                  96% (60/62)
-  ru     Russian                                  100% (66/66)
-  sa     Sanskrit (Devanagari script)                  (0/68)
-  sah    Yakut                                    100% (76/76)
-  sco    Scots                                     92% (52/56)
-  se     North Sami                               100% (66/66)
-  sel    Selkup (Ostyak-Samoyed)                  100% (66/66)
-  sh     Serbo-Croatian                           100% (76/76)
-  si     Sinhala (Sinhalese)                           (0/77)
-  sk     Slovak                                   100% (86/86)
-  sl     Slovenian                                100% (62/62)
-  sm     Samoan                                    98% (52/53)
-  sma    South Sami                               100% (60/60)
-  smj    Lule Sami                                100% (60/60)
-  smn    Inari Sami                               100% (68/68)
-  sms    Skolt Sami                                87% (70/80)
-  so     Somali                                   100% (52/52)
-  sq     Albanian                                 100% (56/56)
-  sr     Serbian                                  100% (76/76)
-  sv     Swedish                                  100% (68/68)
-  sw     Swahili                                  100% (52/52)
-  syr    Syriac                                        (0/45)
-  ta     Tamil                                         (0/48)
-  te     Telugu                                        (0/80)
-  tg     Tajik                                    100% (78/78)
-  th     Thai                                       1% (1/87)
-  ti-er  Eritrean Tigrinya                             (0/256)
-  ti-et  Ethiopian Tigrinya                            (0/282)
-  tig    Tigre                                         (0/221)
-  tk     Turkmen                                  100% (74/74)
-  tl     Tagalog                                       (0/19)
-  tn     Tswana                                   100% (56/56)
-  to     Tonga                                     98% (52/53)
-  tr     Turkish                                  100% (70/70)
-  ts     Tsonga                                   100% (52/52)
-  tt     Tatar                                    100% (76/76)
-  tw     Twi                                       91% (67/73)
-  tyv    Tuvinian                                 100% (70/70)
-  ug     Uighur                                        (0/125)
-  uk     Ukrainian                                100% (72/72)
-  ur     Urdu                                          (0/145)
-  uz     Uzbek                                    100% (68/68)
-  ven    Venda                                     83% (52/62)
-  vi     Vietnamese                                98% (191/194)
-  vo     Volapuk                                  100% (54/54)
-  vot    Votic                                    100% (62/62)
-  wa     Walloon                                  100% (70/70)
-  wen    Sorbian languages (lower and upper)      100% (76/76)
-  wo     Wolof                                    100% (66/66)
-  xh     Xhosa                                    100% (52/52)
-  yap    Yapese                                   100% (58/58)
-  yi     Yiddish                                       (0/27)
-  yo     Yoruba                                    91% (109/119)
-  zh-936                                           99% (21873/21920)
-  zh-cn  Chinese (simplified)                      99% (6754/6765)
-  zh-hk  Chinese Hong Kong Supplementary Character Set  99% (2212/2213)
-  zh-mo  Chinese in Macau                          99% (2212/2213)
-  zh-sg  Chinese in Singapore                      99% (6754/6765)
-  zh-tw  Chinese (traditional)                     99% (13051/13063)
-  zu     Zulu                                     100% (52/52)
-  ----------------------------------------------------------------
-
- V.    About "WenQuanYi Project"
-
-The "Wen Quan Yi" Project [5] was founded by Qianqian Fang [6] in
-Oct. 2004. The goal of this project is to create a web-based
-collaborative environment for open-source type-face development.
-The initial focus of the project is to create high quality bitmap
-character glyphs and outline fonts for all 70,000+ CJK characters
-currently encoded by the Unicode Consortium. Some of the fonts
-released by this project have been widely used as the default
-Chinese desktop fonts by main-stream GNU/Linux distributions.
-
-The Wen Quan Yi Project uses wiki [5] as the primary development
-tool for glyph creation, documentation and coordinations. Wen Quan Yi
-wiki also supports glyph version control and nightly build.
-
-
- VI.    Links
-
-[1] http://wenq.org/index.cgi?Fontopia(cn)
-[2] http://android.git.kernel.org/?p=platform/frameworks/base.git;a=commit;h=1a2
-d9dbe9c6f54c5e0dc26386dc01df1d18073ad
-[3] http://wenq.org/dev/index.cgi?BigBang_TASK
-[4] http://wenq.org/WQYHistory.html.gz
-[5] http://wenq.org/en/
-[6] http://nmr.mgh.harvard.edu/~fangq/
-
-
- VII. Appendix
-
-Appendix A.
-
-Copyright disclaimer for UmeFont
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. Neither the name of the Wada Laboratory, the University of Tokyo nor
-   the names of its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY WADA LABORATORY, THE UNIVERSITY OF TOKYO AND
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE LABORATORY OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Appendix B.
-
-GPL with font embedding exception:
-
-http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html#FontException
-
-As a special exception, if you create a document which uses this
-font, and embed this font or unaltered portions of this font into
-the document, this font does not by itself cause the resulting
-document to be covered by the GNU General Public License. This
-exception does not however invalidate any other reasons why the
-document might be covered by the GNU General Public License. If you
-modify this font, you may extend this exception to your version of
-the font, but you are not obligated to do so. If you do not wish to
-do so, delete this exception statement from your version.
-
-
-

src/app.rs

@@ -1,570 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex};
-
-use chrono::Local;
-
-use smithay_client_toolkit::keyboard::{
-    keysyms, map_keyboard_auto, Event as KbEvent, KeyState, ModifiersState,
-};
-
-use wayland_client::protocol::{wl_compositor, wl_output, wl_pointer, wl_shm, wl_surface};
-use wayland_client::{Display, EventQueue, GlobalEvent, GlobalManager, NewProxy};
-use wayland_protocols::wlr::unstable::layer_shell::v1::client::{
-    zwlr_layer_shell_v1, zwlr_layer_surface_v1,
-};
-
-use crate::buffer::Buffer;
-use crate::color::Color;
-use crate::widget::{DrawContext, Widget};
-
-use crate::cmd::Cmd;
-use crate::doublemempool::DoubleMemPool;
-
-#[derive(Debug)]
-pub enum OutputMode {
-    Active,
-    All,
-}
-
-struct AppInner {
-    compositor: Option<wl_compositor::WlCompositor>,
-    surfaces: Vec<wl_surface::WlSurface>,
-    shell_surfaces: Vec<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1>,
-    configured_surfaces: Arc<Mutex<usize>>,
-    outputs: Vec<(u32, wl_output::WlOutput)>,
-    shell: Option<zwlr_layer_shell_v1::ZwlrLayerShellV1>,
-    draw_tx: Sender<Cmd>,
-    output_mode: OutputMode,
-    visible: bool,
-    scale: u32,
-}
-
-impl AppInner {
-    fn new(tx: Sender<Cmd>, output_mode: OutputMode, scale: u32) -> AppInner {
-        AppInner {
-            compositor: None,
-            surfaces: Vec::new(),
-            shell_surfaces: Vec::new(),
-            configured_surfaces: Arc::new(Mutex::new(0)),
-            outputs: Vec::new(),
-            shell: None,
-            draw_tx: tx,
-            output_mode: output_mode,
-            visible: true,
-            scale: scale,
-        }
-    }
-
-    fn add_shell_surface(
-        compositor: &wl_compositor::WlCompositor,
-        shell: &zwlr_layer_shell_v1::ZwlrLayerShellV1,
-        scale: u32,
-        configured_surfaces: Arc<Mutex<usize>>,
-        tx: Sender<Cmd>,
-        output: Option<&wl_output::WlOutput>,
-    ) -> (
-        wl_surface::WlSurface,
-        zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
-    ) {
-        let surface = compositor
-            .create_surface(NewProxy::implement_dummy)
-            .unwrap();
-
-        let this_is_stupid = Arc::new(Mutex::new(false));
-
-        let shell_surface = shell
-            .get_layer_surface(
-                &surface,
-                output,
-                zwlr_layer_shell_v1::Layer::Overlay,
-                "".to_string(),
-                move |layer| {
-                    layer.implement_closure(
-                        move |evt, layer| match evt {
-                            zwlr_layer_surface_v1::Event::Configure { serial, .. } => {
-                                let mut x = this_is_stupid.lock().unwrap();
-                                if !*x {
-                                    *x = true;
-                                    *(configured_surfaces.lock().unwrap()) += 1;
-                                    layer.ack_configure(serial);
-                                    tx.send(Cmd::ForceDraw).unwrap();
-                                }
-                            }
-                            _ => unreachable!(),
-                        },
-                        (),
-                    )
-                },
-            )
-            .unwrap();
-
-        shell_surface.set_keyboard_interactivity(1);
-        surface.set_buffer_scale(scale as i32);
-        surface.commit();
-        (surface, shell_surface)
-    }
-
-    fn outputs_changed(&mut self) {
-        let shell = match self.shell {
-            Some(ref shell) => shell.to_owned(),
-            None => return,
-        };
-        let compositor = match self.compositor {
-            Some(ref c) => c.to_owned(),
-            None => return,
-        };
-
-        for shell_surface in self.shell_surfaces.iter() {
-            shell_surface.destroy();
-        }
-        for surface in self.surfaces.iter() {
-            surface.destroy();
-        }
-
-        self.configured_surfaces = Arc::new(Mutex::new(0));
-
-        if !self.visible {
-            self.surfaces = Vec::new();
-            self.shell_surfaces = Vec::new();
-            return;
-        }
-
-        match self.output_mode {
-            OutputMode::Active => {
-                if self.shell_surfaces.len() > 0 {
-                    return;
-                }
-
-                let (surface, shell_surface) = AppInner::add_shell_surface(
-                    &compositor,
-                    &shell,
-                    self.scale,
-                    self.configured_surfaces.clone(),
-                    self.draw_tx.clone(),
-                    None,
-                );
-                self.surfaces = vec![surface];
-                self.shell_surfaces = vec![shell_surface];
-            }
-            OutputMode::All => {
-                let mut surfaces = Vec::new();
-                let mut shell_surfaces = Vec::new();
-                for output in self.outputs.iter() {
-                    let (surface, shell_surface) = AppInner::add_shell_surface(
-                        &compositor,
-                        &shell,
-                        self.scale,
-                        self.configured_surfaces.clone(),
-                        self.draw_tx.clone(),
-                        Some(&output.1),
-                    );
-                    surfaces.push(surface);
-                    shell_surfaces.push(shell_surface);
-                }
-                self.surfaces = surfaces;
-                self.shell_surfaces = shell_surfaces;
-            }
-        }
-        self.draw_tx.send(Cmd::ForceDraw).unwrap();
-    }
-
-    fn add_output(&mut self, id: u32, output: wl_output::WlOutput) {
-        self.outputs.push((id, output));
-        self.outputs_changed();
-    }
-
-    fn remove_output(&mut self, id: u32) {
-        let old_output = self.outputs.iter().find(|(output_id, _)| *output_id == id);
-        if let Some(output) = old_output {
-            let new_outputs = self
-                .outputs
-                .iter()
-                .filter(|(output_id, _)| *output_id != id)
-                .map(|(x, y)| (x.clone(), y.clone()))
-                .collect();
-            if output.1.as_ref().version() >= 3 {
-                output.1.release()
-            }
-            self.outputs = new_outputs;
-            self.outputs_changed();
-        }
-    }
-
-    fn set_compositor(&mut self, compositor: Option<wl_compositor::WlCompositor>) {
-        self.compositor = compositor
-    }
-
-    fn set_shell(&mut self, shell: Option<zwlr_layer_shell_v1::ZwlrLayerShellV1>) {
-        self.shell = shell
-    }
-}
-
-pub struct App {
-    pools: DoubleMemPool,
-    display: Display,
-    event_queue: EventQueue,
-    cmd_queue: Arc<Mutex<VecDeque<Cmd>>>,
-    widget: Option<Box<dyn Widget + Send>>,
-    bg: Color,
-    inner: Arc<Mutex<AppInner>>,
-    last_damage: Option<Vec<(i32, i32, i32, i32)>>,
-    last_dim: (u32, u32),
-}
-
-impl App {
-    pub fn redraw(&mut self, force: bool) -> Result<(), ::std::io::Error> {
-        let widget = match self.widget {
-            Some(ref mut widget) => widget,
-            None => return Ok(()),
-        };
-
-        let inner = self.inner.lock().unwrap();
-        let time = Local::now();
-
-        if !inner.visible
-            || inner.shell_surfaces.len() != *inner.configured_surfaces.lock().unwrap()
-            || inner.surfaces.len() == 0
-        {
-            // Not ready yet
-            return Ok(());
-        }
-
-        let (last, pool) = match self.pools.pool() {
-            Some((last, pool)) => (last, pool),
-            None => return Ok(()),
-        };
-
-        let size = widget.size();
-        let size_changed = self.last_dim != size;
-        let force = force | size_changed;
-
-        // resize the pool if relevant
-        pool.resize((4 * size.0 * size.1) as usize)
-            .expect("Failed to resize the memory pool.");
-        let mmap = pool.mmap();
-        let mut buf = Buffer::new(mmap, size);
-
-        // Copy old damage
-        let force = match (force, &self.last_damage) {
-            (false, Some(d)) => {
-                let lastmmap = last.mmap();
-                let last = Buffer::new(lastmmap, size);
-
-                if cfg!(feature = "damage_debug") {
-                    buf.memset(&Color::new(0.5, 0.75, 0.75, 1.0));
-                }
-                for d in d {
-                    last.copy_to(&mut buf, d.clone());
-                }
-                false
-            }
-            _ => true,
-        };
-
-        if force {
-            buf.memset(&self.bg);
-        }
-        let report = widget.draw(
-            &mut DrawContext {
-                buf: &mut buf,
-                bg: &self.bg,
-                time: &time,
-                force,
-            },
-            (0, 0),
-        )?;
-
-        mmap.flush().unwrap();
-
-        if !force && !report.full_damage && report.damage.len() == 0 {
-            // Nothing to do
-            self.pools.never_mind();
-            return Ok(());
-        }
-
-        // get a buffer and attach it
-        let new_buffer = pool.buffer(
-            0,
-            report.width as i32,
-            report.height as i32,
-            4 * size.0 as i32,
-            wl_shm::Format::Argb8888,
-        );
-        if size_changed {
-            for shell_surface in inner.shell_surfaces.iter() {
-                shell_surface.set_size(size.0 / inner.scale, size.1 / inner.scale);
-            }
-        }
-        for surface in inner.surfaces.iter() {
-            surface.attach(Some(&new_buffer), 0, 0);
-            if cfg!(feature = "damage_debug") || force || report.full_damage {
-                surface.damage_buffer(0, 0, size.0 as i32, size.1 as i32);
-            } else {
-                for d in report.damage.iter() {
-                    surface.damage_buffer(d.0, d.1, d.2, d.3);
-                }
-            }
-            surface.commit();
-        }
-        self.last_damage = if force || report.full_damage {
-            Some(vec![(0, 0, size.0 as i32, size.1 as i32)])
-        } else {
-            Some(report.damage)
-        };
-        self.last_dim = size;
-        Ok(())
-    }
-
-    pub fn hide(&mut self) {
-        let mut inner = self.inner.lock().unwrap();
-        inner.visible = false;
-        self.last_dim = (0, 0);
-        inner.outputs_changed();
-    }
-
-    pub fn show(&mut self) {
-        let mut inner = self.inner.lock().unwrap();
-        inner.visible = true;
-        self.last_dim = (0, 0);
-        inner.outputs_changed();
-    }
-
-    pub fn cmd_queue(&self) -> Arc<Mutex<VecDeque<Cmd>>> {
-        self.cmd_queue.clone()
-    }
-
-    pub fn flush_display(&mut self) {
-        self.display.flush().expect("unable to flush display");
-    }
-
-    pub fn event_queue(&mut self) -> &mut EventQueue {
-        &mut self.event_queue
-    }
-
-    pub fn get_widget(&mut self) -> &mut Box<dyn Widget + Send> {
-        self.widget.as_mut().unwrap()
-    }
-
-    pub fn set_widget(&mut self, w: Box<dyn Widget + Send>) -> Result<(), ::std::io::Error> {
-        self.widget = Some(w);
-        self.redraw(true)
-    }
-
-    pub fn new(tx: Sender<Cmd>, output_mode: OutputMode, bg: Color, scale: u32) -> App {
-        let inner = Arc::new(Mutex::new(AppInner::new(tx.clone(), output_mode, scale)));
-
-        //
-        // Set up modules
-        //
-
-        let cmd_queue = Arc::new(Mutex::new(VecDeque::new()));
-
-        let (display, mut event_queue) = Display::connect_to_env().unwrap();
-
-        let display_wrapper = display
-            .as_ref()
-            .make_wrapper(&event_queue.get_token())
-            .unwrap()
-            .into();
-
-        //
-        // Set up global manager
-        //
-        let inner_global = inner.clone();
-        let manager =
-            GlobalManager::new_with_cb(&display_wrapper, move |event, registry| match event {
-                GlobalEvent::New {
-                    id,
-                    ref interface,
-                    version,
-                } => {
-                    if let "wl_output" = &interface[..] {
-                        let output = registry
-                            .bind(version, id, move |output| {
-                                output.implement_closure(move |_, _| {}, ())
-                            })
-                            .unwrap();
-                        inner_global.lock().unwrap().add_output(id, output);
-                    }
-                }
-                GlobalEvent::Removed { id, ref interface } => {
-                    if let "wl_output" = &interface[..] {
-                        inner_global.lock().unwrap().remove_output(id);
-                    }
-                }
-            });
-
-        // double sync to retrieve the global list
-        // and the globals metadata
-        event_queue.sync_roundtrip().unwrap();
-        event_queue.sync_roundtrip().unwrap();
-
-        // wl_compositor
-        let compositor: wl_compositor::WlCompositor = manager
-            .instantiate_range(1, 4, NewProxy::implement_dummy)
-            .expect("server didn't advertise `wl_compositor`");
-
-        inner.lock().unwrap().set_compositor(Some(compositor));
-
-        // wl_shm
-        let shm_formats = Arc::new(Mutex::new(Vec::new()));
-        let shm_formats2 = shm_formats.clone();
-        let shm = manager
-            .instantiate_range(1, 1, |shm| {
-                shm.implement_closure(
-                    move |evt, _| {
-                        if let wl_shm::Event::Format { format } = evt {
-                            shm_formats2.lock().unwrap().push(format);
-                        }
-                    },
-                    (),
-                )
-            })
-            .expect("server didn't advertise `wl_shm`");
-
-        let pools = DoubleMemPool::new(&shm).expect("Failed to create a memory pool !");
-
-        //
-        // Get our seat
-        //
-        let seat = manager
-            .instantiate_range(1, 6, NewProxy::implement_dummy)
-            .unwrap();
-
-        //
-        // Keyboard processing
-        //
-        let kbd_clone = cmd_queue.clone();
-        let modifiers_state = Arc::new(Mutex::new(ModifiersState {
-            ctrl: false,
-            alt: false,
-            shift: false,
-            caps_lock: false,
-            logo: false,
-            num_lock: false,
-        }));
-        map_keyboard_auto(&seat, move |event: KbEvent, _| match event {
-            KbEvent::Key {
-                keysym,
-                utf8,
-                state,
-                ..
-            } => match state {
-                KeyState::Pressed => match keysym {
-                    keysyms::XKB_KEY_Escape => kbd_clone.lock().unwrap().push_back(Cmd::Exit),
-                    keysyms::XKB_KEY_c if modifiers_state.lock().unwrap().ctrl => {
-                        kbd_clone.lock().unwrap().push_back(Cmd::Exit)
-                    }
-                    v => kbd_clone.lock().unwrap().push_back(Cmd::Keyboard {
-                        key: v,
-                        key_state: state,
-                        modifiers_state: modifiers_state.lock().unwrap().clone(),
-                        interpreted: utf8,
-                    }),
-                },
-                _ => (),
-            },
-            KbEvent::Modifiers { modifiers } => *modifiers_state.lock().unwrap() = modifiers,
-            _ => (),
-        })
-        .expect("Failed to map keyboard");
-
-        //
-        // Prepare shell so that we can create our shell surface
-        //
-        inner.lock().unwrap().set_shell(Some(
-            if let Ok(layer) = manager.instantiate_exact(
-                1,
-                |layer: NewProxy<zwlr_layer_shell_v1::ZwlrLayerShellV1>| {
-                    layer.implement_closure(|_, _| {}, ())
-                },
-            ) {
-                layer
-            } else {
-                panic!("server didn't advertise `zwlr_layer_shell_v1`");
-            },
-        ));
-
-        event_queue.sync_roundtrip().unwrap();
-
-        //
-        // Cursor processing
-        //
-        let pointer_clone = cmd_queue.clone();
-        seat.get_pointer(move |ptr| {
-            let mut pos: (u32, u32) = (0, 0);
-            let mut vert_scroll: f64 = 0.0;
-            let mut horiz_scroll: f64 = 0.0;
-            let mut btn: u32 = 0;
-            let mut btn_clicked = false;
-            ptr.implement_closure(
-                move |evt, _| match evt {
-                    wl_pointer::Event::Enter {
-                        surface_x,
-                        surface_y,
-                        ..
-                    } => {
-                        pos = (surface_x as u32, surface_y as u32);
-                    }
-                    wl_pointer::Event::Leave { .. } => {
-                        pos = (0, 0);
-                    }
-                    wl_pointer::Event::Motion {
-                        surface_x,
-                        surface_y,
-                        ..
-                    } => {
-                        pos = (surface_x as u32 * scale, surface_y as u32 * scale);
-                    }
-                    wl_pointer::Event::Axis { axis, value, .. } => {
-                        if axis == wl_pointer::Axis::VerticalScroll {
-                            vert_scroll += value;
-                        }
-                    }
-                    wl_pointer::Event::Button { button, state, .. } => match state {
-                        wl_pointer::ButtonState::Released => {
-                            btn = button;
-                            btn_clicked = true;
-                        }
-                        _ => {}
-                    },
-                    wl_pointer::Event::Frame => {
-                        if vert_scroll != 0.0 || horiz_scroll != 0.0 {
-                            pointer_clone.lock().unwrap().push_back(Cmd::MouseScroll {
-                                scroll: (horiz_scroll, vert_scroll),
-                                pos: pos,
-                            });
-                            vert_scroll = 0.0;
-                            horiz_scroll = 0.0;
-                        }
-                        if btn_clicked {
-                            pointer_clone
-                                .lock()
-                                .unwrap()
-                                .push_back(Cmd::MouseClick { btn: btn, pos: pos });
-                            btn_clicked = false;
-                        }
-                    }
-                    _ => {}
-                },
-                (),
-            )
-        })
-        .unwrap();
-
-        display.flush().unwrap();
-
-        App {
-            display: display,
-            event_queue: event_queue,
-            cmd_queue: cmd_queue,
-            pools: pools,
-            widget: None,
-            bg: bg,
-            inner: inner,
-            last_damage: None,
-            last_dim: (0, 0),
-        }
-    }
-}

src/buffer.rs

@@ -1,22 +1,195 @@
-use memmap::MmapMut;
+use std::{
+    fs::File,
+    io,
+    os::unix::io::{FromRawFd, RawFd},
+    time::SystemTime,
+    time::UNIX_EPOCH,
+};
+
+#[cfg(target_os = "linux")]
+use nix::sys::memfd;
+use nix::{
+    errno::Errno,
+    fcntl,
+    sys::{mman, stat},
+    unistd,
+};
+
+use memmap2::MmapMut;
+
+use wayland_client::{
+    Dispatch, QueueHandle,
+    protocol::{wl_buffer, wl_shm, wl_shm_pool},
+};
 
 use crate::color::Color;
+use crate::widgets::Geometry;
 
-pub struct Buffer<'a> {
-    buf: &'a mut MmapMut,
+fn create_shm_fd() -> io::Result<RawFd> {
+    // Only try memfd on linux
+    #[cfg(target_os = "linux")]
+    loop {
+        match memfd::memfd_create(c"wldash", memfd::MemFdCreateFlag::MFD_CLOEXEC) {
+            Ok(fd) => return Ok(fd),
+            Err(Errno::EINTR) => continue,
+            Err(Errno::ENOSYS) => break,
+            Err(errno) => return Err(io::Error::from(errno)),
+        }
+    }
+
+    // Fallback to using shm_open
+    let sys_time = SystemTime::now();
+    let mut mem_file_handle = format!(
+        "/wldash-{}",
+        sys_time.duration_since(UNIX_EPOCH).unwrap().subsec_nanos()
+    );
+    loop {
+        match mman::shm_open(
+            mem_file_handle.as_str(),
+            fcntl::OFlag::O_CREAT
+                | fcntl::OFlag::O_EXCL
+                | fcntl::OFlag::O_RDWR
+                | fcntl::OFlag::O_CLOEXEC,
+            stat::Mode::S_IRUSR | stat::Mode::S_IWUSR,
+        ) {
+            Ok(fd) => match mman::shm_unlink(mem_file_handle.as_str()) {
+                Ok(_) => return Ok(fd),
+                Err(errno) => match unistd::close(fd) {
+                    Ok(_) => return Err(io::Error::from(errno)),
+                    Err(errno) => return Err(io::Error::from(errno)),
+                },
+            },
+            Err(Errno::EEXIST) => {
+                // If a file with that handle exists then change the handle
+                mem_file_handle = format!(
+                    "/wldash-{}",
+                    sys_time.duration_since(UNIX_EPOCH).unwrap().subsec_nanos()
+                );
+                continue;
+            }
+            Err(Errno::EINTR) => continue,
+            Err(errno) => return Err(io::Error::from(errno)),
+        }
+    }
+}
+
+pub struct ShmBuffer {
+    // Keeps the memfd alive for as long as the mapping and pool exist.
+    #[allow(dead_code)]
+    pub file: File,
+    pub mmap: MmapMut,
+    pub pool: wl_shm_pool::WlShmPool,
+    pub buffer: wl_buffer::WlBuffer,
+    pub refcnt: u32,
+    pub last_damage: Vec<Geometry>,
+}
+
+impl ShmBuffer {
+    fn new<D>(
+        shm: &wl_shm::WlShm,
+        qh: &QueueHandle<D>,
+        width: i32,
+        height: i32,
+        stride: i32,
+        format: wl_shm::Format,
+    ) -> io::Result<ShmBuffer>
+    where
+        D: Dispatch<wl_shm_pool::WlShmPool, ()> + Dispatch<wl_buffer::WlBuffer, ()> + 'static,
+    {
+        let mem_fd = create_shm_fd()?;
+        let file = unsafe { File::from_raw_fd(mem_fd) };
+        file.set_len((height * stride) as u64)?;
+        let pool = shm.create_pool(mem_fd, height * stride, qh, ());
+        let mmap = unsafe { MmapMut::map_mut(&file)? };
+        let buffer = pool.create_buffer(0, width, height, stride, format, qh, ());
+
+        Ok(ShmBuffer {
+            refcnt: 0,
+            file,
+            mmap,
+            pool,
+            buffer,
+            last_damage: Vec::new(),
+        })
+    }
+
+    pub fn acquire(&mut self) {
+        self.refcnt += 1;
+    }
+
+    pub fn release(&mut self) {
+        // A compositor may release a buffer we never considered acquired
+        // (e.g. after a resize); never underflow and wedge the buffer.
+        self.refcnt = self.refcnt.saturating_sub(1);
+    }
+}
+
+pub struct BufferManager {
+    pub buffers: Vec<ShmBuffer>,
+}
+
+impl BufferManager {
+    pub fn new() -> BufferManager {
+        BufferManager {
+            buffers: Vec::new(),
+        }
+    }
+
+    pub fn clear_buffers(&mut self) {
+        for buf in self.buffers.iter_mut() {
+            buf.buffer.destroy();
+            buf.pool.destroy();
+        }
+        self.buffers.clear()
+    }
+
+    pub fn next_buffer(&mut self) -> Option<&mut ShmBuffer> {
+        self.buffers.iter_mut().find(|buf| buf.refcnt == 0)
+    }
+
+    pub fn add_buffer<D>(
+        &mut self,
+        wl_shm: &wl_shm::WlShm,
+        dimensions: (i32, i32),
+        qh: &QueueHandle<D>,
+    ) where
+        D: Dispatch<wl_shm_pool::WlShmPool, ()> + Dispatch<wl_buffer::WlBuffer, ()> + 'static,
+    {
+        let buf = ShmBuffer::new(
+            wl_shm,
+            qh,
+            dimensions.0,
+            dimensions.1,
+            dimensions.0 * 4,
+            wl_shm::Format::Argb8888,
+        )
+        .expect("unable to add buffer");
+        self.buffers.push(buf);
+    }
+}
+
+pub struct BufferView<'a> {
+    view: &'a mut [u32],
     dimensions: (u32, u32),
     subdimensions: Option<(u32, u32, u32, u32)>,
 }
 
-impl<'a> Buffer<'a> {
-    pub fn new(buf: &'a mut MmapMut, dimensions: (u32, u32)) -> Buffer {
-        Buffer {
-            buf: buf,
-            dimensions: dimensions,
+impl<'a> BufferView<'a> {
+    pub fn new(buf: &'a mut MmapMut, dimensions: (u32, u32)) -> BufferView<'a> {
+        let view = unsafe {
+            std::slice::from_raw_parts_mut(
+                buf.as_mut_ptr() as *mut u32,
+                (dimensions.0 * dimensions.1) as usize,
+            )
+        };
+        BufferView {
+            view,
+            dimensions,
             subdimensions: None,
         }
     }
 
+    #[inline]
     pub fn get_bounds(&self) -> (u32, u32, u32, u32) {
         if let Some(subdim) = self.subdimensions {
             subdim
@@ -25,68 +198,20 @@ impl<'a> Buffer<'a> {
         }
     }
 
-    pub fn get_signed_bounds(&self) -> (i32, i32, i32, i32) {
-        if let Some(subdim) = self.subdimensions {
-            (
-                subdim.0 as i32,
-                subdim.1 as i32,
-                subdim.2 as i32,
-                subdim.3 as i32,
-            )
-        } else {
-            (0, 0, self.dimensions.0 as i32, self.dimensions.1 as i32)
-        }
-    }
-
-    pub fn copy_to(&self, other: &mut Buffer, (x, y, width, height): (i32, i32, i32, i32)) {
-        debug_assert!(self.dimensions == other.dimensions);
-        debug_assert!(self.subdimensions.is_none() && other.subdimensions.is_none());
-
-        if x == 0 && width as u32 == self.dimensions.0 {
-            // Full-width copy
-            let offset = y as isize * self.dimensions.0 as isize;
-            let n = height as usize * self.dimensions.0 as usize;
-            unsafe {
-                std::ptr::copy(
-                    (self.buf.as_ptr() as *const u32).offset(offset),
-                    (other.buf.as_mut_ptr() as *mut u32).offset(offset),
-                    n,
-                );
-            }
-        } else {
-            // Row-by-row copy
-            for cur_y in y as isize..(y + height) as isize {
-                let offset = x as isize + cur_y as isize * self.dimensions.0 as isize;
-                unsafe {
-                    std::ptr::copy(
-                        (self.buf.as_ptr() as *const u32).offset(offset),
-                        (other.buf.as_mut_ptr() as *mut u32).offset(offset),
-                        width as usize,
-                    );
-                }
-            }
-        }
-    }
-
-    pub fn subdimensions(
-        &mut self,
-        subdimensions: (u32, u32, u32, u32),
-    ) -> Result<Buffer, ::std::io::Error> {
+    pub fn subdimensions(&mut self, subdimensions: (u32, u32, u32, u32)) -> BufferView<'_> {
         let bounds = self.get_bounds();
-        if subdimensions.0 + subdimensions.2 >= bounds.2
-            || subdimensions.1 + subdimensions.3 >= bounds.3
+        if cfg!(debug_assertions)
+            && (subdimensions.0 + subdimensions.2 > bounds.2
+                || subdimensions.1 + subdimensions.3 > bounds.3)
         {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                format!(
-                    "cannot create subdimensions larger than buffer: {:?} > {:?}",
-                    subdimensions, bounds
-                ),
-            ));
+            panic!(
+                "cannot create subdimensions larger than buffer: {:?} > {:?}",
+                subdimensions, bounds
+            );
         }
 
-        Ok(Buffer {
-            buf: self.buf,
+        BufferView {
+            view: self.view,
             dimensions: self.dimensions,
             subdimensions: Some((
                 subdimensions.0 + bounds.0,
@@ -94,23 +219,24 @@ impl<'a> Buffer<'a> {
                 subdimensions.2,
                 subdimensions.3,
             )),
-        })
+        }
     }
 
-    pub fn offset(&mut self, offset: (u32, u32)) -> Result<Buffer, ::std::io::Error> {
+    pub fn subgeometry(&mut self, geo: Geometry) -> BufferView<'_> {
+        self.subdimensions((geo.x, geo.y, geo.width, geo.height))
+    }
+
+    pub fn offset(&mut self, offset: (u32, u32)) -> BufferView<'_> {
         let bounds = self.get_bounds();
-        if offset.0 > bounds.2 || offset.1 > bounds.3 {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                format!(
-                    "cannot create offset outside buffer: {:?} > {:?}",
-                    offset, bounds
-                ),
-            ));
+        if cfg!(debug_assertions) && (offset.0 > bounds.2 || offset.1 > bounds.3) {
+            panic!(
+                "cannot create offset outside buffer: {:?} > {:?}",
+                offset, bounds
+            );
         }
 
-        Ok(Buffer {
-            buf: self.buf,
+        BufferView {
+            view: self.view,
             dimensions: self.dimensions,
             subdimensions: Some((
                 offset.0 + bounds.0,
@@ -118,63 +244,42 @@ impl<'a> Buffer<'a> {
                 bounds.2 - offset.0,
                 bounds.3 - offset.1,
             )),
-        })
-    }
-
-    pub fn memset(&mut self, c: &Color) {
-        if let Some(subdim) = self.subdimensions {
-            unsafe {
-                let ptr = self.buf.as_mut_ptr();
-                for y in subdim.1..(subdim.1 + subdim.3) {
-                    for x in subdim.0..(subdim.0 + subdim.2) {
-                        *((ptr as *mut u32).offset((x + y * self.dimensions.0) as isize)) =
-                            c.as_argb8888();
-                    }
-                }
-            }
-        } else {
-            unsafe {
-                let ptr = self.buf.as_mut_ptr();
-                for p in 0..(self.dimensions.0 * self.dimensions.1) {
-                    *((ptr as *mut u32).offset(p as isize)) = c.as_argb8888();
-                }
-            }
         }
     }
 
-    pub fn put(&mut self, pos: (u32, u32), c: &Color) -> Result<(), ::std::io::Error> {
-        let true_pos = if let Some(subdim) = self.subdimensions {
-            if pos.0 >= subdim.2 || pos.1 >= subdim.3 {
-                return Err(::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    format!(
-                        "put({:?}) is not within subdimensions of buffer ({:?})",
-                        pos, subdim
-                    ),
-                ));
+    pub fn memset(&mut self, c: Color) {
+        if let Some(subdim) = self.subdimensions {
+            for y in subdim.1..(subdim.1 + subdim.3) {
+                let start = (subdim.0 + y * self.dimensions.0) as usize;
+                let end = start + subdim.2 as usize;
+                self.view[start..end].fill(c.0);
             }
-            (pos.0 + subdim.0, pos.1 + subdim.1)
         } else {
-            if pos.0 >= self.dimensions.0 || pos.1 >= self.dimensions.1 {
-                return Err(::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    format!(
-                        "put({:?}) is not within dimensions of buffer ({:?})",
-                        pos, self.dimensions
-                    ),
-                ));
+            self.view.fill(c.0);
+        }
+    }
+
+    pub fn clear(&mut self) {
+        if let Some(subdim) = self.subdimensions {
+            for y in subdim.1..(subdim.1 + subdim.3) {
+                let start = (subdim.0 + y * self.dimensions.0) as usize;
+                let end = start + subdim.2 as usize;
+                self.view[start..end].fill(0x0);
             }
-            pos
-        };
+        } else {
+            self.view.fill(0x0);
+        }
+    }
 
-        unsafe {
-            let ptr = self
-                .buf
-                .as_mut_ptr()
-                .offset(4 * (true_pos.0 + (true_pos.1 * self.dimensions.0)) as isize);
-            *(ptr as *mut u32) = c.as_argb8888();
-        };
+    #[inline]
+    pub fn put_raw(&mut self, pos: (u32, u32), c: Color) {
+        self.view[(pos.0 + pos.1 * self.dimensions.0) as usize] = c.0
+    }
 
-        Ok(())
+    #[inline]
+    pub fn put_line_raw(&mut self, pos: (u32, u32), len: u32, c: Color) {
+        let start = (pos.0 + (pos.1 * self.dimensions.0)) as usize;
+        let len = len as usize;
+        self.view[start..start + len].fill(c.0);
     }
 }

src/cmd.rs

@@ -1,22 +0,0 @@
-use smithay_client_toolkit::keyboard::{KeyState, ModifiersState};
-
-pub enum Cmd {
-    Exit,
-    Draw,
-    ForceDraw,
-    ToggleVisible,
-    MouseClick {
-        btn: u32,
-        pos: (u32, u32),
-    },
-    MouseScroll {
-        scroll: (f64, f64),
-        pos: (u32, u32),
-    },
-    Keyboard {
-        key: u32,
-        key_state: KeyState,
-        modifiers_state: ModifiersState,
-        interpreted: Option<String>,
-    },
-}

src/color.rs

@@ -1,71 +1,42 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, Default)]
-pub struct Color {
-    red: f32,
-    green: f32,
-    blue: f32,
-    opacity: f32,
-}
+#[derive(Copy, Clone)]
+pub struct Color(pub u32);
 
 impl Color {
-    pub fn new(red: f32, green: f32, blue: f32, opacity: f32) -> Color {
-        let (red, green, blue, opacity) = clamp(red, green, blue, opacity);
-        Color {
-            red,
-            green,
-            blue,
-            opacity,
+    pub const WHITE: Color = Color(0xFFFFFFFF);
+    pub const GREY35: Color = Color(0xFF595959);
+    pub const GREY50: Color = Color(0xFF7F7F7F);
+    pub const GREY75: Color = Color(0xFFBFBFBF);
+    pub const GREY80: Color = Color(0xFFCCCCCC);
+    pub const RED: Color = Color(0xFFFF0000);
+    pub const YELLOW: Color = Color(0xFFFFFF00);
+    pub const LIGHTGREEN: Color = Color(0xFF7FFF7F);
+    pub const LIGHTORANGE: Color = Color(0xFFFFBF00);
+    pub const DARKORANGE: Color = Color(0xFFFF7F00);
+    pub const BUFF: Color = Color(0xFFFFBF7F);
+
+    #[allow(unused)]
+    pub fn new(red: u8, green: u8, blue: u8, opacity: u8) -> Color {
+        Color((opacity as u32) << 24 | (red as u32) << 16 | (green as u32) << 8 | (blue as u32))
+    }
+
+    fn red(self) -> u8 {
+        ((self.0 >> 16) & 0xFF) as u8
+    }
+    fn green(self) -> u8 {
+        ((self.0 >> 8) & 0xFF) as u8
+    }
+    fn blue(self) -> u8 {
+        (self.0 & 0xFF) as u8
+    }
+
+    pub fn alpha(self, alpha: f32) -> Color {
+        unsafe {
+            Color(
+                (255. * alpha).to_int_unchecked::<u32>() << 24
+                    | (self.red() as f32 * alpha).to_int_unchecked::<u32>() << 16
+                    | (self.green() as f32 * alpha).to_int_unchecked::<u32>() << 8
+                    | (self.blue() as f32 * alpha).to_int_unchecked::<u32>(),
+            )
         }
     }
-
-    pub fn blend(&self, other: &Color, ratio: f32) -> Color {
-        let ratio = clamp_f32(ratio, 0.0, 1.0);
-
-        Color {
-            red: blend_f32(self.red, other.red, ratio),
-            green: blend_f32(self.green, other.green, ratio),
-            blue: blend_f32(self.blue, other.blue, ratio),
-            opacity: blend_f32(self.opacity, other.opacity, ratio),
-        }
-    }
-
-    #[inline]
-    pub fn as_argb8888(&self) -> u32 {
-        ((255.0 * self.opacity) as u32 & 0xFF) << 24
-            | ((255.0 * self.red) as u32 & 0xFF) << 16
-            | ((255.0 * self.green) as u32 & 0xFF) << 8
-            | ((255.0 * self.blue) as u32 & 0xFF)
-    }
-}
-
-#[inline]
-fn clamp(r: f32, g: f32, b: f32, o: f32) -> (f32, f32, f32, f32) {
-    clamp_naive(r, g, b, o)
-}
-
-#[inline]
-fn clamp_naive(r: f32, g: f32, b: f32, o: f32) -> (f32, f32, f32, f32) {
-    (
-        clamp_f32(r, 0.0, 1.0),
-        clamp_f32(g, 0.0, 1.0),
-        clamp_f32(b, 0.0, 1.0),
-        clamp_f32(o, 0.0, 1.0),
-    )
-}
-
-#[inline]
-fn clamp_f32(v: f32, a: f32, b: f32) -> f32 {
-    if v > b {
-        b
-    } else if v < a {
-        a
-    } else {
-        v
-    }
-}
-
-#[inline]
-fn blend_f32(a: f32, b: f32, r: f32) -> f32 {
-    a + ((b - a) * r)
 }

src/config.rs

@@ -1,237 +1,387 @@
-use crate::cmd::Cmd;
-use crate::color::Color;
-use crate::widget;
-use crate::widgets;
-use serde::{Deserialize, Serialize};
-use std::default::Default;
-use std::sync::mpsc::Sender;
+use serde::{self, Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
+use std::collections::HashMap;
+use std::default::Default;
+use std::sync::{Arc, Mutex};
+
+use crate::{
+    event::Events,
+    fonts::{FontMap, find_font},
+    widgets::{
+        Backlight, Battery, Calendar, Clock, Date, HorizontalLayout, IndexedLayout, Interface,
+        InvertedHorizontalLayout, InvertedVerticalLayout, Layout, Line, Margin, PulseAudio,
+        VerticalLayout, Widget as RealWidget,
+    },
+};
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum OperationMode {
+    LayerSurface((u32, u32)),
+    XdgToplevel,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum Widget {
     Margin {
         margins: (u32, u32, u32, u32),
         widget: Box<Widget>,
     },
-    Fixed {
-        width: u32,
-        height: u32,
-        widget: Box<Widget>,
-    },
-    HorizontalLayout(Vec<Box<Widget>>),
-    VerticalLayout(Vec<Box<Widget>>),
+    HorizontalLayout(Vec<Widget>),
+    InvertedHorizontalLayout(Vec<Widget>),
+    VerticalLayout(Vec<Widget>),
+    InvertedVerticalLayout(Vec<Widget>),
+    HorizontalLine(u32),
+    VerticalLine(u32),
     Clock {
+        font: Option<String>,
         font_size: f32,
     },
     Date {
+        font: Option<String>,
         font_size: f32,
     },
     Calendar {
+        font_primary: Option<String>,
+        font_secondary: Option<String>,
         font_size: f32,
-        sections: u32,
+        sections_x: i32,
+        sections_y: i32,
     },
     Launcher {
+        font: Option<String>,
         font_size: f32,
-        length: u32,
-        #[serde(default)]
-        app_opener: String,
-        #[serde(default)]
-        term_opener: String,
-        #[serde(default)]
-        url_opener: String,
+        launch_cmd: Option<String>,
     },
     Battery {
+        font: Option<String>,
         font_size: f32,
-        length: u32,
     },
     Backlight {
+        device: Option<String>,
+        font: Option<String>,
         font_size: f32,
-        length: u32,
     },
-    #[cfg(feature = "pulseaudio-widget")]
     PulseAudio {
+        font: Option<String>,
         font_size: f32,
-        length: u32,
     },
-    #[cfg(feature = "alsa-widget")]
-    AlsaSound {
-        font_size: f32,
-        length: u32,
-    },
-    NetworkManager {
-        font_size: f32,
-        length: u32,
+}
+
+impl Default for OperationMode {
+    fn default() -> OperationMode {
+        OperationMode::LayerSurface((1024, 768))
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "snake_case")]
+pub struct Config {
+    pub font_paths: Option<HashMap<String, String>>,
+    pub widget: Widget,
+    pub mode: OperationMode,
+    pub background: Option<u32>,
+    pub server: Option<bool>,
+}
+
+impl Config {
+    pub fn generate_v1() -> Config {
+        let has_battery = Battery::detect();
+        let has_backlight = Backlight::detect();
+        let sans = find_font("sans");
+        let monospace = find_font("monospace");
+
+        let mut bars = Vec::new();
+        if has_battery {
+            bars.push(Widget::Margin {
+                margins: (0, 0, 0, 8),
+                widget: Box::new(Widget::Battery {
+                    font: None,
+                    font_size: 24.,
+                }),
+            });
+        }
+        if has_backlight {
+            bars.push(Widget::Margin {
+                margins: (0, 0, 0, 8),
+                widget: Box::new(Widget::Backlight {
+                    device: None,
+                    font: None,
+                    font_size: 24.,
+                }),
+            });
+        }
+        bars.push(Widget::Margin {
+            margins: (0, 0, 0, 8),
+            widget: Box::new(Widget::PulseAudio {
+                font: None,
+                font_size: 24.,
+            }),
+        });
+
+        let widget = Widget::Margin {
+            margins: (20, 20, 20, 20),
+            widget: Box::new(Widget::VerticalLayout(vec![
+                Widget::HorizontalLayout(vec![
+                    Widget::VerticalLayout(vec![
+                        Widget::Date {
+                            font: None,
+                            font_size: 48.,
+                        },
+                        Widget::Clock {
+                            font: None,
+                            font_size: 256.,
+                        },
+                    ]),
+                    Widget::Margin {
+                        margins: (88, 0, 0, 0),
+                        widget: Box::new(Widget::VerticalLayout(bars)),
+                    },
+                ]),
+                Widget::Calendar {
+                    font_primary: None,
+                    font_secondary: None,
+                    font_size: 36.,
+                    sections_x: 3,
+                    sections_y: 1,
+                },
+                Widget::Launcher {
+                    font: None,
+                    font_size: 32.,
+                    launch_cmd: None,
+                },
+            ])),
+        };
+
+        let map = HashMap::from([
+            ("sans".to_string(), sans),
+            ("monospace".to_string(), monospace),
+        ]);
+
+        Config {
+            font_paths: Some(map),
+            widget,
+            mode: OperationMode::LayerSurface((1024, 768)),
+            background: Some(0xFAFAFAFA),
+            server: None,
+        }
+    }
+
+    pub fn generate_v2(clay: bool) -> Config {
+        let has_battery = Battery::detect();
+        let has_backlight = Backlight::detect();
+        let sans = find_font("sans");
+        let monospace = find_font("monospace");
+
+        let mut bars = Vec::new();
+        if has_battery {
+            bars.push(Widget::Margin {
+                margins: (16, 8, 8, 0),
+                widget: Box::new(Widget::Battery {
+                    font: None,
+                    font_size: 24.,
+                }),
+            });
+        }
+        if has_backlight {
+            bars.push(Widget::Margin {
+                margins: (16, 8, 8, 0),
+                widget: Box::new(Widget::Backlight {
+                    device: None,
+                    font: None,
+                    font_size: 24.,
+                }),
+            });
+        }
+        bars.push(Widget::Margin {
+            margins: (16, 8, 8, 0),
+            widget: Box::new(Widget::PulseAudio {
+                font: None,
+                font_size: 24.,
+            }),
+        });
+
+        let widget = Widget::VerticalLayout(vec![
+            Widget::HorizontalLayout(vec![
+                Widget::Margin {
+                    margins: (8, 0, 0, 0),
+                    widget: Box::new(Widget::Clock {
+                        font: None,
+                        font_size: 128.,
+                    }),
+                },
+                Widget::Margin {
+                    margins: (16, 64, 0, 0),
+                    widget: Box::new(Widget::Date {
+                        font: None,
+                        font_size: 48.,
+                    }),
+                },
+                Widget::VerticalLayout(bars),
+            ]),
+            Widget::HorizontalLine(1),
+            Widget::InvertedHorizontalLayout(vec![
+                Widget::Margin {
+                    margins: (16, 8, 16, 0),
+                    widget: Box::new(Widget::Calendar {
+                        font_primary: None,
+                        font_secondary: None,
+                        font_size: 24.,
+                        sections_x: 1,
+                        sections_y: if clay { -1 } else { 3 },
+                    }),
+                },
+                Widget::VerticalLine(1),
+                Widget::Margin {
+                    margins: (8, 0, 0, 0),
+                    widget: Box::new(Widget::Launcher {
+                        font: None,
+                        font_size: 32.,
+                        launch_cmd: None,
+                    }),
+                },
+            ]),
+        ]);
+
+        let map = HashMap::from([
+            ("sans".to_string(), sans),
+            ("monospace".to_string(), monospace),
+        ]);
+
+        Config {
+            font_paths: Some(map),
+            widget,
+            mode: if clay {
+                OperationMode::XdgToplevel
+            } else {
+                OperationMode::LayerSurface((1024, 1))
+            },
+            background: Some(0xFAFAFAFA),
+            server: None,
+        }
+    }
+}
+
+fn leak_or_default(v: Option<String>, d: &'static str) -> &'static str {
+    match v {
+        Some(v) => Box::leak(v.into_boxed_str()),
+        None => d,
+    }
+}
+
+fn leak_or_none(v: Option<String>) -> Option<&'static str> {
+    match v {
+        Some(v) => Some(Box::leak(v.into_boxed_str())),
+        None => None,
     }
 }
 
 impl Widget {
-    pub fn construct(self, tx: Sender<Cmd>) -> Option<Box<dyn widget::Widget + Send>> {
+    pub fn construct_widgets(
+        self,
+        v: &mut Vec<Box<dyn RealWidget>>,
+        fm: &mut FontMap,
+        events: &Arc<Mutex<Events>>,
+    ) {
         match self {
-            Widget::Margin { margins, widget } => match widget.construct(tx.clone()) {
-                Some(w) => Some(widget::Margin::new(margins, w)),
-                None => None,
-            },
-            Widget::Fixed {
-                width,
-                height,
-                widget,
-            } => match widget.construct(tx.clone()) {
-                Some(w) => Some(widget::Fixed::new((width, height), w)),
-                None => None,
-            },
-            Widget::HorizontalLayout(widgets) => Some(widget::HorizontalLayout::new(
-                widgets
-                    .into_iter()
-                    .map(|x| x.construct(tx.clone()))
-                    .filter(|x| x.is_some())
-                    .map(|x| x.unwrap())
-                    .collect(),
-            )),
-            Widget::VerticalLayout(widgets) => Some(widget::VerticalLayout::new(
-                widgets
-                    .into_iter()
-                    .map(|x| x.construct(tx.clone()))
-                    .filter(|x| x.is_some())
-                    .map(|x| x.unwrap())
-                    .collect(),
-            )),
-            Widget::Clock { font_size } => Some(widgets::clock::Clock::new(font_size)),
-            Widget::Date { font_size } => Some(widgets::date::Date::new(font_size)),
+            Widget::Margin { widget, .. } => widget.construct_widgets(v, fm, events),
+            Widget::HorizontalLayout(widgets) => widgets
+                .into_iter()
+                .for_each(|w| w.construct_widgets(v, fm, events)),
+            Widget::InvertedHorizontalLayout(widgets) => widgets
+                .into_iter()
+                .for_each(|w| w.construct_widgets(v, fm, events)),
+            Widget::VerticalLayout(widgets) => widgets
+                .into_iter()
+                .for_each(|w| w.construct_widgets(v, fm, events)),
+            Widget::InvertedVerticalLayout(widgets) => widgets
+                .into_iter()
+                .for_each(|w| w.construct_widgets(v, fm, events)),
+            Widget::HorizontalLine(width) => v.push(Box::new(Line::new(width, false))),
+            Widget::VerticalLine(width) => v.push(Box::new(Line::new(width, true))),
+            Widget::Clock { font, font_size } => v.push(Box::new(Clock::new(
+                fm,
+                leak_or_default(font, "sans"),
+                font_size,
+            ))),
+            Widget::Date { font, font_size } => v.push(Box::new(Date::new(
+                fm,
+                leak_or_default(font, "sans"),
+                font_size,
+            ))),
             Widget::Calendar {
+                font_primary,
+                font_secondary,
                 font_size,
-                sections,
-            } => Some(widgets::calendar::Calendar::new(font_size, sections)),
+                sections_x,
+                sections_y,
+            } => v.push(Box::new(Calendar::new(
+                fm,
+                leak_or_default(font_primary, "monospace"),
+                leak_or_default(font_secondary, "sans"),
+                font_size,
+                sections_x,
+                sections_y,
+            ))),
             Widget::Launcher {
+                font,
                 font_size,
-                length,
-                app_opener,
-                term_opener,
-                url_opener,
-            } => Some(widgets::launcher::Launcher::new(
+                launch_cmd,
+            } => v.push(Box::new(Interface::new(
+                events.clone(),
+                fm,
+                leak_or_default(font, "sans"),
                 font_size,
-                length,
-                tx.clone(),
-                app_opener,
-                term_opener,
-                if url_opener.len() == 0 {
-                    "xdg_open ".to_string()
-                } else {
-                    url_opener
-                },
-            )),
-            Widget::Battery { font_size, length } => {
-                match widgets::battery::UpowerBattery::new(font_size, length, tx.clone()) {
-                    Ok(w) => Some(w),
-                    Err(_) => None,
-                }
+                launch_cmd,
+            ))),
+            Widget::Battery { font, font_size } => v.push(Box::new(Battery::new(
+                events.clone(),
+                fm,
+                leak_or_default(font, "sans"),
+                font_size,
+            ))),
+            Widget::Backlight {
+                device,
+                font,
+                font_size,
+            } => v.push(Box::new(Backlight::new(
+                leak_or_none(device),
+                fm,
+                leak_or_default(font, "sans"),
+                font_size,
+            ))),
+            Widget::PulseAudio { font, font_size } => v.push(Box::new(PulseAudio::new(
+                events.clone(),
+                fm,
+                Box::leak(font.unwrap_or_else(|| "sans".to_string()).into_boxed_str()),
+                font_size,
+            ))),
+        }
+    }
+
+    pub fn construct_layout(&self, idx: &mut usize) -> Box<dyn Layout> {
+        match self {
+            Widget::Margin { margins, widget } => {
+                Margin::new(widget.construct_layout(idx), *margins)
             }
-            Widget::Backlight { font_size, length } => {
-                match widgets::backlight::Backlight::new(font_size, length) {
-                    Ok(w) => Some(w),
-                    Err(_) => None,
-                }
+            Widget::HorizontalLayout(widgets) => {
+                HorizontalLayout::new(widgets.iter().map(|w| w.construct_layout(idx)).collect())
             }
-            #[cfg(feature = "pulseaudio-widget")]
-            Widget::PulseAudio { font_size, length } => {
-                match widgets::audio::PulseAudio::new(font_size, length, tx.clone()) {
-                    Ok(w) => Some(w),
-                    Err(_) => None,
-                }
-            }
-            #[cfg(feature = "alsa-widget")]
-            Widget::AlsaSound { font_size, length } => {
-                match widgets::audio::Alsa::new(font_size, length) {
-                    Ok(w) => Some(w),
-                    Err(_) => None,
-                }
-            }
-            Widget::NetworkManager { font_size, length } => {
-                match widgets::networkmanager::NetworkManager::new(font_size, length, tx.clone()) {
-                    Ok(w) => Some(w),
-                    Err(_) => None,
-                }
+            Widget::InvertedHorizontalLayout(widgets) => InvertedHorizontalLayout::new(
+                widgets.iter().map(|w| w.construct_layout(idx)).collect(),
+            ),
+            Widget::VerticalLayout(widgets) => {
+                VerticalLayout::new(widgets.iter().map(|w| w.construct_layout(idx)).collect())
             }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub enum OutputMode {
-    All,
-    Active,
-}
-
-impl Default for OutputMode {
-    fn default() -> Self {
-        OutputMode::Active
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct Config {
-    pub output_mode: OutputMode,
-    pub scale: u32,
-    pub background: Color,
-    pub widget: Widget,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Config {
-            widget: Widget::Margin {
-                margins: (20, 20, 20, 20),
-                widget: Box::new(Widget::VerticalLayout(vec![
-                    Box::new(Widget::HorizontalLayout(vec![
-                        Box::new(Widget::Margin {
-                            margins: (0, 88, 0, 32),
-                            widget: Box::new(Widget::VerticalLayout(vec![
-                                Box::new(Widget::Date { font_size: 64.0 }),
-                                Box::new(Widget::Clock { font_size: 256.0 }),
-                            ])),
-                        }),
-                        Box::new(Widget::VerticalLayout(vec![
-                            Box::new(Widget::Margin {
-                                margins: (0, 0, 0, 8),
-                                widget: Box::new(Widget::Battery {
-                                    font_size: 24.0,
-                                    length: 600,
-                                }),
-                            }),
-                            Box::new(Widget::Margin {
-                                margins: (0, 0, 0, 8),
-                                widget: Box::new(Widget::Backlight {
-                                    font_size: 24.0,
-                                    length: 600,
-                                }),
-                            }),
-                            #[cfg(feature = "pulseaudio-widget")]
-                            Box::new(Widget::Margin {
-                                margins: (0, 0, 0, 8),
-                                widget: Box::new(Widget::PulseAudio {
-                                    font_size: 24.0,
-                                    length: 600,
-                                }),
-                            }),
-                        ])),
-                    ])),
-                    Box::new(Widget::Calendar {
-                        font_size: 16.0,
-                        sections: 3,
-                    }),
-                    Box::new(Widget::Launcher {
-                        font_size: 32.0,
-                        length: 1200,
-                        app_opener: "".to_string(),
-                        term_opener: "".to_string(),
-                        url_opener: "".to_string(),
-                    }),
-                ])),
-            },
-            output_mode: Default::default(),
-            scale: 1,
-            background: Color::new(0.0, 0.0, 0.0, 0.9),
+            Widget::InvertedVerticalLayout(widgets) => InvertedVerticalLayout::new(
+                widgets.iter().map(|w| w.construct_layout(idx)).collect(),
+            ),
+            _ => IndexedLayout::new({
+                let i = *idx;
+                *idx += 1;
+                i
+            }),
         }
     }
 }

src/configfmt.rs

@@ -1,61 +0,0 @@
-use serde::{de::DeserializeOwned, Serialize};
-use std::io::BufRead;
-
-pub enum ConfigFmt {
-    #[cfg(feature = "yaml-cfg")]
-    Yaml,
-    #[cfg(feature = "json-cfg")]
-    Json,
-}
-
-pub const CONFIG_NAMES: &'static [&'static str] = &[
-    #[cfg(feature = "yaml-cfg")]
-    "config.yaml",
-    #[cfg(feature = "json-cfg")]
-    "config.json",
-];
-
-impl ConfigFmt {
-    #[inline]
-    pub fn new(ext: &str) -> Option<Self> {
-        match ext {
-            #[cfg(feature = "yaml-cfg")]
-            "yaml" => Some(ConfigFmt::Yaml),
-            #[cfg(feature = "json-cfg")]
-            "json" => Some(ConfigFmt::Json),
-            _ => None,
-        }
-    }
-    #[inline]
-    pub fn from_reader<B: BufRead, T: DeserializeOwned>(&self, r: B) -> T {
-        match self {
-            #[cfg(feature = "yaml-cfg")]
-            ConfigFmt::Yaml => serde_yaml::from_reader(r).unwrap(),
-            #[cfg(feature = "json-cfg")]
-            ConfigFmt::Json => serde_json::from_reader(r).unwrap(),
-        }
-    }
-    #[inline]
-    pub fn to_string<T: Serialize + ?Sized>(&self, src: &T) -> String {
-        match self {
-            #[cfg(feature = "yaml-cfg")]
-            ConfigFmt::Yaml => serde_yaml::to_string(&src).unwrap(),
-            #[cfg(feature = "json-cfg")]
-            ConfigFmt::Json => serde_json::to_string_pretty(&src).unwrap(),
-        }
-    }
-}
-
-impl Default for ConfigFmt {
-    fn default() -> Self {
-        // attributes require curly braces to work
-        #[cfg(feature = "yaml-cfg")]
-        {
-            ConfigFmt::Yaml
-        }
-        #[cfg(all(feature = "json-cfg", not(feature = "yaml-cfg")))]
-        {
-            ConfigFmt::Json
-        }
-    }
-}

src/desktop.rs

@@ -1,101 +0,0 @@
-extern crate ini;
-use ini::{Ini, ParseOption};
-use std::cmp::Ordering;
-use std::env;
-use std::error::Error;
-use std::fs;
-use std::io::Error as io_error;
-use std::io::ErrorKind;
-
-#[derive(Clone, Debug, Eq)]
-pub struct Desktop {
-    pub entry_type: String,
-    pub name: String,
-    pub no_display: bool,
-    pub hidden: bool,
-    pub exec: Option<String>,
-    pub url: Option<String>,
-    pub term: bool,
-}
-
-impl Desktop {
-    fn parse(f: &str) -> Result<Desktop, Box<dyn Error>> {
-        let file = Ini::load_from_file_opt(
-            f,
-            ParseOption {
-                enabled_quote: false,
-                enabled_escape: false,
-            },
-        )?;
-        match file.section(Some("Desktop Entry")) {
-            Some(desktop) => Ok(Desktop {
-                entry_type: desktop.get("Type").unwrap_or(&"".to_string()).to_string(),
-                name: desktop.get("Name").unwrap_or(&"".to_string()).to_string(),
-                term: desktop.get("Terminal").unwrap_or(&"".to_string()) == "true",
-                no_display: desktop.get("NoDisplay").unwrap_or(&"".to_string()) == "true",
-                hidden: desktop.get("Hidden").unwrap_or(&"".to_string()) == "true",
-                exec: desktop.get("Exec").map(|x| x.to_string()),
-                url: desktop.get("URL").map(|x| x.to_string()),
-            }),
-            None => Err(Box::new(io_error::new(
-                ErrorKind::NotFound,
-                "no desktop entry in file",
-            ))),
-        }
-    }
-
-    fn parse_dir(d: &str) -> Result<Vec<Desktop>, Box<dyn Error>> {
-        let mut files: Vec<Desktop> = Vec::with_capacity(16);
-        for entry in fs::read_dir(d)? {
-            let entry = entry?;
-            let path = entry.path();
-
-            if let Ok(d) = Desktop::parse(path.to_str().unwrap()) {
-                files.push(d)
-            }
-        }
-
-        Ok(files)
-    }
-}
-
-impl Ord for Desktop {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.name.cmp(&other.name)
-    }
-}
-
-impl PartialOrd for Desktop {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl PartialEq for Desktop {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name
-    }
-}
-
-pub fn load_desktop_files() -> Vec<Desktop> {
-    let home = env::var_os("HOME").unwrap().into_string().unwrap();
-
-    let xdg_data_home = match env::var_os("XDG_DATA_HOME") {
-        Some(s) => s.into_string().unwrap(),
-        None => format!("{}/.local/share", home).to_string(),
-    };
-    let xdg_data_dirs = match env::var_os("XDG_DATA_DIRS") {
-        Some(s) => s.into_string().unwrap(),
-        None => "/usr/local/share:/usr/share".to_string(),
-    };
-
-    std::iter::once(xdg_data_home.as_str())
-        .chain(xdg_data_dirs.split(":"))
-        .map(|p| Desktop::parse_dir(&format!("{}/applications", p)))
-        .filter_map(Result::ok)
-        .flatten()
-        .filter(|d| {
-            !d.hidden && !d.no_display && (d.entry_type == "Application" || d.entry_type == "Link")
-        })
-        .collect()
-}

src/doublemempool.rs

@@ -1,38 +0,0 @@
-use smithay_client_toolkit::utils::MemPool;
-use wayland_client::protocol::wl_shm;
-
-pub struct DoubleMemPool {
-    pool1: MemPool,
-    pool2: MemPool,
-    switch: bool,
-}
-
-impl DoubleMemPool {
-    pub fn new(shm: &wl_shm::WlShm) -> ::std::io::Result<DoubleMemPool> {
-        Ok(DoubleMemPool {
-            pool1: MemPool::new(shm, move || {})?,
-            pool2: MemPool::new(shm, move || {})?,
-            switch: false,
-        })
-    }
-
-    pub fn pool(&mut self) -> Option<(&mut MemPool, &mut MemPool)> {
-        let switch = self.switch;
-        self.switch = !self.switch;
-        let (last, cur) = if !switch {
-            (&mut self.pool2, &mut self.pool1)
-        } else {
-            (&mut self.pool1, &mut self.pool2)
-        };
-
-        if cur.is_used() {
-            None
-        } else {
-            Some((last, cur))
-        }
-    }
-
-    pub fn never_mind(&mut self) {
-        self.switch = !self.switch;
-    }
-}

src/draw.rs

@@ -1,42 +1,26 @@
-use crate::buffer::Buffer;
-use crate::color::Color;
+use crate::buffer::BufferView;
+use crate::{color::Color, fonts::FontRef};
 
+use rusttype::{Scale, point};
 use std::collections::HashMap;
 
-use lazy_static::lazy_static;
-use rusttype::{point, Font as RustFont, Scale};
-
-pub static DEJAVUSANS_MONO_FONT_DATA: &'static [u8] =
-    include_bytes!("../fonts/dejavu/DejaVuSansMono.ttf");
-pub static ROBOTO_REGULAR_FONT_DATA: &'static [u8] = include_bytes!("../fonts/Roboto-Regular.ttf");
-
-lazy_static! {
-    pub static ref DEJAVUSANS_MONO: RustFont<'static> =
-        RustFont::from_bytes(DEJAVUSANS_MONO_FONT_DATA as &[u8])
-            .expect("error constructing DejaVuSansMono");
-    pub static ref ROBOTO_REGULAR: RustFont<'static> =
-        RustFont::from_bytes(ROBOTO_REGULAR_FONT_DATA as &[u8])
-            .expect("error constructing Roboto-Regular");
-}
-
 struct CachedGlyph {
     dimensions: (u32, u32),
     origin: (i32, i32),
     render: Vec<f32>,
+    advance: i32,
 }
 
 impl CachedGlyph {
-    fn new(font: &RustFont, size: f32, ch: char) -> CachedGlyph {
+    fn new(font: FontRef, size: f32, ch: char) -> CachedGlyph {
         let scale = Scale::uniform(size);
         let v_metrics = font.v_metrics(scale);
-        let glyph = font
-            .glyph(ch)
-            .scaled(scale)
-            .positioned(point(0.0, v_metrics.ascent));
+        let glyph = font.glyph(ch).scaled(scale);
+        let advance = glyph.h_metrics().advance_width as i32;
+        let glyph = glyph.positioned(point(0.0, v_metrics.ascent));
 
         if let Some(bounding_box) = glyph.pixel_bounding_box() {
             let origin = (bounding_box.min.x, bounding_box.min.y);
-
             let dimensions = (
                 (bounding_box.max.x - bounding_box.min.x) as u32,
                 (bounding_box.max.y - bounding_box.min.y) as u32,
@@ -47,32 +31,41 @@ impl CachedGlyph {
                 render[pos as usize] = o;
             });
             CachedGlyph {
-                origin: origin,
-                dimensions: dimensions,
-                render: render,
+                origin,
+                dimensions,
+                render,
+                advance,
             }
         } else {
             CachedGlyph {
                 origin: (0, 0),
-                dimensions: ((size / 4.0) as u32, 0),
+                dimensions: (0, 0),
                 render: Vec::new(),
+                advance: (size / 4.0) as i32,
             }
         }
     }
 
-    fn draw(&self, buf: &mut Buffer, pos: (i32, i32), bg: &Color, c: &Color) {
+    fn draw(&self, buf: &mut BufferView, pos: (i32, i32), c: Color) {
+        let bounds = buf.get_bounds();
+        if pos.0 as u32 + self.dimensions.0 > bounds.2 {
+            return;
+        }
+
+        let offset = (bounds.0 as i32, bounds.1 as i32);
+        let width = self.dimensions.0 as i32 - 1;
         let mut x = 0;
         let mut y = 0;
         for v in &self.render {
-            let _ = buf.put(
+            buf.put_raw(
                 (
-                    (x + pos.0 + self.origin.0) as u32,
-                    (y + pos.1 + self.origin.1) as u32,
+                    (x + pos.0 + self.origin.0 + offset.0) as u32,
+                    (y + pos.1 + self.origin.1 + offset.1) as u32,
                 ),
-                &bg.blend(&c, *v),
+                c.alpha(*v),
             );
 
-            if x == self.dimensions.0 as i32 - 1 {
+            if x == width {
                 y += 1;
                 x = 0;
             } else {
@@ -82,24 +75,30 @@ impl CachedGlyph {
     }
 }
 
-pub struct Font {
+pub struct Font<'a> {
     glyphs: HashMap<char, CachedGlyph>,
-    font: &'static RustFont<'static>,
+    font: FontRef<'a>,
     size: f32,
 }
 
-impl Font {
-    pub fn new(font: &'static RustFont, size: f32) -> Font {
+impl<'a> Font<'a> {
+    pub fn new(font: FontRef<'a>, size: f32) -> Font<'a> {
         Font {
             glyphs: HashMap::new(),
-            font: font,
-            size: size,
+            font,
+            size,
         }
     }
 
+    pub fn height(&self) -> f32 {
+        let scale = Scale::uniform(self.size);
+        let m = self.font.v_metrics(scale);
+        m.ascent - m.descent
+    }
+
     pub fn add_str_to_cache(&mut self, s: &str) {
         for ch in s.chars() {
-            if self.glyphs.get(&ch).is_none() {
+            if !self.glyphs.contains_key(&ch) {
                 let glyph = CachedGlyph::new(self.font, self.size, ch);
                 self.glyphs.insert(ch, glyph);
             }
@@ -108,9 +107,8 @@ impl Font {
 
     pub fn draw_text(
         &self,
-        buf: &mut Buffer,
-        bg: &Color,
-        c: &Color,
+        buf: &mut BufferView,
+        c: Color,
         s: &str,
     ) -> Result<(u32, u32), ::std::io::Error> {
         let mut x_off = 0;
@@ -120,10 +118,10 @@ impl Font {
             let glyph = match self.glyphs.get(&ch) {
                 Some(glyph) => glyph,
                 None => {
-                    return Err(::std::io::Error::new(
-                        ::std::io::ErrorKind::Other,
-                        format!("glyph for {:} not in cache", ch),
-                    ))
+                    return Err(::std::io::Error::other(format!(
+                        "glyph for {:} not in cache",
+                        ch
+                    )));
                 }
             };
             glyphs.push(glyph);
@@ -132,29 +130,118 @@ impl Font {
             }
         }
         for glyph in glyphs {
-            glyph.draw(buf, (x_off, -off), bg, c);
-            x_off += glyph.dimensions.0 as i32 + glyph.origin.0;
+            glyph.draw(buf, (x_off, -off), c);
+            x_off += glyph.advance;
         }
 
         Ok((x_off as u32, self.size as u32))
     }
 
+    pub fn draw_text_with_cursor(
+        &self,
+        buf: &mut BufferView,
+        c: Color,
+        s: &str,
+        cursor: usize,
+    ) -> Result<(u32, u32), ::std::io::Error> {
+        let mut x_off: i32 = 0;
+        let mut off: i32 = 0;
+        let mut glyphs = Vec::with_capacity(s.len());
+        for ch in s.chars() {
+            let glyph = match self.glyphs.get(&ch) {
+                Some(glyph) => glyph,
+                None => {
+                    return Err(::std::io::Error::other(format!(
+                        "glyph for {:} not in cache",
+                        ch
+                    )));
+                }
+            };
+            glyphs.push(glyph);
+            if glyph.origin.1 < off {
+                off = glyph.origin.1
+            }
+        }
+
+        let height = self.size.ceil() as u32;
+        for (i, glyph) in glyphs.iter().enumerate() {
+            if i == cursor {
+                self.draw_cursor(buf, c, x_off as u32, height)?;
+            }
+            glyph.draw(buf, (x_off, -off), c);
+            x_off += glyph.advance;
+        }
+        if cursor == glyphs.len() {
+            self.draw_cursor(buf, c, x_off as u32, height)?;
+        }
+
+        Ok((x_off as u32, self.size as u32))
+    }
+
+    fn draw_cursor(
+        &self,
+        buf: &mut BufferView,
+        c: Color,
+        offset: u32,
+        height: u32,
+    ) -> Result<(), ::std::io::Error> {
+        // draw cursor
+        let bounds = buf.get_bounds();
+        if offset + 1 > bounds.2 {
+            return Ok(());
+        }
+        for i in bounds.1 + 1..height + bounds.1 {
+            buf.put_raw((bounds.0 + offset, i), c);
+        }
+        Ok(())
+    }
+
+    pub fn auto_widest(&mut self, s: &str) -> Result<u32, ::std::io::Error> {
+        self.add_str_to_cache(s);
+        let mut max = 0;
+        for ch in s.chars() {
+            let glyph = match self.glyphs.get(&ch) {
+                Some(glyph) => glyph,
+                None => {
+                    return Err(::std::io::Error::other(format!(
+                        "glyph for {:} not in cache",
+                        ch
+                    )));
+                }
+            };
+            let width = glyph.advance;
+            if width > max {
+                max = width
+            }
+        }
+        Ok(max as u32)
+    }
+
     pub fn auto_draw_text(
         &mut self,
-        buf: &mut Buffer,
-        bg: &Color,
-        c: &Color,
+        buf: &mut BufferView,
+        c: Color,
         s: &str,
     ) -> Result<(u32, u32), ::std::io::Error> {
         self.add_str_to_cache(s);
-        self.draw_text(buf, bg, c, s)
+        self.draw_text(buf, c, s)
+    }
+
+    pub fn auto_draw_text_with_cursor(
+        &mut self,
+        buf: &mut BufferView,
+        c: Color,
+        s: &str,
+        cursor: usize,
+    ) -> Result<(u32, u32), ::std::io::Error> {
+        self.add_str_to_cache(s);
+        self.draw_text_with_cursor(buf, c, s, cursor)
     }
 
     pub fn draw_text_fixed_width(
         &self,
-        buf: &mut Buffer,
-        bg: &Color,
-        c: &Color,
+        buf: &mut BufferView,
+        c: Color,
         distances: &[u32],
         s: &str,
     ) -> Result<(u32, u32), ::std::io::Error> {
@@ -165,10 +252,10 @@ impl Font {
             let glyph = match self.glyphs.get(&ch) {
                 Some(glyph) => glyph,
                 None => {
-                    return Err(::std::io::Error::new(
-                        ::std::io::ErrorKind::Other,
-                        format!("glyph for {:} not in cache", ch),
-                    ))
+                    return Err(::std::io::Error::other(format!(
+                        "glyph for {:} not in cache",
+                        ch
+                    )));
                 }
             };
             glyphs.push(glyph);
@@ -177,7 +264,7 @@ impl Font {
             }
         }
         for (idx, glyph) in glyphs.into_iter().enumerate() {
-            glyph.draw(buf, (x_off, -off), bg, c);
+            glyph.draw(buf, (x_off, -off), c);
             x_off += distances[idx] as i32;
         }
 
@@ -186,8 +273,7 @@ impl Font {
 
     pub fn draw_text_individual_colors(
         &self,
-        buf: &mut Buffer,
-        bg: &Color,
+        buf: &mut BufferView,
         color: &[Color],
         s: &str,
     ) -> Result<(u32, u32), ::std::io::Error> {
@@ -198,10 +284,10 @@ impl Font {
             let glyph = match self.glyphs.get(&ch) {
                 Some(glyph) => glyph,
                 None => {
-                    return Err(::std::io::Error::new(
-                        ::std::io::ErrorKind::Other,
-                        format!("glyph for {:} not in cache", ch),
-                    ))
+                    return Err(::std::io::Error::other(format!(
+                        "glyph for {:} not in cache",
+                        ch
+                    )));
                 }
             };
             glyphs.push(glyph);
@@ -210,8 +296,8 @@ impl Font {
             }
         }
         for (idx, glyph) in glyphs.into_iter().enumerate() {
-            glyph.draw(buf, (x_off, -off), bg, &color[idx]);
-            x_off += glyph.dimensions.0 as i32 + glyph.origin.0;
+            glyph.draw(buf, (x_off, -off), color[idx]);
+            x_off += glyph.advance;
         }
 
         Ok((x_off as u32, self.size as u32))
@@ -219,32 +305,30 @@ impl Font {
 
     pub fn auto_draw_text_individual_colors(
         &mut self,
-        buf: &mut Buffer,
-        bg: &Color,
+        buf: &mut BufferView,
         color: &[Color],
         s: &str,
     ) -> Result<(u32, u32), ::std::io::Error> {
         self.add_str_to_cache(s);
-        self.draw_text_individual_colors(buf, bg, color, s)
+        self.draw_text_individual_colors(buf, color, s)
     }
 }
 
-pub fn draw_box(buf: &mut Buffer, c: &Color, dim: (u32, u32)) -> Result<(), ::std::io::Error> {
-    for x in 0..dim.0 {
-        let _ = buf.put((x, 0), c);
-        let _ = buf.put((x, dim.1 - 1), c);
-    }
-    for y in 0..dim.1 {
-        buf.put((0, y), c)?;
-        buf.put((dim.0 - 1, y), c)?;
+pub fn draw_box(buf: &mut BufferView, c: Color, dim: (u32, u32)) -> Result<(), ::std::io::Error> {
+    let bounds = buf.get_bounds();
+    buf.put_line_raw((bounds.0, bounds.1), dim.0, c);
+    buf.put_line_raw((bounds.0, bounds.1 + dim.1 - 1), dim.0, c);
+    for y in bounds.1..dim.1 + bounds.1 {
+        buf.put_raw((bounds.0, y), c);
+        buf.put_raw((bounds.0 + dim.0 - 1, y), c);
     }
 
     Ok(())
 }
 
 pub fn draw_bar(
-    buf: &mut Buffer,
-    color: &Color,
+    buf: &mut BufferView,
+    color: Color,
     length: u32,
     height: u32,
     fill: f32,
@@ -253,10 +337,9 @@ pub fn draw_bar(
     if fill_pos > length {
         fill_pos = length;
     }
-    for y in 0..height {
-        for x in 0..fill_pos {
-            let _ = buf.put((x, y), color);
-        }
+    let bounds = buf.get_bounds();
+    for y in bounds.1..height + bounds.1 {
+        buf.put_line_raw((bounds.0, y), fill_pos, color);
     }
 
     Ok(())

src/event.rs

@@ -0,0 +1,61 @@
+use std::sync::{Arc, Mutex};
+
+use calloop::ping::Ping;
+
+use crate::keyboard::KeyEvent;
+
+#[derive(Copy, Clone, Debug)]
+pub enum PointerButton {
+    Left,
+    Right,
+    Middle,
+    ScrollVertical(f64),
+    ScrollHorizontal(f64),
+}
+
+#[derive(Debug)]
+pub struct PointerEvent {
+    pub button: PointerButton,
+    pub pos: (u32, u32),
+}
+
+#[derive(Debug)]
+pub enum Event {
+    NewMinute,
+    PowerUpdate,
+    LauncherUpdate,
+    AudioUpdate,
+    KeyEvent(KeyEvent),
+    PointerEvent(PointerEvent),
+    TokenUpdate(String),
+    FocusLost,
+}
+
+pub struct Events {
+    dirty: bool,
+    events: Vec<Event>,
+    ping: Ping,
+}
+
+impl Events {
+    pub fn new(ping: Ping) -> Arc<Mutex<Events>> {
+        Arc::new(Mutex::new(Events {
+            dirty: false,
+            events: Vec::new(),
+            ping,
+        }))
+    }
+
+    pub fn add_event(&mut self, ev: Event) {
+        self.events.push(ev);
+        if !self.dirty {
+            self.dirty = true;
+            self.ping.ping();
+        }
+    }
+
+    pub fn flush(&mut self) -> Vec<Event> {
+        self.dirty = false;
+        std::mem::take(&mut self.events)
+    }
+}

src/fonts.rs

@@ -0,0 +1,162 @@
+//! Utility module for fonts
+
+use crate::draw;
+use rusttype::Font;
+use std::{
+    cell::RefCell, collections::HashMap, fs::File, hash, io::Read, mem, path::Path, rc::Rc, thread,
+};
+
+/// FontRef is used to store Fonts on widgets.
+pub type FontRef<'a> = &'a rusttype::Font<'a>;
+
+#[cfg(feature = "fontconfig")]
+pub(crate) fn find_font(name: &str) -> String {
+    use fontconfig::Fontconfig as FontConfig;
+    let fc = FontConfig::new().unwrap();
+    fc.find(name, None)
+        .unwrap()
+        .path
+        .to_str()
+        .unwrap()
+        .to_string()
+}
+
+#[cfg(not(feature = "fontconfig"))]
+pub(crate) fn find_font(_name: &str) -> String {
+    panic!("fontconfig not enabled so font search not available");
+}
+
+/// FontLoader is a marker struct that is used to load files
+pub(crate) struct FontLoader;
+
+impl FontLoader {
+    /// Given a path, loads it as a Font, which can be rendered to the screen.
+    pub(crate) fn from_path<'a, P>(path: P) -> Option<Font<'a>>
+    where
+        P: AsRef<Path>,
+    {
+        let mut file = File::open(path).expect("Font file not found");
+        let mut data = match file.metadata() {
+            Ok(metadata) => Vec::with_capacity(metadata.len() as usize),
+            Err(_) => vec![],
+        };
+        file.read_to_end(&mut data).unwrap();
+        Font::try_from_vec(data)
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+struct ComparableF32(f32);
+impl ComparableF32 {
+    fn key(&self) -> u64 {
+        self.0.to_bits() as u64
+    }
+}
+
+impl hash::Hash for ComparableF32 {
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: hash::Hasher,
+    {
+        self.key().hash(state)
+    }
+}
+
+impl PartialEq for ComparableF32 {
+    fn eq(&self, other: &ComparableF32) -> bool {
+        self.key() == other.key()
+    }
+}
+
+impl Eq for ComparableF32 {}
+
+/// font name -> (font name, [(size, glyphs to preload)])
+type RequiredFonts = HashMap<&'static str, (&'static str, Vec<(f32, &'static str)>)>;
+
+pub struct FontMap {
+    fonts: HashMap<(&'static str, ComparableF32), draw::Font<'static>>,
+    font_paths: HashMap<&'static str, String>,
+    required_fonts: RequiredFonts,
+}
+
+impl FontMap {
+    pub fn new() -> FontMap {
+        FontMap {
+            fonts: HashMap::new(),
+            font_paths: HashMap::new(),
+            required_fonts: HashMap::new(),
+        }
+    }
+
+    pub fn queue_font(&mut self, font_name: &'static str, size: f32, preload: &'static str) {
+        match self.required_fonts.get_mut(font_name) {
+            Some(v) => v.1.push((size, preload)),
+            None => {
+                self.required_fonts
+                    .insert(font_name, (font_name, vec![(size, preload)]));
+            }
+        }
+    }
+
+    pub fn add_font_path(&mut self, font_name: &'static str, font_path: String) {
+        self.font_paths.insert(font_name, font_path);
+    }
+
+    pub fn load_fonts(&mut self) {
+        for (font_name, v) in self.required_fonts.iter() {
+            let path = match self.font_paths.get(font_name) {
+                Some(res) => res,
+                _ => {
+                    let s = find_font(font_name);
+                    self.font_paths.insert(font_name, s);
+                    self.font_paths.get(font_name).unwrap()
+                }
+            };
+            let fontref = Box::leak(Box::new(
+                FontLoader::from_path(path).expect("unable to load font"),
+            ));
+            for (size, preload) in &v.1 {
+                if let Some(font) = self.fonts.get_mut(&(font_name, ComparableF32(*size))) {
+                    font.add_str_to_cache(preload);
+                } else {
+                    let mut font = draw::Font::new(fontref, *size);
+                    font.add_str_to_cache(preload);
+                    self.fonts.insert((font_name, ComparableF32(*size)), font);
+                }
+            }
+        }
+    }
+
+    pub fn get_font(&mut self, font_name: &'static str, size: f32) -> &mut draw::Font<'static> {
+        self.fonts
+            .get_mut(&(font_name, ComparableF32(size)))
+            .expect("no font at specified size")
+    }
+}
+
+pub enum MaybeFontMap {
+    Waiting(thread::JoinHandle<FontMap>),
+    Ready(Rc<RefCell<FontMap>>),
+    Invalid,
+}
+
+impl MaybeFontMap {
+    pub fn unwrap(&self) -> Rc<RefCell<FontMap>> {
+        match self {
+            MaybeFontMap::Ready(f) => f.clone(),
+            _ => panic!("fontmap not yet ready"),
+        }
+    }
+
+    pub fn resolve(&mut self) {
+        if matches!(self, MaybeFontMap::Waiting(_)) {
+            let s = mem::replace(self, MaybeFontMap::Invalid);
+            match s {
+                MaybeFontMap::Waiting(handle) => {
+                    *self = MaybeFontMap::Ready(Rc::new(RefCell::new(handle.join().unwrap())));
+                }
+                _ => unreachable!(),
+            }
+        }
+    }
+}

src/keyboard/mod.rs

@@ -0,0 +1,160 @@
+//! Utilities for keymap interpretation of keyboard input
+//!
+//! This module provides an implementation for `wl_keyboard`
+//! objects using `libxkbcommon` to interpret the keyboard input
+//! given the user keymap.
+//!
+//! The entry point of this module is the [`map_keyboard`](fn.map_keyboard.html)
+//! function which, given a `wl_seat` and a callback, setup keymap interpretation
+//! and key repetition for the `wl_keyboard` of this seat.
+//!
+//! Key repetition relies on an event source, that needs to be inserted in your
+//! calloop event loop. Not doing so will prevent key repetition to work
+//! (but the rest of the functionnality will not be affected).
+
+use std::{default::Default, os::unix::io::OwnedFd};
+
+use wayland_client::{WEnum, protocol::wl_keyboard};
+use xkbcommon::xkb;
+
+pub use xkbcommon::xkb::keysyms;
+
+mod repeat;
+mod state;
+
+pub use self::repeat::{KeyRepeatSource, RepeatMessage};
+use self::state::KbState;
+pub use self::state::ModifiersState;
+
+#[derive(Debug, Clone)]
+pub struct KeyEvent {
+    #[allow(dead_code)]
+    pub rawkey: u32,
+    pub keysym: u32,
+    pub state: WEnum<wl_keyboard::KeyState>,
+    pub modifiers: ModifiersState,
+    pub utf8: Option<String>,
+    pub repeats: bool,
+}
+
+pub struct KeymapDescription {
+    fd: OwnedFd,
+    size: u32,
+}
+
+impl KeymapDescription {
+    fn new(fd: OwnedFd, size: u32) -> KeymapDescription {
+        KeymapDescription { fd, size }
+    }
+}
+
+impl Clone for KeymapDescription {
+    fn clone(&self) -> Self {
+        KeymapDescription::new(self.fd.try_clone().expect("unable to clone fd"), self.size)
+    }
+}
+
+pub struct Keyboard {
+    state: Option<KbState>,
+    desc: Option<KeymapDescription>,
+}
+
+impl Keyboard {
+    pub fn new() -> Keyboard {
+        Keyboard {
+            state: None,
+            desc: None,
+        }
+    }
+
+    pub fn keymap(&mut self, format: WEnum<wl_keyboard::KeymapFormat>, fd: OwnedFd, size: u32) {
+        match format {
+            WEnum::Value(wl_keyboard::KeymapFormat::XkbV1) => {
+                self.desc = Some(KeymapDescription::new(fd, size));
+            }
+            WEnum::Value(wl_keyboard::KeymapFormat::NoKeymap) => {
+                // TODO: how to handle this (hopefully never occuring) case?
+            }
+            // Unknown format from a newer protocol version: ignore rather than
+            // abort the whole process.
+            _ => (),
+        }
+    }
+
+    pub fn resolve(&mut self) {
+        if self.state.is_some() {
+            return;
+        }
+
+        if let Some(desc) = self.desc.take() {
+            self.state = Some(
+                KbState::new_from_fd(desc.fd, desc.size as usize).expect("unable to load keymap"),
+            );
+        }
+    }
+
+    pub fn key(&mut self, key: u32, key_state: WEnum<wl_keyboard::KeyState>) -> KeyEvent {
+        if let Some(state) = &mut self.state {
+            let (sym, utf8, repeats) = {
+                // Get the values to generate a key event
+                let sym = state.get_one_sym_raw(key);
+                let utf8 = if key_state == WEnum::Value(wl_keyboard::KeyState::Pressed) {
+                    match state.compose_feed(sym) {
+                        Some(xkb::compose::FeedResult::Accepted) => {
+                            if let Some(status) = state.compose_status() {
+                                match status {
+                                    xkb::compose::Status::Composed => state.compose_get_utf8(),
+                                    xkb::compose::Status::Nothing => state.get_utf8_raw(key),
+                                    _ => None,
+                                }
+                            } else {
+                                state.get_utf8_raw(key)
+                            }
+                        }
+                        Some(_) => {
+                            // XKB_COMPOSE_FEED_IGNORED
+                            None
+                        }
+                        None => {
+                            // XKB COMPOSE is not initialized
+                            state.get_utf8_raw(key)
+                        }
+                    }
+                } else {
+                    None
+                };
+                let repeats = state.key_repeats(xkb::Keycode::new(key + 8));
+                (sym, utf8, repeats)
+            };
+            KeyEvent {
+                rawkey: key,
+                keysym: sym,
+                state: key_state,
+                modifiers: state.mods_state(),
+                utf8,
+                repeats,
+            }
+        } else {
+            KeyEvent {
+                rawkey: key,
+                keysym: 0,
+                state: key_state,
+                modifiers: Default::default(),
+                utf8: None,
+                repeats: false,
+            }
+        }
+    }
+
+    pub fn modifiers(
+        &mut self,
+        mods_depressed: u32,
+        mods_latched: u32,
+        mods_locked: u32,
+        group: u32,
+    ) {
+        if let Some(state) = &mut self.state {
+            state.update_modifiers(mods_depressed, mods_latched, mods_locked, group);
+        }
+    }
+}

src/keyboard/repeat.rs

@@ -0,0 +1,182 @@
+use std::time::Duration;
+
+use calloop::{
+    EventSource, Poll, PostAction, Readiness, Token, TokenFactory,
+    channel::{self, Channel},
+    timer::{TimeoutAction, Timer},
+};
+use wayland_client::{WEnum, protocol::wl_keyboard};
+
+use super::KeyEvent;
+
+#[derive(Debug)]
+pub enum RepeatMessage {
+    StopRepeat,
+    KeyEvent(KeyEvent),
+    RepeatInfo((u32, u32)),
+}
+
+#[derive(Debug)]
+pub struct KeyRepeatSource {
+    channel: Channel<RepeatMessage>,
+    timer: Timer,
+    rate: Duration,
+    delay: Duration,
+    disabled: bool,
+    key: Option<KeyEvent>,
+}
+
+impl KeyRepeatSource {
+    pub fn new(ch: channel::Channel<RepeatMessage>) -> KeyRepeatSource {
+        KeyRepeatSource {
+            channel: ch,
+            timer: Timer::immediate(),
+            delay: Duration::ZERO,
+            rate: Duration::ZERO,
+            disabled: true,
+            key: None,
+        }
+    }
+}
+
+impl EventSource for KeyRepeatSource {
+    type Event = KeyEvent;
+    type Metadata = ();
+    type Ret = ();
+    type Error = calloop::Error;
+
+    fn process_events<F>(
+        &mut self,
+        readiness: Readiness,
+        token: Token,
+        mut callback: F,
+    ) -> calloop::Result<PostAction>
+    where
+        F: FnMut(Self::Event, &mut Self::Metadata) -> Self::Ret,
+    {
+        let mut removed = false;
+
+        let timer = &mut self.timer;
+        let rate = &mut self.rate;
+        let delay = &mut self.delay;
+        let key = &mut self.key;
+        let disabled = &mut self.disabled;
+
+        let mut reregister = false;
+
+        let now = std::time::Instant::now();
+
+        // Check if the key repeat should stop
+        let channel_pa = self
+            .channel
+            .process_events(readiness, token, |event, _| match event {
+                channel::Event::Msg(message) => match message {
+                    RepeatMessage::StopRepeat => {
+                        key.take();
+                    }
+                    RepeatMessage::KeyEvent(event) => match event.state {
+                        WEnum::Value(wl_keyboard::KeyState::Pressed) => {
+                            key.replace(event);
+                            reregister = true;
+                            timer.set_deadline(now + *delay);
+                        }
+                        WEnum::Value(wl_keyboard::KeyState::Released) => match key {
+                            Some(k) if k.keysym == event.keysym => {
+                                key.take();
+                            }
+                            _ => (),
+                        },
+                        _ => (),
+                    },
+                    RepeatMessage::RepeatInfo((new_rate, new_delay)) => {
+                        // Per wl_keyboard.repeat_info, a rate of 0 disables
+                        // key repeat entirely. Dividing by it would panic.
+                        if new_rate == 0 {
+                            *disabled = true;
+                            key.take();
+                        } else {
+                            *rate = Duration::from_micros(1_000_000 / new_rate as u64);
+                            *delay = Duration::from_millis(new_delay as u64);
+                            *disabled = false;
+                            if key.is_some() {
+                                timer.set_deadline(now + *delay);
+                            }
+                        }
+                    }
+                },
+
+                channel::Event::Closed => {
+                    removed = true;
+                }
+            })
+            .map_err(|err| calloop::Error::OtherError(Box::new(err)))?;
+
+        // Keyboard was destroyed
+        if removed {
+            return Ok(PostAction::Remove);
+        }
+
+        // Re-register the timer to start it again
+        if reregister {
+            return Ok(PostAction::Reregister);
+        }
+
+        let timer_pa = timer.process_events(readiness, token, |deadline, _| {
+            if self.disabled || key.is_none() {
+                return TimeoutAction::Drop;
+            }
+            if deadline - now > std::time::Duration::from_millis(5) {
+                // We have not yet reached the deadline within our tolerance
+                return TimeoutAction::ToInstant(deadline);
+            }
+
+            // Invoke the event
+            callback(key.as_ref().unwrap().clone(), &mut ());
+
+            let mut next_deadline = deadline;
+            if now - deadline > *rate * 2 {
+                // We're way behind, let's just set a new time
+                println!(
+                    "KeyRepeatSource::process_events: More than two repeat cycles behind, resetting"
+                );
+                next_deadline = now + *rate;
+            } else {
+                while next_deadline < now {
+                    next_deadline += *rate;
+                }
+            }
+            TimeoutAction::ToInstant(next_deadline)
+        })?;
+
+        // Only disable or remove if both want to, otherwise continue or re-register
+        Ok(match (timer_pa, channel_pa) {
+            (PostAction::Disable, PostAction::Disable) => PostAction::Disable,
+            (PostAction::Remove, PostAction::Remove) => PostAction::Remove,
+            (PostAction::Reregister, _) | (_, PostAction::Reregister) => PostAction::Reregister,
+            _ => PostAction::Continue,
+        })
+    }
+
+    fn register(
+        &mut self,
+        poll: &mut Poll,
+        token_factory: &mut TokenFactory,
+    ) -> calloop::Result<()> {
+        self.channel.register(poll, token_factory)?;
+        self.timer.register(poll, token_factory)
+    }
+
+    fn reregister(
+        &mut self,
+        poll: &mut Poll,
+        token_factory: &mut TokenFactory,
+    ) -> calloop::Result<()> {
+        self.channel.reregister(poll, token_factory)?;
+        self.timer.reregister(poll, token_factory)
+    }
+
+    fn unregister(&mut self, poll: &mut Poll) -> calloop::Result<()> {
+        self.channel.unregister(poll)?;
+        self.timer.unregister(poll)
+    }
+}

src/keyboard/state.rs

@@ -0,0 +1,161 @@
+use std::{env, os::unix::io::OwnedFd};
+
+use xkbcommon::xkb;
+
+pub struct KbState {
+    xkb_context: xkb::Context,
+    xkb_keymap: xkb::Keymap,
+    xkb_state: xkb::State,
+    xkb_compose_table: Option<xkb::compose::Table>,
+    xkb_compose_state: Option<xkb::compose::State>,
+    mods_state: ModifiersState,
+}
+
+/// Represents the current state of the keyboard modifiers
+///
+/// Each field of this struct represents a modifier and is `true` if this modifier is active.
+///
+/// For some modifiers, this means that the key is currently pressed, others are toggled
+/// (like caps lock).
+#[derive(Copy, Clone, Debug, Default)]
+pub struct ModifiersState {
+    /// The "control" key
+    pub ctrl: bool,
+    /// The "alt" key
+    pub alt: bool,
+    /// The "shift" key
+    pub shift: bool,
+    /// The "Caps lock" key
+    pub caps_lock: bool,
+    /// The "logo" key
+    ///
+    /// Also known as the "windows" key on most keyboards
+    pub logo: bool,
+    /// The "Num lock" key
+    pub num_lock: bool,
+}
+
+impl ModifiersState {
+    fn new() -> ModifiersState {
+        ModifiersState::default()
+    }
+
+    fn update_with(&mut self, state: &xkb::State) {
+        self.ctrl = state.mod_name_is_active("Control", xkb::STATE_MODS_EFFECTIVE);
+        self.alt = state.mod_name_is_active("Mod1", xkb::STATE_MODS_EFFECTIVE);
+        self.shift = state.mod_name_is_active("Shift", xkb::STATE_MODS_EFFECTIVE);
+        self.caps_lock = state.mod_name_is_active("Lock", xkb::STATE_MODS_EFFECTIVE);
+        self.num_lock = state.mod_name_is_active("Mod2", xkb::STATE_MODS_EFFECTIVE);
+        self.logo = state.mod_name_is_active("Mod4", xkb::STATE_MODS_EFFECTIVE);
+    }
+}
+
+// Safety: No.
+unsafe impl Send for KbState {}
+
+impl KbState {
+    pub(crate) fn update_modifiers(
+        &mut self,
+        mods_depressed: u32,
+        mods_latched: u32,
+        mods_locked: u32,
+        group: u32,
+    ) {
+        let mask =
+            self.xkb_state
+                .update_mask(mods_depressed, mods_latched, mods_locked, 0, 0, group);
+        if (mask & xkb::STATE_MODS_EFFECTIVE) > 0 {
+            // effective value of mods have changed, we need to update our state
+            self.mods_state.update_with(&self.xkb_state);
+        }
+    }
+
+    pub(crate) fn get_one_sym_raw(&mut self, keycode: u32) -> u32 {
+        self.xkb_state
+            .key_get_one_sym(xkb::Keycode::new(keycode + 8))
+            .raw()
+    }
+
+    pub(crate) fn get_utf8_raw(&mut self, keycode: u32) -> Option<String> {
+        Some(self.xkb_state.key_get_utf8(xkb::Keycode::new(keycode + 8)))
+    }
+
+    pub(crate) fn compose_feed(&mut self, keysym: u32) -> Option<xkb::compose::FeedResult> {
+        self.xkb_compose_state
+            .as_mut()
+            .map(|compose_state| compose_state.feed(xkb::Keysym::new(keysym)))
+    }
+
+    pub(crate) fn compose_status(&mut self) -> Option<xkb::compose::Status> {
+        self.xkb_compose_state
+            .as_mut()
+            .map(|compose_state| compose_state.status())
+    }
+
+    pub(crate) fn compose_get_utf8(&mut self) -> Option<String> {
+        match &mut self.xkb_compose_state {
+            Some(compose_state) => compose_state.utf8(),
+            None => None,
+        }
+    }
+
+    pub(crate) fn new_from_fd(fd: OwnedFd, size: usize) -> Result<KbState, std::io::Error> {
+        let xkb_context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
+        let xkb_keymap = unsafe {
+            xkb::Keymap::new_from_fd(
+                &xkb_context,
+                fd,
+                size,
+                xkb::KEYMAP_FORMAT_TEXT_V1,
+                xkb::KEYMAP_COMPILE_NO_FLAGS,
+            )?
+            .unwrap()
+        };
+        let xkb_state = xkb::State::new(&xkb_keymap);
+        let mut me = KbState {
+            xkb_context,
+            xkb_keymap,
+            xkb_state,
+            xkb_compose_table: None,
+            xkb_compose_state: None,
+            mods_state: ModifiersState::new(),
+        };
+
+        me.init_compose();
+
+        Ok(me)
+    }
+
+    pub(crate) fn init_compose(&mut self) {
+        let locale = env::var_os("LC_ALL")
+            .filter(|v| !v.is_empty())
+            .or_else(|| env::var_os("LC_CTYPE"))
+            .filter(|v| !v.is_empty())
+            .or_else(|| env::var_os("LANG"))
+            .filter(|v| !v.is_empty())
+            .unwrap_or_else(|| "C".into());
+
+        let compose_table = match xkb::compose::Table::new_from_locale(
+            &self.xkb_context,
+            &locale,
+            xkb::compose::COMPILE_NO_FLAGS,
+        ) {
+            Ok(t) => t,
+            Err(_) => return,
+        };
+
+        let compose_state = xkb::compose::State::new(&compose_table, xkb::compose::STATE_NO_FLAGS);
+
+        self.xkb_compose_table = Some(compose_table);
+        self.xkb_compose_state = Some(compose_state);
+    }
+
+    pub(crate) fn key_repeats(&mut self, keycode: xkb::Keycode) -> bool {
+        self.xkb_keymap.key_repeats(keycode)
+    }
+
+    #[inline]
+    pub(crate) fn mods_state(&self) -> ModifiersState {
+        self.mods_state
+    }
+}

src/main.rs

@@ -1,361 +1,392 @@
-use std::env;
-use std::fs::File;
-use std::io::{BufRead, BufReader, Read, Write};
-use std::os::unix::io::AsRawFd;
-use std::os::unix::net::{UnixListener, UnixStream};
-use std::sync::mpsc::channel;
-
-use chrono::{Duration, Local};
-use nix::poll::{poll, PollFd, PollFlags};
-use os_pipe::pipe;
-use timerfd::{SetTimeFlags, TimerFd, TimerState};
-
-mod app;
 mod buffer;
-mod cmd;
 mod color;
 mod config;
-mod configfmt;
-mod desktop;
-mod doublemempool;
 mod draw;
-mod widget;
+mod event;
+mod fonts;
+mod keyboard;
+mod state;
+mod utils;
 mod widgets;
 
-use app::{App, OutputMode};
-use cmd::Cmd;
-use config::Config;
-use configfmt::ConfigFmt;
-use widget::WaitContext;
+use wayland_client::{Connection, QueueHandle, WaylandSource};
 
-enum Mode {
-    Start,
-    Daemonize,
-    StartOrKill,
-    ToggleVisible,
-    PrintConfig(ConfigFmt),
+use calloop::{
+    EventLoop,
+    timer::{TimeoutAction, Timer},
+};
+use chrono::{Duration, Local, Timelike};
+
+use buffer::BufferView;
+use config::Config;
+use event::{Event, Events};
+use fonts::{FontMap, MaybeFontMap};
+use keyboard::{KeyRepeatSource, RepeatMessage};
+use state::State;
+use utils::xdg;
+use widgets::{Geometry, Widget};
+
+use std::{
+    env, fs,
+    fs::File,
+    io::{BufRead, BufReader, Write},
+    os::unix::net::{UnixListener, UnixStream},
+    path::Path,
+    rc::Rc,
+    thread,
+};
+
+fn print_usage() {
+    println!(
+        "
+usage: wldash [OPTIONS]
+
+OPTIONS:
+  --config CONFIG_FILE                     use the specified config file
+                                           (/etc/wldash/config.yml if present,
+                                           else ~/.config/wldash/config.yml)
+  --write-default-config [v1|v2|toplevel]  generate and write a new config file
+                                           (v2 by default)
+  --desktop-refresh                        no-op kept for old key bindings
+                                           (desktop files are scanned at start)
+"
+    );
+}
+
+fn die(msg: String) -> ! {
+    eprintln!("wldash: {}", msg);
+    std::process::exit(1);
+}
+
+fn ensure_dir_exists(path: &str) {
+    if let Err(err) = fs::create_dir_all(path) {
+        die(format!("error creating directory {}: {}", path, err));
+    }
+}
+
+fn create_required_directories() {
+    let dir_config_wldash = format!("{}/wldash", xdg::config_folder());
+    ensure_dir_exists(&dir_config_wldash);
+}
+
+/// Default config path. On a shared (e.g. NFS-roamed) home, a host-specific
+/// config at /etc/wldash/config.yml takes precedence over the roamed
+/// ~/.config/wldash/config.yml, so each machine can keep its own layout
+/// without conflicting. An explicit --config still overrides both.
+fn default_config_file() -> String {
+    let etc = "/etc/wldash/config.yml";
+    if Path::new(etc).exists() {
+        return etc.to_string();
+    }
+    format!("{}/wldash/config.yml", xdg::config_folder())
 }
 
 fn main() {
+    let mut args = env::args();
+    // Skip program name
+    _ = args.next();
+
+    create_required_directories();
+
+    let mut config_file = default_config_file();
+
+    loop {
+        match args.next() {
+            Some(ref s) if s == "--config" => match args.next() {
+                Some(ref s) => config_file = s.clone(),
+                None => die("missing argument to --config".to_string()),
+            },
+            Some(ref s) if s == "--write-default-config" => {
+                let config = match args.next() {
+                    Some(ref s) if s == "v1" => Config::generate_v1(),
+                    Some(ref s) if s == "v2" => Config::generate_v2(false),
+                    Some(ref s) if s == "toplevel" => Config::generate_v2(true),
+                    None => Config::generate_v2(false),
+                    Some(s) => die(format!("unknown argument to --write-default-config: {}", s)),
+                };
+                match File::create(&config_file) {
+                    Ok(f) => {
+                        if let Err(e) = serde_yaml::to_writer(f, &config) {
+                            die(format!("could not serialize config: {}", e));
+                        }
+                    }
+                    Err(e) => die(format!("could not write {}: {}", config_file, e)),
+                }
+                std::process::exit(0);
+            }
+            Some(ref s) if s == "--desktop-refresh" => {
+                eprintln!("wldash: desktop files are scanned at every start; nothing to refresh");
+                std::process::exit(0);
+            }
+            Some(ref s) if s == "--help" => {
+                print_usage();
+                std::process::exit(0);
+            }
+            Some(_) => {
+                print_usage();
+                std::process::exit(1);
+            }
+            None => break,
+        }
+    }
+
+    let conn = match Connection::connect_to_env() {
+        Ok(c) => c,
+        Err(e) => die(format!("could not connect to the Wayland display: {}", e)),
+    };
+
+    let event_queue = conn.new_event_queue();
+    let qhandle: QueueHandle<State> = event_queue.handle();
+
+    let display = conn.display();
+    display.get_registry(&qhandle, ());
+    display.sync(&qhandle, ());
+
+    let (ping_sender, ping_source) = calloop::ping::make_ping().unwrap();
+    let (keyrepeat_sender, keyrepeat_channel) = calloop::channel::channel::<RepeatMessage>();
+
+    let mut event_loop: EventLoop<State> =
+        EventLoop::try_new().expect("Failed to initialize the event loop!");
+
+    let handle = event_loop.handle();
+    handle
+        .insert_source(
+            WaylandSource::new(event_queue).expect("Could not create WaylandSource!"),
+            |_event, queue, state| queue.dispatch_pending(state),
+        )
+        .expect("Failed to insert event source!");
+
+    handle
+        .insert_source(ping_source, |(), &mut (), state| {
+            let events = state.events.lock().unwrap().flush();
+            for widget in state.widgets.iter_mut() {
+                for event in events.iter() {
+                    widget.event(event);
+                }
+            }
+            state.dirty = true;
+        })
+        .expect("Failed to insert ping source!");
+
+    let clock_source = Timer::from_duration(std::time::Duration::from_secs(1));
+    handle
+        .insert_source(clock_source, |_event, _metadata, state| {
+            let now = Local::now().naive_local();
+            let target = (now + Duration::seconds(60))
+                .with_second(0)
+                .unwrap()
+                .with_nanosecond(0)
+                .unwrap();
+            let d = target - now;
+            for widget in state.widgets.iter_mut() {
+                widget.event(&Event::NewMinute);
+            }
+            state.dirty = true;
+
+            // The timer event source requires us to return a TimeoutAction to
+            // specify if the timer should be rescheduled. In our case we just drop it.
+            TimeoutAction::ToDuration(d.to_std().unwrap())
+        })
+        .expect("Failed to insert event source!");
+
+    let keyrepeat_source = KeyRepeatSource::new(keyrepeat_channel);
+    handle
+        .insert_source(keyrepeat_source, |event, _metadata, state| {
+            let ev = Event::KeyEvent(event);
+            for widget in state.widgets.iter_mut() {
+                widget.event(&ev);
+            }
+            state.dirty = true;
+        })
+        .expect("Failed to insert keyrepeat source!");
+
     let socket_path = match env::var("XDG_RUNTIME_DIR") {
         Ok(dir) => dir + "/wldash",
         Err(_) => "/tmp/wldash".to_string(),
     };
-    let config_home = match env::var("XDG_CONFIG_HOME") {
-        Ok(dir) => dir + "/wldash",
-        Err(_) => match env::var("HOME") {
-            Ok(home) => home + "/.config/wldash",
-            Err(_) => panic!("unable to find user folder"),
+
+    let events = Events::new(ping_sender);
+
+    let mut fm = FontMap::new();
+
+    let config: Config = match File::open(&config_file) {
+        Ok(f) => match serde_yaml::from_reader(f) {
+            Ok(c) => c,
+            Err(e) => die(format!("invalid configuration {}: {}", config_file, e)),
         },
+        Err(e) => die(format!(
+            "could not open configuration {}: {} (try 'wldash --write-default-config')",
+            config_file, e
+        )),
     };
 
-    // From all existing files take the first readable one and write it's extension to `ext`
-    let mut ext = [0x0; 8];
-    let file = configfmt::CONFIG_NAMES
-        .iter()
-        .map(|name| std::path::Path::new(&config_home).join(name))
-        .filter_map(|path| {
-            match File::open(&path) {
-                Ok(file) => {
-                    let e = path.extension().and_then(|e| e.to_str())?;
-                    let len = e.len();
-                    let from = len.saturating_sub(8); // the longest possible extension
-                    ext[0..len - from].copy_from_slice(&e.as_bytes()[from..]);
-                    Some(file)
-                }
-                Err(_) => None,
-            }
-        })
-        .next();
+    if let Some(true) = config.server {
+        if let Ok(mut socket) = UnixStream::connect(socket_path.clone()) {
+            socket.write_all(b"kill\n").unwrap();
+            return;
+        };
 
-    let fmt = std::str::from_utf8(&ext)
-        .ok()
-        .and_then(ConfigFmt::new)
-        .unwrap_or_default();
-
-    let config: Config = file
-        .map(|f| fmt.from_reader(BufReader::new(f)))
-        .unwrap_or_default();
-
-    let scale = config.scale;
-
-    let mut args = env::args();
-    let _ = args.next();
-    let mode = match args.next() {
-        Some(arg) => match arg.as_str() {
-            "start" => Mode::Daemonize,
-            "start-or-kill" => Mode::StartOrKill,
-            "toggle-visible" => Mode::ToggleVisible,
-            "print-config" => Mode::PrintConfig(fmt),
-            s => {
-                let p = "print-config-";
-                let l = p.len();
-                let fmt = if s.starts_with(p) {
-                    ConfigFmt::new(&s[l..])
-                } else {
-                    None
-                };
-                if let Some(fmt) = fmt {
-                    Mode::PrintConfig(fmt)
-                } else {
-                    eprintln!("unsupported sub-command {}", s);
-                    std::process::exit(1);
-                }
-            }
-        },
-        None => Mode::Start,
-    };
-    if let Some(_) = args.next() {
-        // total = args.count + 2 (the two we skipped + the rest)
-        eprintln!("expected 0 or 1 arguments, got {}", args.count() + 2);
-        std::process::exit(1);
-    }
-
-    let mut daemon = false;
-
-    match mode {
-        Mode::ToggleVisible => {
-            if let Ok(mut socket) = UnixStream::connect(socket_path.clone()) {
-                socket.write_all(b"toggle_visible\n").unwrap();
-                return;
-            };
-            eprintln!("wldash is not running");
-            std::process::exit(1);
-        }
-        Mode::StartOrKill => {
-            if let Ok(mut socket) = UnixStream::connect(socket_path.clone()) {
-                socket.write_all(b"kill\n").unwrap();
-                return;
-            };
-        }
-        Mode::Start => {
-            if let Ok(_) = UnixStream::connect(socket_path.clone()) {
-                eprintln!("wldash is already running");
-                std::process::exit(1);
-            };
-        }
-        Mode::Daemonize => {
-            if let Ok(_) = UnixStream::connect(socket_path.clone()) {
-                eprintln!("wldash is already running");
-                std::process::exit(1);
-            };
-            daemon = true;
-        }
-        Mode::PrintConfig(fmt) => {
-            println!("{}", fmt.to_string(&config));
-            std::process::exit(0);
-        }
-    }
-
-    let _ = std::fs::remove_file(socket_path.clone());
-    let listener = UnixListener::bind(socket_path.clone()).unwrap();
-
-    let output_mode = match config.output_mode {
-        config::OutputMode::All => OutputMode::All,
-        config::OutputMode::Active => OutputMode::Active,
-    };
-
-    let background = config.background;
-
-    let (tx_draw, rx_draw) = channel();
-    let tx_draw_mod = tx_draw.clone();
-    let (mod_tx, mod_rx) = channel();
-    std::thread::spawn(move || {
-        // Print, write to a file, or send to an HTTP server.
-        match config.widget.construct(tx_draw_mod) {
-            Some(w) => mod_tx.send(w).unwrap(),
-            None => panic!("no widget configured"),
-        }
-    });
-
-    let mut app = App::new(tx_draw, output_mode, background, scale);
-    if daemon {
-        app.hide();
-    } else {
-        app.show();
-    }
-    let widget = mod_rx.recv().unwrap();
-    app.set_widget(widget).unwrap();
-
-    let (mut rx_pipe, mut tx_pipe) = pipe().unwrap();
-    let ipc_pipe = tx_pipe.try_clone().unwrap();
-
-    let worker_queue = app.cmd_queue();
-    let _ = std::thread::Builder::new()
-        .name("cmd_proxy".to_string())
-        .spawn(move || loop {
-            let cmd = rx_draw.recv().unwrap();
-            worker_queue.lock().unwrap().push_back(cmd);
-            tx_pipe.write_all(&[0x1]).unwrap();
-        });
-
-    let mut timer = TimerFd::new().unwrap();
-    let ev_fd = PollFd::new(app.event_queue().get_connection_fd(), PollFlags::POLLIN);
-    let rx_fd = PollFd::new(rx_pipe.as_raw_fd(), PollFlags::POLLIN);
-    let tm_fd = PollFd::new(timer.as_raw_fd(), PollFlags::POLLIN);
-    let ipc_fd = PollFd::new(listener.as_raw_fd(), PollFlags::POLLIN);
-
-    app.cmd_queue().lock().unwrap().push_back(Cmd::Draw);
-
-    let mut visible = !daemon;
-    let mut wait_ctx = WaitContext {
-        fds: Vec::new(),
-        target_time: None,
-    };
-
-    let q = app.cmd_queue();
-    loop {
-        let cmd = q.lock().unwrap().pop_front();
-        match cmd {
-            Some(cmd) => match cmd {
-                Cmd::Draw => {
-                    app.redraw(false).expect("Failed to draw");
-                    app.flush_display();
-                }
-                Cmd::ForceDraw => {
-                    app.redraw(true).expect("Failed to draw");
-                    app.flush_display();
-                }
-                Cmd::MouseClick { btn, pos } => {
-                    app.get_widget().mouse_click(btn, pos);
-                    q.lock().unwrap().push_back(Cmd::Draw);
-                }
-                Cmd::MouseScroll { scroll, pos } => {
-                    app.get_widget().mouse_scroll(scroll, pos);
-                    q.lock().unwrap().push_back(Cmd::Draw);
-                }
-                Cmd::Keyboard {
-                    key,
-                    key_state,
-                    modifiers_state,
-                    interpreted,
-                } => {
-                    app.get_widget()
-                        .keyboard_input(key, modifiers_state, key_state, interpreted);
-                    q.lock().unwrap().push_back(Cmd::Draw);
-                }
-                Cmd::ToggleVisible => {
-                    visible = !visible;
-                    if visible {
-                        app.get_widget().enter();
-                        app.show();
-                    } else {
-                        app.hide();
-                        app.get_widget().leave();
-                    }
-                    app.flush_display();
-                }
-                Cmd::Exit => {
-                    if daemon {
-                        visible = false;
-                        app.hide();
-                        app.get_widget().leave();
-                        app.flush_display();
-                    } else {
-                        let _ = std::fs::remove_file(socket_path);
-                        return;
-                    }
-                }
-            },
-            None => {
-                app.flush_display();
-
-                wait_ctx.fds.clear();
-                wait_ctx.fds.push(ev_fd);
-                wait_ctx.fds.push(rx_fd);
-                wait_ctx.fds.push(ipc_fd);
-                wait_ctx.target_time = None;
-
-                app.get_widget().wait(&mut wait_ctx);
-
-                if let Some(target_time) = wait_ctx.target_time {
-                    let n = Local::now();
-                    let sleep = if target_time > n {
-                        target_time - n
-                    } else {
-                        Duration::seconds(0)
-                    };
-                    timer.set_state(
-                        TimerState::Oneshot(sleep.to_std().unwrap()),
-                        SetTimeFlags::Default,
-                    );
-                    wait_ctx.fds.push(tm_fd);
-                }
-
-                poll(&mut wait_ctx.fds, -1).unwrap();
-
-                if wait_ctx.fds[0]
-                    .revents()
-                    .unwrap()
-                    .contains(PollFlags::POLLIN)
-                {
-                    if let Some(guard) = app.event_queue().prepare_read() {
-                        if let Err(e) = guard.read_events() {
-                            if e.kind() != ::std::io::ErrorKind::WouldBlock {
-                                eprintln!(
-                                    "Error while trying to read from the wayland socket: {:?}",
-                                    e
-                                );
-                            }
-                        }
-                    }
-
-                    app.event_queue()
-                        .dispatch_pending()
-                        .expect("Failed to dispatch all messages.");
-                }
-
-                if wait_ctx.fds[1]
-                    .revents()
-                    .unwrap()
-                    .contains(PollFlags::POLLIN)
-                {
-                    let mut v = [0x00];
-                    rx_pipe.read_exact(&mut v).unwrap();
-                }
-
-                if wait_ctx.fds[2]
-                    .revents()
-                    .unwrap()
-                    .contains(PollFlags::POLLIN)
-                {
+        let _ = std::fs::remove_file(socket_path.clone());
+        let _ = thread::Builder::new()
+            .name("ipc_server".to_string())
+            .spawn(move || {
+                let listener = UnixListener::bind(socket_path.clone()).unwrap();
+                loop {
                     if let Ok((stream, _)) = listener.accept() {
-                        let client_queue = q.clone();
-                        let mut client_pipe = ipc_pipe.try_clone().unwrap();
-                        let _ = std::thread::Builder::new()
-                            .name("ipc_client".to_string())
-                            .spawn(move || {
+                        let _ = thread::Builder::new().name("ipc_client".to_string()).spawn(
+                            move || {
                                 let r = BufReader::new(stream);
                                 for line in r.lines() {
                                     match line {
-                                        Ok(v) => match v.as_str() {
-                                            "kill" => {
-                                                client_queue.lock().unwrap().push_back(Cmd::Exit)
-                                            }
-                                            "toggle_visible" => client_queue
-                                                .lock()
-                                                .unwrap()
-                                                .push_back(Cmd::ToggleVisible),
-                                            v => eprintln!("unknown command: {}", v),
-                                        },
-                                        Err(_) => return,
+                                        Ok(ref cmd) if cmd == "kill" => {
+                                            std::process::exit(0);
+                                        }
+                                        _ => {}
                                     }
-                                    client_pipe.write_all(&[0x1]).unwrap();
                                 }
-                            });
+                            },
+                        );
                     }
                 }
+            });
+    }
 
-                if wait_ctx.target_time.is_some()
-                    && wait_ctx.fds[wait_ctx.fds.len() - 1]
-                        .revents()
-                        .unwrap()
-                        .contains(PollFlags::POLLIN)
-                {
-                    timer.read();
-                    q.lock().unwrap().push_back(Cmd::Draw);
-                }
-            }
+    if let Some(font_paths) = config.font_paths {
+        for (key, value) in font_paths.into_iter() {
+            fm.add_font_path(Box::leak(key.into_boxed_str()), value);
         }
     }
+
+    let layout = Rc::new(config.widget.construct_layout(&mut 0));
+    let mut widgets: Vec<Box<dyn Widget>> = Vec::new();
+    config
+        .widget
+        .construct_widgets(&mut widgets, &mut fm, &events);
+
+    let font_thread = thread::Builder::new()
+        .name("fontloader".to_string())
+        .spawn(move || {
+            fm.load_fonts();
+            fm
+        })
+        .unwrap();
+
+    let mut state = State::new(
+        config.mode,
+        config.background,
+        widgets,
+        layout,
+        MaybeFontMap::Waiting(font_thread),
+        events,
+        keyrepeat_sender,
+    );
+
+    // Initial setup
+    //
+    while state.running && !state.ready {
+        event_loop
+            .dispatch(None, &mut state)
+            .expect("Could not dispatch event loop");
+    }
+    state.check_registry(&qhandle);
+
+    while state.running {
+        event_loop
+            .dispatch(None, &mut state)
+            .expect("Could not dispatch event loop");
+
+        if !state.configured || !state.dirty || !state.ready {
+            continue;
+        }
+
+        let mut force = false;
+        if state.bufmgr.buffers.is_empty() {
+            state.add_buffer(&qhandle);
+            force = true;
+        }
+
+        let mut bufcnt = state.bufmgr.buffers.len();
+        let buf = match state.bufmgr.next_buffer() {
+            Some(b) => b,
+            None => {
+                if state.bufmgr.buffers.len() >= 3 {
+                    continue;
+                }
+                state.add_buffer(&qhandle);
+                bufcnt = state.bufmgr.buffers.len();
+
+                match state.bufmgr.next_buffer() {
+                    Some(b) => b,
+                    None => {
+                        continue;
+                    }
+                }
+            }
+        };
+
+        if buf.last_damage.is_empty() {
+            for _ in 0..state.widgets.len() {
+                buf.last_damage.push(Geometry::new());
+            }
+        }
+
+        state.dirty = false;
+        buf.acquire();
+        let mut bufview = BufferView::new(
+            &mut buf.mmap,
+            (state.dimensions.0 as u32, state.dimensions.1 as u32),
+        );
+
+        let surface = state.main_surface.wl_surface.as_ref().unwrap().clone();
+        if force {
+            for (idx, widget) in state.widgets.iter_mut().enumerate() {
+                if force || widget.get_dirty() {
+                    let geo = widget.geometry();
+                    let mut subview = bufview.subgeometry(geo);
+                    buf.last_damage[idx] =
+                        widget.draw(&mut state.fonts.unwrap().borrow_mut(), &mut subview);
+                }
+            }
+            surface.damage_buffer(0, 0, 0x7FFFFFFF, 0x7FFFFFFF);
+        } else {
+            let mut drew = false;
+            for (idx, widget) in state.widgets.iter_mut().enumerate() {
+                if bufcnt > 1 || widget.get_dirty() {
+                    drew = true;
+
+                    let old_damage = buf.last_damage[idx];
+                    bufview.subgeometry(old_damage).clear();
+
+                    let geo = widget.geometry();
+                    let mut subview = bufview.subgeometry(geo);
+
+                    let new_damage =
+                        widget.draw(&mut state.fonts.unwrap().borrow_mut(), &mut subview);
+                    let combined_damage = new_damage.expand(old_damage);
+                    buf.last_damage[idx] = new_damage;
+
+                    surface.damage_buffer(
+                        combined_damage.x as i32,
+                        combined_damage.y as i32,
+                        combined_damage.width as i32,
+                        combined_damage.height as i32,
+                    );
+                }
+            }
+            if !drew {
+                buf.release();
+                conn.flush().unwrap();
+                continue;
+            }
+        }
+
+        state.ready = false;
+        surface.attach(Some(&buf.buffer), 0, 0);
+        surface.frame(&qhandle, ());
+        surface.commit();
+        conn.flush().unwrap();
+
+        // Now is a good as time as any to load the keymap
+        state.keyboard.resolve();
+    }
 }

src/state.rs

@@ -0,0 +1,859 @@
+use std::{
+    cmp::max,
+    default::Default,
+    env,
+    rc::Rc,
+    sync::{Arc, Mutex},
+};
+
+use wayland_client::{
+    Connection, Dispatch, QueueHandle, WEnum,
+    protocol::{
+        wl_buffer, wl_callback, wl_compositor, wl_keyboard, wl_pointer, wl_registry, wl_seat,
+        wl_shm, wl_shm_pool, wl_subcompositor, wl_subsurface, wl_surface,
+    },
+};
+
+use wayland_protocols::{
+    wp::{
+        single_pixel_buffer::v1::client::wp_single_pixel_buffer_manager_v1,
+        viewporter::client::{wp_viewport, wp_viewporter},
+    },
+    xdg::{
+        activation::v1::client::{xdg_activation_token_v1, xdg_activation_v1},
+        shell::client::{xdg_surface, xdg_toplevel, xdg_wm_base},
+    },
+};
+
+use wayland_protocols_wlr::layer_shell::v1::client::{zwlr_layer_shell_v1, zwlr_layer_surface_v1};
+
+use crate::{
+    buffer::BufferManager,
+    config::OperationMode,
+    event::{Event, Events, PointerButton, PointerEvent},
+    fonts::{FontMap, MaybeFontMap},
+    keyboard::{Keyboard, RepeatMessage},
+    widgets::{Geometry, Layout, Widget, WidgetUpdater},
+};
+
+use calloop::channel::Sender;
+
+#[derive(Default)]
+pub struct MainSurface {
+    pub wl_surface: Option<wl_surface::WlSurface>,
+    xdg_surface: Option<(xdg_surface::XdgSurface, xdg_toplevel::XdgToplevel)>,
+    layer_surface: Option<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1>,
+}
+
+#[derive(Default)]
+pub struct BackgroundSurface {
+    wl_surface: Option<wl_surface::WlSurface>,
+    subsurface: Option<wl_subsurface::WlSubsurface>,
+    viewport: Option<wp_viewport::WpViewport>,
+}
+
+#[derive(Default)]
+pub struct Protocols {
+    wl_compositor: Option<wl_compositor::WlCompositor>,
+    wl_subcompositor: Option<wl_subcompositor::WlSubcompositor>,
+    wl_shm: Option<wl_shm::WlShm>,
+    xdg_wm_base: Option<xdg_wm_base::XdgWmBase>,
+    xdg_activation: Option<xdg_activation_v1::XdgActivationV1>,
+    zwlr_layer_shell: Option<zwlr_layer_shell_v1::ZwlrLayerShellV1>,
+    viewporter: Option<wp_viewporter::WpViewporter>,
+    wp_single_pixel_buffer_manager:
+        Option<wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1>,
+}
+
+pub struct State {
+    mode: OperationMode,
+    background: Option<u32>,
+    pub main_surface: MainSurface,
+    pub bg_surface: BackgroundSurface,
+    pub protocols: Protocols,
+    pub running: bool,
+    pub ready: bool,
+    pub dirty: bool,
+    activated: bool,
+    pub configured: bool,
+    pub dimensions: (i32, i32),
+    pub bufmgr: BufferManager,
+    pub widgets: Vec<Box<dyn Widget>>,
+    pub keyboard: Keyboard,
+    pub keyrepeat_sender: Sender<RepeatMessage>,
+    pointer: Option<(f64, f64)>,
+    pub fonts: MaybeFontMap,
+    pub events: Arc<Mutex<Events>>,
+    layout: Rc<Box<dyn Layout>>,
+}
+
+impl State {
+    pub fn new(
+        mode: OperationMode,
+        background: Option<u32>,
+        widgets: Vec<Box<dyn Widget>>,
+        layout: Rc<Box<dyn Layout>>,
+        fonts: MaybeFontMap,
+        events: Arc<Mutex<Events>>,
+        keyrepeat_sender: Sender<RepeatMessage>,
+    ) -> State {
+        State {
+            protocols: Default::default(),
+            bg_surface: Default::default(),
+            main_surface: Default::default(),
+            running: true,
+            dirty: true,
+            activated: false,
+            configured: false,
+            dimensions: (320, 240),
+            bufmgr: BufferManager::new(),
+            keyboard: Keyboard::new(),
+            pointer: None,
+            keyrepeat_sender,
+            mode,
+            background,
+            widgets,
+            fonts,
+            events,
+            layout,
+            ready: false,
+        }
+    }
+
+    pub fn add_buffer(&mut self, qh: &QueueHandle<Self>) {
+        self.bufmgr.add_buffer(
+            self.protocols.wl_shm.as_ref().expect("missing wl_shm"),
+            self.dimensions,
+            qh,
+        );
+    }
+
+    pub fn activate(&mut self, qh: &QueueHandle<Self>) {
+        let key = match env::var("XDG_ACTIVATION_TOKEN") {
+            Ok(token) => token,
+            Err(_) => return,
+        };
+        if let (Some(surface), Some(activation)) = (
+            &self.main_surface.wl_surface,
+            &self.protocols.xdg_activation,
+        ) {
+            activation.activate(key, surface);
+            let activation_token = activation.get_activation_token(qh, ());
+            activation_token.commit();
+            unsafe {
+                env::remove_var("XDG_ACTIVATION_TOKEN");
+            }
+        }
+    }
+}
+
+impl WidgetUpdater for State {
+    fn geometry_update(
+        &mut self,
+        idx: usize,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+    ) -> Geometry {
+        self.widgets[idx].geometry_update(fonts, geometry)
+    }
+
+    fn minimum_size(&mut self, idx: usize, fonts: &mut FontMap) -> Geometry {
+        self.widgets[idx].minimum_size(fonts)
+    }
+}
+
+impl State {
+    pub fn check_registry(&mut self, qh: &QueueHandle<Self>) {
+        let wl_compositor = self
+            .protocols
+            .wl_compositor
+            .as_ref()
+            .expect("wl_compositor missing");
+        let main_surface = wl_compositor.create_surface(qh, ());
+        let bg_surface = wl_compositor.create_surface(qh, ());
+        self.main_surface.wl_surface = Some(main_surface.clone());
+        self.bg_surface.wl_surface = Some(bg_surface.clone());
+        self.activate(qh);
+
+        let wl_subcompositor = self
+            .protocols
+            .wl_subcompositor
+            .as_ref()
+            .expect("wl_subcompositor missing");
+        let subsurface = wl_subcompositor.get_subsurface(&bg_surface, &main_surface, qh, ());
+        subsurface.place_below(&main_surface);
+        self.bg_surface.subsurface = Some(subsurface.clone());
+
+        match self.mode {
+            OperationMode::XdgToplevel => {
+                self.fonts.resolve();
+                let xdg_wm_base = self
+                    .protocols
+                    .xdg_wm_base
+                    .as_ref()
+                    .expect("xdg_wm_base missing");
+                let xdg_surface = xdg_wm_base.get_xdg_surface(&main_surface, qh, ());
+                let toplevel = xdg_surface.get_toplevel(qh, ());
+                toplevel.set_title("wldash".into());
+                main_surface.commit();
+
+                self.main_surface.xdg_surface = Some((xdg_surface, toplevel));
+            }
+            OperationMode::LayerSurface(size) => {
+                self.fonts.resolve();
+                let layer_shell = self
+                    .protocols
+                    .zwlr_layer_shell
+                    .as_ref()
+                    .expect("zwlr_layer_shell_v1 missing");
+                let layer_surface = layer_shell.get_layer_surface(
+                    &main_surface,
+                    None,
+                    zwlr_layer_shell_v1::Layer::Overlay,
+                    "launcher".to_string(),
+                    qh,
+                    (),
+                );
+                let fonts = self.fonts.unwrap();
+                let layout = self.layout.clone();
+                let min_size = layout.minimum_size(&mut fonts.borrow_mut(), self);
+                layer_surface.set_keyboard_interactivity(
+                    zwlr_layer_surface_v1::KeyboardInteractivity::Exclusive,
+                );
+                layer_surface.set_anchor(
+                    zwlr_layer_surface_v1::Anchor::Left
+                        .union(zwlr_layer_surface_v1::Anchor::Bottom)
+                        .union(zwlr_layer_surface_v1::Anchor::Right)
+                        .union(zwlr_layer_surface_v1::Anchor::Top),
+                );
+                layer_surface.set_size(max(size.0, min_size.width), max(size.1, min_size.height));
+
+                main_surface.commit();
+                self.main_surface.layer_surface = Some(layer_surface);
+            }
+        }
+
+        let viewporter = self
+            .protocols
+            .viewporter
+            .as_ref()
+            .expect("wp_viewporter missing");
+        let viewport = viewporter.get_viewport(&bg_surface, qh, ());
+        self.bg_surface.viewport = Some(viewport);
+
+        if let Some(background) = self.background {
+            let wp_single_pixel_buffer_manager = self
+                .protocols
+                .wp_single_pixel_buffer_manager
+                .as_ref()
+                .expect("wp_single_pixel_buffer_manager_v1 missing");
+            let buffer =
+                wp_single_pixel_buffer_manager.create_u32_rgba_buffer(0, 0, 0, background, qh, ());
+            bg_surface.attach(Some(&buffer), 0, 0);
+            bg_surface.damage_buffer(0, 0, 1, 1);
+        }
+    }
+}
+
+impl Dispatch<wl_registry::WlRegistry, ()> for State {
+    fn event(
+        state: &mut Self,
+        registry: &wl_registry::WlRegistry,
+        event: wl_registry::Event,
+        _: &(),
+        _: &Connection,
+        qh: &QueueHandle<Self>,
+    ) {
+        if let wl_registry::Event::Global {
+            name, interface, ..
+        } = event
+        {
+            match &interface[..] {
+                "wl_compositor" => {
+                    state.protocols.wl_compositor =
+                        Some(registry.bind::<wl_compositor::WlCompositor, _, _>(name, 5, qh, ()));
+                }
+                "wl_subcompositor" => {
+                    state.protocols.wl_subcompositor = Some(
+                        registry.bind::<wl_subcompositor::WlSubcompositor, _, _>(name, 1, qh, ()),
+                    );
+                }
+                "wl_shm" => {
+                    state.protocols.wl_shm =
+                        Some(registry.bind::<wl_shm::WlShm, _, _>(name, 1, qh, ()));
+                }
+                "wl_seat" => {
+                    registry.bind::<wl_seat::WlSeat, _, _>(name, 8, qh, ());
+                }
+                "xdg_wm_base" => {
+                    if let OperationMode::XdgToplevel = state.mode {
+                        state.protocols.xdg_wm_base =
+                            Some(registry.bind::<xdg_wm_base::XdgWmBase, _, _>(name, 2, qh, ()));
+                    }
+                }
+                "xdg_activation_v1" => {
+                    state.protocols.xdg_activation = Some(
+                        registry.bind::<xdg_activation_v1::XdgActivationV1, _, _>(name, 1, qh, ()),
+                    );
+                }
+                "zwlr_layer_shell_v1" => {
+                    if let OperationMode::LayerSurface(_) = state.mode {
+                        state.protocols.zwlr_layer_shell = Some(
+                            registry.bind::<zwlr_layer_shell_v1::ZwlrLayerShellV1, _, _>(
+                                name,
+                                4,
+                                qh,
+                                (),
+                            ),
+                        );
+                    }
+                }
+                "wp_viewporter" => {
+                    state.protocols.viewporter =
+                        Some(registry.bind::<wp_viewporter::WpViewporter, _, _>(name, 1, qh, ()));
+                }
+                "wp_single_pixel_buffer_manager_v1" => {
+                    state.protocols.wp_single_pixel_buffer_manager = Some(registry.bind::<wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1, _, _>(name, 1, qh, ()));
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+impl Dispatch<wl_callback::WlCallback, ()> for State {
+    fn event(
+        state: &mut Self,
+        _: &wl_callback::WlCallback,
+        event: wl_callback::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        if let wl_callback::Event::Done { callback_data: _ } = event {
+            state.ready = true
+        }
+    }
+}
+
+impl Dispatch<wl_compositor::WlCompositor, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wl_compositor::WlCompositor,
+        _: wl_compositor::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wl_subcompositor::WlSubcompositor, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wl_subcompositor::WlSubcompositor,
+        _: wl_subcompositor::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wl_surface::WlSurface, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wl_surface::WlSurface,
+        _: wl_surface::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wl_subsurface::WlSubsurface, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wl_subsurface::WlSubsurface,
+        _: wl_subsurface::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wl_shm::WlShm, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wl_shm::WlShm,
+        _: wl_shm::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wl_shm_pool::WlShmPool, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wl_shm_pool::WlShmPool,
+        _: wl_shm_pool::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wl_buffer::WlBuffer, ()> for State {
+    fn event(
+        state: &mut Self,
+        buffer: &wl_buffer::WlBuffer,
+        _: wl_buffer::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        for buf in state.bufmgr.buffers.iter_mut() {
+            if &buf.buffer == buffer {
+                buf.release();
+            }
+        }
+    }
+}
+
+impl Dispatch<zwlr_layer_shell_v1::ZwlrLayerShellV1, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &zwlr_layer_shell_v1::ZwlrLayerShellV1,
+        _: zwlr_layer_shell_v1::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ()> for State {
+    fn event(
+        state: &mut Self,
+        layer_surface: &zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
+        event: zwlr_layer_surface_v1::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        match event {
+            zwlr_layer_surface_v1::Event::Configure {
+                serial,
+                mut width,
+                mut height,
+            } => {
+                if (width, height) == (0, 0) {
+                    if state.configured {
+                        return;
+                    }
+                    (width, height) = (640, 480);
+                }
+                layer_surface.ack_configure(serial);
+                let first_configure = !state.configured;
+                state.configured = true;
+                state.dirty = true;
+
+                let dim = (width as i32, height as i32);
+
+                // Always lay out on the first configure, even if the
+                // compositor happens to hand us our placeholder dimensions.
+                if !first_configure && state.dimensions == dim {
+                    return;
+                }
+                state.bufmgr.clear_buffers();
+                state.dimensions = dim;
+                let fonts = state.fonts.unwrap();
+                let layout = state.layout.clone();
+                layout.geometry_update(
+                    &mut fonts.borrow_mut(),
+                    &Geometry {
+                        x: 0,
+                        y: 0,
+                        width,
+                        height,
+                    },
+                    state,
+                );
+
+                let surface = state
+                    .bg_surface
+                    .wl_surface
+                    .as_ref()
+                    .expect("bg surface was not ready");
+                let viewport = state
+                    .bg_surface
+                    .viewport
+                    .as_ref()
+                    .expect("bg viewport was not ready");
+                viewport.set_destination(dim.0, dim.1);
+                surface.commit();
+            }
+            zwlr_layer_surface_v1::Event::Closed => {
+                std::process::exit(0);
+            }
+            _ => (),
+        }
+    }
+}
+
+impl Dispatch<xdg_wm_base::XdgWmBase, ()> for State {
+    fn event(
+        _: &mut Self,
+        wm_base: &xdg_wm_base::XdgWmBase,
+        event: xdg_wm_base::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        if let xdg_wm_base::Event::Ping { serial } = event {
+            wm_base.pong(serial);
+        }
+    }
+}
+
+impl Dispatch<xdg_surface::XdgSurface, ()> for State {
+    fn event(
+        state: &mut Self,
+        xdg_surface: &xdg_surface::XdgSurface,
+        event: xdg_surface::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        if let xdg_surface::Event::Configure { serial, .. } = event {
+            xdg_surface.ack_configure(serial);
+            state.configured = true;
+            state.dirty = true;
+        }
+    }
+}
+
+impl Dispatch<xdg_toplevel::XdgToplevel, ()> for State {
+    fn event(
+        state: &mut Self,
+        _: &xdg_toplevel::XdgToplevel,
+        event: xdg_toplevel::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        match event {
+            xdg_toplevel::Event::Configure {
+                mut width,
+                mut height,
+                states,
+                ..
+            } => {
+                if (width, height) == (0, 0) {
+                    if state.configured {
+                        return;
+                    }
+                    (width, height) = (1280, 720);
+                }
+                let activated = states
+                    .iter()
+                    .find(|&st| *st as u32 == xdg_toplevel::State::Activated as u32)
+                    .is_some();
+
+                if activated {
+                    state.activated = true;
+                } else if state.activated && !activated {
+                    let ev = Event::FocusLost;
+                    for widget in state.widgets.iter_mut() {
+                        widget.event(&ev);
+                    }
+                }
+
+                if !state.configured || state.dimensions != (width, height) {
+                    let surface = state
+                        .bg_surface
+                        .wl_surface
+                        .as_ref()
+                        .expect("bg surface was not ready");
+                    let viewport = state
+                        .bg_surface
+                        .viewport
+                        .as_ref()
+                        .expect("bg viewportw as not ready");
+                    viewport.set_destination(width, height);
+                    surface.commit();
+
+                    state.bufmgr.clear_buffers();
+                    state.dimensions = (width, height);
+                    state.fonts.resolve();
+                    let fonts = state.fonts.unwrap();
+                    let layout = state.layout.clone();
+                    layout.geometry_update(
+                        &mut fonts.borrow_mut(),
+                        &Geometry {
+                            x: 0,
+                            y: 0,
+                            width: width as u32,
+                            height: height as u32,
+                        },
+                        state,
+                    );
+                }
+            }
+            xdg_toplevel::Event::Close => {
+                state.running = false;
+            }
+            _ => (),
+        }
+    }
+}
+
+impl Dispatch<wl_seat::WlSeat, ()> for State {
+    fn event(
+        _: &mut Self,
+        seat: &wl_seat::WlSeat,
+        event: wl_seat::Event,
+        _: &(),
+        _: &Connection,
+        qh: &QueueHandle<Self>,
+    ) {
+        if let wl_seat::Event::Capabilities {
+            capabilities: WEnum::Value(capabilities),
+        } = event
+        {
+            if capabilities.contains(wl_seat::Capability::Keyboard) {
+                seat.get_keyboard(qh, ());
+            }
+            if capabilities.contains(wl_seat::Capability::Pointer) {
+                seat.get_pointer(qh, ());
+            }
+        }
+    }
+}
+
+impl Dispatch<wl_keyboard::WlKeyboard, ()> for State {
+    fn event(
+        state: &mut Self,
+        _: &wl_keyboard::WlKeyboard,
+        event: wl_keyboard::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        match event {
+            wl_keyboard::Event::Leave { .. } => {
+                state
+                    .keyrepeat_sender
+                    .send(RepeatMessage::StopRepeat)
+                    .unwrap();
+            }
+            wl_keyboard::Event::Key {
+                key,
+                state: kbstate,
+                ..
+            } => {
+                state.keyboard.resolve();
+                let k = state.keyboard.key(key, kbstate);
+                let repeats = k.repeats;
+                let ev = Event::KeyEvent(k);
+                // Widgets see the key first so the launcher gets to save its
+                // prompt on Escape (the early-return used to swallow it).
+                for widget in state.widgets.iter_mut() {
+                    widget.event(&ev);
+                }
+                // Raw keycode 1 is KEY_ESC: fall back to quitting even when no
+                // keymap could be loaded and no widget handled it.
+                if key == 1 && kbstate == WEnum::Value(wl_keyboard::KeyState::Pressed) {
+                    state.running = false;
+                    return;
+                }
+                if repeats && let Event::KeyEvent(k) = ev {
+                    state
+                        .keyrepeat_sender
+                        .send(RepeatMessage::KeyEvent(k))
+                        .unwrap();
+                }
+                state.dirty = true;
+            }
+            wl_keyboard::Event::Modifiers {
+                mods_depressed,
+                mods_latched,
+                mods_locked,
+                group,
+                ..
+            } => {
+                state
+                    .keyboard
+                    .modifiers(mods_depressed, mods_latched, mods_locked, group);
+            }
+            wl_keyboard::Event::Keymap { format, fd, size } => {
+                // TODO: Keymap loading blocks xdg configure, consider delaying
+                state.keyboard.keymap(format, fd, size);
+            }
+            wl_keyboard::Event::RepeatInfo { rate, delay } => {
+                state
+                    .keyrepeat_sender
+                    .send(RepeatMessage::RepeatInfo((rate as u32, delay as u32)))
+                    .unwrap();
+            }
+            _ => (),
+        }
+    }
+}
+
+// TODO: Move to dedicated pointer module
+const BTN_LEFT: u32 = 0x110;
+const BTN_RIGHT: u32 = 0x111;
+const BTN_MIDDLE: u32 = 0x112;
+
+impl Dispatch<wl_pointer::WlPointer, ()> for State {
+    fn event(
+        state: &mut Self,
+        _: &wl_pointer::WlPointer,
+        event: wl_pointer::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        match event {
+            wl_pointer::Event::Enter {
+                surface_x,
+                surface_y,
+                ..
+            } => {
+                state.pointer = Some((surface_x, surface_y));
+            }
+            wl_pointer::Event::Motion {
+                surface_x,
+                surface_y,
+                ..
+            } => {
+                state.pointer = Some((surface_x, surface_y));
+            }
+            wl_pointer::Event::Leave { .. } => state.pointer = None,
+            wl_pointer::Event::Axis { axis, value, .. } => {
+                if let Some((x, y)) = state.pointer {
+                    let axis = match axis {
+                        WEnum::Value(wl_pointer::Axis::VerticalScroll) => {
+                            PointerButton::ScrollVertical(value)
+                        }
+                        WEnum::Value(wl_pointer::Axis::HorizontalScroll) => {
+                            PointerButton::ScrollHorizontal(value)
+                        }
+                        _ => return,
+                    };
+                    let pos = (x as u32, y as u32);
+                    for widget in state.widgets.iter_mut() {
+                        let geo = widget.geometry();
+                        if geo.contains(pos) {
+                            let pos = (pos.0 - geo.x, pos.1 - geo.y);
+                            let ev = Event::PointerEvent(PointerEvent { button: axis, pos });
+                            widget.event(&ev);
+                            state.dirty = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            wl_pointer::Event::Button {
+                button,
+                state: button_state,
+                ..
+            } => {
+                if let (button, WEnum::Value(wl_pointer::ButtonState::Pressed), Some((x, y))) =
+                    (button, button_state, state.pointer)
+                {
+                    let button = match button {
+                        BTN_LEFT => PointerButton::Left,
+                        BTN_RIGHT => PointerButton::Right,
+                        BTN_MIDDLE => PointerButton::Middle,
+                        _ => return,
+                    };
+                    let pos = (x as u32, y as u32);
+                    for widget in state.widgets.iter_mut() {
+                        let geo = widget.geometry();
+                        if geo.contains(pos) {
+                            let pos = (pos.0 - geo.x, pos.1 - geo.y);
+                            let ev = Event::PointerEvent(PointerEvent { button, pos });
+                            widget.event(&ev);
+                            state.dirty = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            _ => (),
+        }
+    }
+}
+
+impl Dispatch<wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1,
+        _: wp_single_pixel_buffer_manager_v1::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wp_viewporter::WpViewporter, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wp_viewporter::WpViewporter,
+        _: wp_viewporter::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<wp_viewport::WpViewport, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &wp_viewport::WpViewport,
+        _: wp_viewport::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<xdg_activation_v1::XdgActivationV1, ()> for State {
+    fn event(
+        _: &mut Self,
+        _: &xdg_activation_v1::XdgActivationV1,
+        _: xdg_activation_v1::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<xdg_activation_token_v1::XdgActivationTokenV1, ()> for State {
+    fn event(
+        state: &mut Self,
+        _: &xdg_activation_token_v1::XdgActivationTokenV1,
+        event: xdg_activation_token_v1::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        if let xdg_activation_token_v1::Event::Done { token } = event {
+            let ev = Event::TokenUpdate(token);
+            for widget in state.widgets.iter_mut() {
+                widget.event(&ev);
+            }
+        }
+    }
+}

src/utils/desktop.rs

@@ -0,0 +1,125 @@
+use std::{
+    cmp::Ordering,
+    collections::HashSet,
+    error::Error,
+    fs::read_to_string,
+    hash::{Hash, Hasher},
+    io::{Error as io_error, ErrorKind},
+    path::Path,
+};
+
+use walkdir::WalkDir;
+
+use crate::utils::{inish, xdg};
+
+#[derive(Clone, Debug, Eq)]
+pub struct Desktop {
+    pub entry_type: String,
+    pub name: String,
+    pub no_display: bool,
+    pub hidden: bool,
+    pub exec: Option<String>,
+    pub url: Option<String>,
+    pub term: bool,
+    pub keywords: Vec<String>,
+}
+
+impl Desktop {
+    fn parse(f: &Path) -> Result<Desktop, Box<dyn Error>> {
+        let s = read_to_string(f)?;
+        let config = inish::parse(&s)?;
+        match config.get("Desktop Entry") {
+            Some(section) => Ok(Desktop {
+                entry_type: section.get("Type").unwrap_or(&"").to_string(),
+                name: section.get("Name").unwrap_or(&"").to_string(),
+                term: section.get("Terminal").unwrap_or(&"") == &"true",
+                no_display: section.get("NoDisplay").unwrap_or(&"") == &"true",
+                hidden: section.get("Hidden").unwrap_or(&"") == &"true",
+                exec: section.get("Exec").map(|x| x.to_string()),
+                url: section.get("URL").map(|x| x.to_string()),
+                keywords: section
+                    .get("Keywords")
+                    .map(|x| {
+                        x.split(';')
+                            .map(|y| y.trim().to_string())
+                            .filter(|z| !z.is_empty())
+                            .collect()
+                    })
+                    .unwrap_or_else(std::vec::Vec::new),
+            }),
+            None => Err(Box::new(io_error::new(
+                ErrorKind::NotFound,
+                "no desktop entry in file",
+            ))),
+        }
+    }
+}
+
+impl Ord for Desktop {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.name.cmp(&other.name)
+    }
+}
+
+impl PartialOrd for Desktop {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl PartialEq for Desktop {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+    }
+}
+
+// Must agree with PartialEq: equal entries (same name) must hash equally.
+impl Hash for Desktop {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.name.hash(state)
+    }
+}
+
+/// Scan every XDG applications directory for launchable entries.
+///
+/// This used to be cached as JSON under XDG_CACHE_HOME and refreshed by
+/// hand with `--desktop-refresh`. The scan is a few milliseconds over
+/// local /usr/share and runs on a background thread, while the cache sat
+/// on the (possibly NFS-mounted) home directory and went stale whenever a
+/// package was installed. So: no cache.
+pub fn load_desktop_files() -> Vec<Desktop> {
+    let dirs = xdg::data_folders();
+
+    let mut desktop: Vec<Desktop> = Vec::new();
+    let mut seen: HashSet<String> = HashSet::new();
+
+    for dir in dirs {
+        for entry in WalkDir::new(format!("{}/applications", dir))
+            .into_iter()
+            .flatten()
+        {
+            // Entries are often symlinks, so only rule out directories.
+            if entry.file_type().is_dir()
+                || entry.path().extension().and_then(|e| e.to_str()) != Some("desktop")
+            {
+                continue;
+            }
+            {
+                if let Ok(d) = Desktop::parse(entry.path()) {
+                    if d.hidden
+                        || d.no_display
+                        || (d.entry_type != "Application" && d.entry_type != "Link")
+                    {
+                        continue;
+                    }
+                    if !seen.contains(&d.name) {
+                        seen.insert(d.name.to_string());
+                        desktop.push(d);
+                    }
+                }
+            }
+        }
+    }
+
+    desktop
+}

src/utils/inish.rs

@@ -0,0 +1,134 @@
+use std::{collections::HashMap, error::Error};
+
+fn parse_field(line: &str) -> Result<(&str, &str), Box<dyn Error>> {
+    let split = match line.find('=') {
+        Some(v) => v,
+        None => return Err("expected equals sign on line, but found none".into()),
+    };
+
+    let (key, value) = line.split_at(split);
+    let (key, value) = (key.trim(), value.trim_matches('=').trim());
+
+    Ok((key, value))
+}
+
+type InishSection<'a> = HashMap<&'a str, &'a str>;
+type Inish<'a> = HashMap<&'a str, InishSection<'a>>;
+
+pub fn parse<'a>(s: &'a str) -> Result<Inish<'a>, Box<dyn Error>> {
+    let mut sections: Inish<'a> = HashMap::new();
+    let mut current_section = HashMap::new();
+    let mut current_section_name = "";
+
+    for line in s.lines() {
+        let line = line.trim();
+        let mut chars = line.chars();
+        let start = chars.next();
+        let end = chars.last();
+        match (start, end) {
+            (Some('#'), _) => continue,
+            (Some('['), Some(']')) => {
+                sections.insert(current_section_name, current_section);
+                current_section = HashMap::new();
+                let len = line.len();
+                current_section_name = line[1..len - 1].trim();
+            }
+            (Some('['), v) => {
+                return Err(format!(
+                    "expected Some(']') to terminate section name, but got {:?}",
+                    v
+                )
+                .into());
+            }
+            _ if line.is_empty() => continue,
+            _ => {
+                let (key, value) = parse_field(line)?;
+                current_section.insert(key, value);
+            }
+        }
+    }
+
+    sections.insert(current_section_name, current_section);
+    Ok(sections)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn sections() {
+        let config = parse(
+            "
+[section_a]
+[section_b]
+",
+        )
+        .expect("config didn't parse");
+
+        if !config.contains_key("section_a") {
+            panic!("named section did not exist");
+        }
+
+        if !config.contains_key("section_b") {
+            panic!("named section did not exist");
+        }
+
+        if !config.contains_key("") {
+            panic!("unnamed section did not exist");
+        }
+    }
+
+    #[test]
+    fn fields() {
+        let config = parse(
+            "
+field_outside = 'hello'
+[section_a]
+field_a = 1234
+",
+        )
+        .expect("config didn't parse");
+
+        let section_a = match config.get("section_a") {
+            Some(v) => v,
+            None => panic!("named section did not exist"),
+        };
+
+        assert_eq!(section_a.get("field_a"), Some(&"1234"));
+
+        let section_unnamed = match config.get("") {
+            Some(v) => v,
+            None => panic!("unnamed section did not exist"),
+        };
+
+        assert_eq!(section_unnamed.get("field_outside"), Some(&"'hello'"));
+    }
+
+    #[test]
+    fn whitespaces() {
+        let config = parse(
+            "
+
+ field outside  =   'hello'
+
+[ section a   ]
+   field a   =   1234   ",
+        )
+        .expect("config didn't parse");
+
+        let section_a = match config.get("section a") {
+            Some(v) => v,
+            None => panic!("named section did not exist"),
+        };
+
+        assert_eq!(section_a.get("field a"), Some(&"1234"));
+
+        let section_unnamed = match config.get("") {
+            Some(v) => v,
+            None => panic!("unnamed section did not exist"),
+        };
+
+        assert_eq!(section_unnamed.get("field outside"), Some(&"'hello'"));
+    }
+}

src/utils/mod.rs

@@ -0,0 +1,3 @@
+pub mod desktop;
+mod inish;
+pub mod xdg;

src/utils/xdg.rs

@@ -0,0 +1,52 @@
+use std::env;
+
+pub fn cache_folder() -> String {
+    match env::var_os("XDG_CACHE_HOME") {
+        Some(s) => s.into_string().unwrap(),
+        None => {
+            let home = env::var_os("HOME").unwrap().into_string().unwrap();
+            format!("{}/.cache", home)
+        }
+    }
+}
+
+/// XDG_STATE_HOME: small persistent state (calculator history, saved
+/// prompt). Unlike a cache this is worth roaming with the home directory.
+pub fn state_folder() -> String {
+    match env::var_os("XDG_STATE_HOME") {
+        Some(s) => s.into_string().unwrap(),
+        None => {
+            let home = env::var_os("HOME").unwrap().into_string().unwrap();
+            format!("{}/.local/state", home)
+        }
+    }
+}
+
+pub fn config_folder() -> String {
+    match env::var_os("XDG_CONFIG_HOME") {
+        Some(s) => s.into_string().unwrap(),
+        None => {
+            let home = env::var_os("HOME").unwrap().into_string().unwrap();
+            format!("{}/.config", home)
+        }
+    }
+}
+
+pub fn data_folders() -> Vec<String> {
+    let xdg_data_home = match env::var_os("XDG_DATA_HOME") {
+        Some(s) => s.into_string().unwrap(),
+        None => {
+            let home = env::var_os("HOME").unwrap().into_string().unwrap();
+            format!("{}/.local/share", home)
+        }
+    };
+    let xdg_data_dirs = match env::var_os("XDG_DATA_DIRS") {
+        Some(s) => s.into_string().unwrap(),
+        None => "/usr/local/share:/usr/share".to_string(),
+    };
+
+    // Eww.
+    std::iter::once(xdg_data_home.to_string())
+        .chain(xdg_data_dirs.split(':').map(|x| x.to_string()))
+        .collect()
+}

src/widget.rs

@@ -1,434 +0,0 @@
-use crate::buffer::Buffer;
-use crate::color::Color;
-use chrono::{DateTime, Local};
-use nix::poll::PollFd;
-pub use smithay_client_toolkit::keyboard::{KeyState, ModifiersState};
-
-pub struct DrawContext<'a> {
-    pub buf: &'a mut Buffer<'a>,
-    pub bg: &'a Color,
-    pub time: &'a DateTime<Local>,
-    pub force: bool,
-}
-
-#[derive(Debug)]
-pub struct DrawReport {
-    pub width: u32,
-    pub height: u32,
-    pub damage: Vec<(i32, i32, i32, i32)>,
-    pub full_damage: bool,
-}
-
-impl DrawReport {
-    pub fn empty(width: u32, height: u32) -> DrawReport {
-        DrawReport {
-            width,
-            height,
-            damage: Vec::new(),
-            full_damage: false,
-        }
-    }
-}
-
-pub struct WaitContext {
-    pub fds: Vec<PollFd>,
-    pub target_time: Option<DateTime<Local>>,
-}
-
-impl WaitContext {
-    pub fn set_time(&mut self, new_time: DateTime<Local>) {
-        if let Some(ot) = self.target_time {
-            if new_time < ot {
-                self.target_time = Some(new_time);
-            }
-        } else {
-            self.target_time = Some(new_time);
-        }
-    }
-}
-
-pub trait Widget {
-    fn wait(&mut self, ctx: &mut WaitContext);
-    fn enter(&mut self);
-    fn leave(&mut self);
-    fn size(&self) -> (u32, u32);
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error>;
-
-    fn keyboard_input(
-        &mut self,
-        keysym: u32,
-        modifier_state: ModifiersState,
-        key_state: KeyState,
-        interpreted: Option<String>,
-    );
-    fn mouse_click(&mut self, button: u32, pos: (u32, u32));
-    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32));
-}
-
-pub struct VerticalLayout {
-    pub children: Vec<Box<dyn Widget + Send>>,
-}
-
-#[allow(dead_code)]
-impl VerticalLayout {
-    pub fn new(children: Vec<Box<dyn Widget + Send>>) -> Box<VerticalLayout> {
-        Box::new(VerticalLayout { children: children })
-    }
-}
-
-impl Widget for VerticalLayout {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        for child in &mut self.children {
-            child.wait(ctx);
-        }
-    }
-    fn enter(&mut self) {
-        for child in &mut self.children {
-            child.enter();
-        }
-    }
-    fn leave(&mut self) {
-        for child in &mut self.children {
-            child.leave();
-        }
-    }
-    fn size(&self) -> (u32, u32) {
-        let mut width = 0;
-        let mut height = 0;
-
-        for child in &self.children {
-            let size = child.size();
-            if size.0 > width {
-                width = size.0;
-            }
-            height += size.1;
-        }
-
-        (width, height)
-    }
-
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let mut offset = pos.1;
-        let mut width = 0;
-        let mut damage = Vec::new();
-        let mut full_damage = false;
-
-        for child in &mut self.children {
-            let mut report = child.draw(ctx, (pos.0, offset))?;
-            if report.width > width {
-                width = report.width;
-            }
-            offset += report.height;
-            full_damage |= report.full_damage;
-            damage.append(&mut report.damage);
-        }
-
-        Ok(DrawReport {
-            width,
-            height: offset - pos.1,
-            damage,
-            full_damage,
-        })
-    }
-
-    fn keyboard_input(
-        &mut self,
-        keysym: u32,
-        modifier_state: ModifiersState,
-        key_state: KeyState,
-        interpreted: Option<String>,
-    ) {
-        for child in &mut self.children {
-            child.keyboard_input(keysym, modifier_state, key_state, interpreted.clone());
-        }
-    }
-
-    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
-        let mut height = 0;
-
-        for child in &mut self.children {
-            let size = child.size();
-            if pos.1 >= height && pos.1 < height + size.1 {
-                let pos = (pos.0, pos.1 - height);
-                child.mouse_click(button, pos);
-                return;
-            }
-            height += size.1;
-        }
-    }
-
-    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
-        let mut height = 0;
-
-        for child in &mut self.children {
-            let size = child.size();
-            if pos.1 >= height && pos.1 < height + size.1 {
-                let pos = (pos.0, pos.1 - height);
-                child.mouse_scroll(scroll, pos);
-                return;
-            }
-            height += size.1;
-        }
-    }
-}
-
-pub struct HorizontalLayout {
-    pub children: Vec<Box<dyn Widget + Send>>,
-}
-
-#[allow(dead_code)]
-impl HorizontalLayout {
-    pub fn new(children: Vec<Box<dyn Widget + Send>>) -> Box<HorizontalLayout> {
-        Box::new(HorizontalLayout { children: children })
-    }
-}
-
-impl Widget for HorizontalLayout {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        for child in &mut self.children {
-            child.wait(ctx);
-        }
-    }
-    fn enter(&mut self) {
-        for child in &mut self.children {
-            child.enter();
-        }
-    }
-    fn leave(&mut self) {
-        for child in &mut self.children {
-            child.leave();
-        }
-    }
-    fn size(&self) -> (u32, u32) {
-        let mut width = 0;
-        let mut height = 0;
-
-        for child in &self.children {
-            let size = child.size();
-            if size.1 > height {
-                height = size.1;
-            }
-            width += size.0;
-        }
-
-        (width, height)
-    }
-
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let mut offset = pos.0;
-        let mut height = 0;
-        let mut damage = Vec::new();
-        let mut full_damage = false;
-
-        for child in &mut self.children {
-            let mut report = child.draw(ctx, (offset, pos.1))?;
-            if report.height > height {
-                height = report.height;
-            }
-            offset += report.width;
-            full_damage |= report.full_damage;
-            damage.append(&mut report.damage);
-        }
-
-        Ok(DrawReport {
-            width: offset - pos.0,
-            height,
-            damage,
-            full_damage,
-        })
-    }
-
-    fn keyboard_input(
-        &mut self,
-        keysym: u32,
-        modifier_state: ModifiersState,
-        key_state: KeyState,
-        interpreted: Option<String>,
-    ) {
-        for child in &mut self.children {
-            child.keyboard_input(keysym, modifier_state, key_state, interpreted.clone());
-        }
-    }
-
-    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
-        let mut width = 0;
-
-        for child in &mut self.children {
-            let size = child.size();
-            if pos.0 >= width && pos.0 < width + size.0 {
-                let pos = (pos.0 - width, pos.1);
-                child.mouse_click(button, pos);
-                return;
-            }
-
-            width += size.0;
-        }
-    }
-
-    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
-        let mut width = 0;
-
-        for child in &mut self.children {
-            let size = child.size();
-            if pos.0 >= width && pos.0 < width + size.0 {
-                let pos = (pos.0 - width, pos.1);
-                child.mouse_scroll(scroll, pos);
-                return;
-            }
-
-            width += size.0;
-        }
-    }
-}
-
-pub struct Margin {
-    pub child: Box<dyn Widget + Send>,
-    pub margins: (u32, u32, u32, u32), // left, right, top, bottom
-}
-
-#[allow(dead_code)]
-impl Margin {
-    pub fn new(margins: (u32, u32, u32, u32), child: Box<dyn Widget + Send>) -> Box<Margin> {
-        Box::new(Margin {
-            child: child,
-            margins: margins,
-        })
-    }
-}
-
-impl Widget for Margin {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.child.wait(ctx)
-    }
-    fn enter(&mut self) {
-        self.child.enter()
-    }
-    fn leave(&mut self) {
-        self.child.leave()
-    }
-    fn size(&self) -> (u32, u32) {
-        let size = self.child.size();
-        (
-            size.0 + self.margins.0 + self.margins.1,
-            size.1 + self.margins.2 + self.margins.3,
-        )
-    }
-
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let report = self
-            .child
-            .draw(ctx, (pos.0 + self.margins.0, pos.1 + self.margins.2))?;
-        Ok(DrawReport {
-            width: report.width + self.margins.0 + self.margins.1,
-            height: report.height + self.margins.2 + self.margins.3,
-            damage: report.damage,
-            full_damage: report.full_damage,
-        })
-    }
-
-    fn keyboard_input(
-        &mut self,
-        keysym: u32,
-        modifier_state: ModifiersState,
-        key_state: KeyState,
-        interpreted: Option<String>,
-    ) {
-        self.child
-            .keyboard_input(keysym, modifier_state, key_state, interpreted);
-    }
-
-    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
-        let pos = (
-            pos.0.saturating_sub(self.margins.0),
-            pos.1.saturating_sub(self.margins.2),
-        );
-        self.child.mouse_click(button, pos);
-    }
-
-    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
-        let pos = (
-            pos.0.saturating_sub(self.margins.0),
-            pos.1.saturating_sub(self.margins.2),
-        );
-        self.child.mouse_scroll(scroll, pos);
-    }
-}
-
-pub struct Fixed {
-    pub child: Box<dyn Widget + Send>,
-    pub size: (u32, u32),
-}
-
-#[allow(dead_code)]
-impl Fixed {
-    pub fn new(size: (u32, u32), child: Box<dyn Widget + Send>) -> Box<Fixed> {
-        Box::new(Fixed {
-            child: child,
-            size: size,
-        })
-    }
-}
-
-impl Widget for Fixed {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.child.wait(ctx)
-    }
-    fn enter(&mut self) {
-        self.child.enter()
-    }
-    fn leave(&mut self) {
-        self.child.leave()
-    }
-    fn size(&self) -> (u32, u32) {
-        self.size
-    }
-
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let report = self.child.draw(ctx, pos)?;
-        Ok(DrawReport {
-            width: self.size.0,
-            height: self.size.1,
-            damage: report.damage,
-            full_damage: report.full_damage,
-        })
-    }
-
-    fn keyboard_input(
-        &mut self,
-        keysym: u32,
-        modifier_state: ModifiersState,
-        key_state: KeyState,
-        interpreted: Option<String>,
-    ) {
-        self.child
-            .keyboard_input(keysym, modifier_state, key_state, interpreted);
-    }
-
-    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
-        self.child.mouse_click(button, pos);
-    }
-
-    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
-        self.child.mouse_scroll(scroll, pos);
-    }
-}

src/widgets/alsaaudio.rs

@@ -0,0 +1,112 @@
+use std::{
+    thread,
+    sync::{Arc, Mutex},
+};
+
+use crate::{
+    color::Color,
+    fonts::FontMap,
+    event::{Event, Events, PointerButton},
+    widgets::bar_widget::{BarWidget, BarWidgetImpl},
+};
+
+use alsa::mixer::{
+    Mixer, Selem, SelemChannelId, SelemId,
+};
+
+#[inline]
+fn alsa_volume_to_f32(volume: i64, min: i64, max: i64) -> f32 {
+    (volume - min) as f32 / (max - min) as f32
+}
+
+#[inline]
+fn f32_to_alsa_volume(volume: f32, min: i64, max: i64) -> i64 {
+    min + ((max - min) as f32 * volume) as i64
+}
+
+fn get_master_volume(selem: &mut Selem) -> f32 {
+    let (min, max) = selem.get_playback_volume_range();
+    selem
+        .get_playback_volume(SelemChannelId::mono())
+        .map(|volume| alsa_volume_to_f32(volume, min, max))
+        .unwrap()
+}
+
+fn get_mute(selem: &mut Selem) -> bool {
+    let res = selem.get_playback_switch(SelemChannelId::FrontLeft);
+    false
+}
+
+fn set_master_volume(selem: &mut Selem, volume: f32) {
+    let (min, max) = selem.get_playback_volume_range();
+    let volume = f32_to_alsa_volume(volume, min, max);
+    selem.set_playback_volume_all(volume).unwrap();
+}
+
+fn start_monitor(inner: Arc<Mutex<Inner>>) {
+    thread::Builder::new()
+        .name("audiomon".to_string())
+        .spawn(move || {
+            let mixer = Mixer::new("default", true).unwrap();
+            let id = SelemId::new("Master", 0);
+            let mut selem = mixer.find_selem(&id).unwrap();
+
+            let mut inner = inner.lock().unwrap();
+            inner.volume = get_master_volume(&mut selem);
+            inner.mute = get_mute(&mut selem);
+        })
+        .unwrap();
+}
+
+struct Inner {
+    volume: f32,
+    mute: bool,
+}
+
+pub struct AlsaAudio {
+    inner: Arc<Mutex<Inner>>,
+}
+
+impl AlsaAudio {
+    pub fn new(fm: &mut FontMap, font: &'static str, size: f32) -> BarWidget {
+        let inner = Arc::new(Mutex::new(Inner{
+            mute: false,
+            volume: 0.,
+        }));
+        start_monitor(inner.clone());
+        let dev = AlsaAudio{ inner };
+        BarWidget::new(Box::new(dev), fm, font, size)
+    }
+}
+
+impl BarWidgetImpl for AlsaAudio {
+    fn name(&self) -> &'static str {
+        "audio"
+    }
+    fn get_dirty(&self) -> bool {
+        true
+    }
+    fn value(&mut self) -> f32 {
+        let inner = self.inner.lock().unwrap();
+        inner.volume
+    }
+    fn color(&self) -> Color {
+        let inner = self.inner.lock().unwrap();
+        if inner.mute {
+            Color::DARKORANGE
+        } else {
+            Color::WHITE
+        }
+    }
+    fn click(&mut self, pos: f32, btn: PointerButton) {
+        let inner = self.inner.lock().unwrap();
+        match btn {
+//            PointerButton::Left =>  inner.set_master_volume(pos),
+            //PointerButton::Right => Some(Change::ToggleMute),
+            //PointerButton::ScrollVertical(val) => Some(Change::VolumeInc((val / 512.) as f32)),
+            //PointerButton::ScrollHorizontal(val) => Some(Change::VolumeInc((val / 100.) as f32)),
+            _ => (),
+        };
+    }
+
+}

src/widgets/audio/alsa_sound.rs

@@ -1,111 +0,0 @@
-use crate::color::Color;
-use crate::widget::WaitContext;
-use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
-
-use alsa::mixer::{Mixer, Selem, SelemChannelId, SelemId};
-
-const CARD_NAME: &'static str = "default";
-const SELEM_NAME: &'static str = "Master";
-const SELEM_ID: u32 = 0u32;
-
-#[inline]
-fn alsa_error_to_io_error(fail: &'static str, err: &alsa::Error) -> ::std::io::Error {
-    let kind = ::std::io::ErrorKind::Other;
-    let func = err.func();
-    let errno = err
-        .errno()
-        .map(|errno| format!("; errno = {}", errno))
-        .unwrap_or(String::new());
-    return ::std::io::Error::new(kind, format!("{}: {}{}", fail, func, errno));
-}
-
-#[inline]
-fn alsa_volume_to_f32(volume: i64, min: i64, max: i64) -> f32 {
-    (volume - min) as f32 / (max - min) as f32
-}
-
-#[inline]
-fn f32_to_alsa_volume(volume: f32, min: i64, max: i64) -> i64 {
-    min + ((max - min) as f32 * volume) as i64
-}
-
-pub struct Alsa {
-    pub mixer: Mixer,
-}
-
-impl Alsa {
-    pub fn new(font_size: f32, length: u32) -> ::std::io::Result<Box<BarWidget>> {
-        let mixer = Mixer::new(CARD_NAME, true)
-            .map_err(|err| alsa_error_to_io_error("Failed to create ALSA mixer", &err))?;
-        let mixer = Self { mixer };
-        mixer.get_master_volume()?; // probing
-        Ok(BarWidget::new_simple(font_size, length, Box::new(mixer)))
-    }
-    #[inline]
-    pub fn get_master<'a>(&'a self) -> ::std::io::Result<Selem<'a>> {
-        let master_id = SelemId::new(SELEM_NAME, SELEM_ID);
-        match self.mixer.find_selem(&master_id) {
-            Some(master) => Ok(master),
-            None => {
-                let kind = ::std::io::ErrorKind::NotFound;
-                let desc = "`Master` not found";
-                Err(::std::io::Error::new(kind, desc))
-            }
-        }
-    }
-    pub fn get_master_volume(&self) -> ::std::io::Result<f32> {
-        let master = self.get_master()?;
-        let (min, max) = master.get_playback_volume_range();
-        master
-            .get_playback_volume(SelemChannelId::mono())
-            .map(|volume| alsa_volume_to_f32(volume, min, max))
-            .map_err(|e| alsa_error_to_io_error("Failed to get `Master` volume", &e))
-    }
-    pub fn set_master_volume(&self, volume: f32) -> ::std::io::Result<()> {
-        let master = self.get_master()?;
-        let (min, max) = master.get_playback_volume_range();
-        let volume = f32_to_alsa_volume(volume, min, max);
-        master
-            .set_playback_volume_all(volume)
-            .map_err(|e| alsa_error_to_io_error("Failed to set `Master` volume", &e))
-    }
-    pub fn inc_master_volume(&self, diff: f32) -> ::std::io::Result<()> {
-        let master = self.get_master()?;
-        let (min, max) = master.get_playback_volume_range();
-        master
-            .get_playback_volume(SelemChannelId::mono())
-            .and_then(|volume| {
-                let volume = alsa_volume_to_f32(volume, min, max);
-                let volume = f32_to_alsa_volume(volume + diff, min, max);
-                master.set_playback_volume_all(volume)
-            })
-            .map_err(|e| alsa_error_to_io_error("Failed to inc/dec `Master` volume", &e))
-    }
-}
-
-impl BarWidgetImpl for Alsa {
-    fn wait(&mut self, _: &mut WaitContext) {}
-    fn name(&self) -> &str {
-        "volume"
-    }
-    fn value(&self) -> f32 {
-        match self.get_master_volume() {
-            Ok(v) => v,
-            Err(e) => panic!(e),
-        }
-    }
-    fn color(&self) -> Color {
-        Color::new(1.0, 1.0, 1.0, 1.0)
-    }
-    fn inc(&mut self, diff: f32) {
-        if let Err(e) = self.inc_master_volume(diff) {
-            panic!(e)
-        }
-    }
-    fn set(&mut self, abs: f32) {
-        if let Err(e) = self.set_master_volume(abs) {
-            panic!(e)
-        }
-    }
-    fn toggle(&mut self) {}
-}

src/widgets/audio/mod.rs

@@ -1,9 +0,0 @@
-#[cfg(feature = "alsa-widget")]
-mod alsa_sound;
-#[cfg(feature = "alsa-widget")]
-pub use alsa_sound::Alsa;
-
-#[cfg(feature = "pulseaudio-widget")]
-mod pulse_sound;
-#[cfg(feature = "pulseaudio-widget")]
-pub use pulse_sound::PulseAudio;

src/widgets/audio/pulse_sound.rs

@@ -1,530 +0,0 @@
-use crate::cmd::Cmd;
-use crate::color::Color;
-use crate::widget::WaitContext;
-use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
-
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::ops::Deref;
-use std::rc::Rc;
-use std::sync::mpsc::{channel, Sender};
-use std::sync::{Arc, Mutex};
-use std::thread;
-
-use libpulse_binding::callbacks::ListResult;
-use libpulse_binding::context::{
-    flags, introspect::ServerInfo, introspect::SinkInfo, subscribe::subscription_masks,
-    subscribe::Facility, subscribe::Operation as SubscribeOperation, Context, State as PulseState,
-};
-use libpulse_binding::mainloop::standard::IterateResult;
-use libpulse_binding::mainloop::standard::Mainloop;
-use libpulse_binding::proplist::{properties, Proplist};
-use libpulse_binding::volume::{ChannelVolumes, Volume, VOLUME_MAX, VOLUME_NORM};
-
-struct PulseAudioConnection {
-    mainloop: Rc<RefCell<Mainloop>>,
-    context: Rc<RefCell<Context>>,
-}
-
-#[derive(Clone)]
-struct PulseAudioSinkInfo {
-    volume: ChannelVolumes,
-    mute: bool,
-}
-
-struct PulseAudioClient {
-    sender: Sender<PulseAudioClientRequest>,
-    default_sink: String,
-    sinks: HashMap<String, PulseAudioSinkInfo>,
-}
-
-enum PulseAudioClientRequest {
-    GetDefaultDevice(Option<Sender<bool>>),
-    GetSinkInfoByIndex(Option<Sender<bool>>, u32),
-    GetSinkInfoByName(Option<Sender<bool>>, String),
-    SetSinkVolumeByName(Option<Sender<bool>>, String, ChannelVolumes),
-    SetSinkMuteByName(Option<Sender<bool>>, String, bool),
-}
-
-#[derive(Debug)]
-struct PulseAudioSoundDeviceInner {
-    name: Option<String>,
-    volume: Option<ChannelVolumes>,
-    volume_avg: f32,
-    muted: bool,
-    default_sink: String,
-}
-
-struct PulseAudioSoundDevice {
-    client: Arc<Mutex<PulseAudioClient>>,
-    inner: Arc<Mutex<PulseAudioSoundDeviceInner>>,
-}
-
-impl PulseAudioConnection {
-    fn new() -> Result<Self, ::std::io::Error> {
-        let mut proplist = Proplist::new().unwrap();
-        proplist
-            .set_str(properties::APPLICATION_NAME, "wldash")
-            .unwrap();
-
-        let mainloop = Rc::new(RefCell::new(Mainloop::new().unwrap()));
-
-        let context = Rc::new(RefCell::new(
-            Context::new_with_proplist(mainloop.borrow().deref(), "wldash_context", &proplist)
-                .unwrap(),
-        ));
-
-        context
-            .borrow_mut()
-            .connect(None, flags::NOFLAGS, None)
-            .map_err(|_e| {
-                ::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    "unable to connect to pulseaudio context",
-                )
-            })?;
-
-        let mut connection = PulseAudioConnection { mainloop, context };
-
-        // Wait for context to be ready
-        loop {
-            connection.iterate(false)?;
-            match connection.context.borrow().get_state() {
-                PulseState::Ready => {
-                    break;
-                }
-                PulseState::Failed | PulseState::Terminated => {}
-                _ => {}
-            }
-        }
-
-        Ok(connection)
-    }
-
-    fn iterate(&mut self, blocking: bool) -> Result<(), ::std::io::Error> {
-        match self.mainloop.borrow_mut().iterate(blocking) {
-            IterateResult::Quit(_) | IterateResult::Err(_) => Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "unable to iterate pulseaudio state",
-            )),
-            IterateResult::Success(_) => Ok(()),
-        }
-    }
-}
-
-impl PulseAudioClient {
-    fn new<F>(listener: F) -> Result<Arc<Mutex<Self>>, ::std::io::Error>
-    where
-        F: Fn(Arc<Mutex<Self>>) -> (),
-        F: Send + 'static + Clone,
-    {
-        let (tx, rx) = channel();
-
-        let client = Arc::new(Mutex::new(PulseAudioClient {
-            sender: tx,
-            default_sink: "@DEFAULT_SINK@".to_string(),
-            sinks: HashMap::new(),
-        }));
-
-        let loop_client = client.clone();
-        let (tx1, rx1) = channel();
-        let _ = thread::Builder::new()
-            .name("pa_writer".to_string())
-            .spawn(move || {
-                let mut conn = match PulseAudioConnection::new() {
-                    Ok(v) => {
-                        tx1.send(true).unwrap();
-                        v
-                    }
-                    Err(_) => {
-                        tx1.send(false).unwrap();
-                        return;
-                    }
-                };
-
-                // make sure mainloop dispatched everything
-                for _ in 0..10 {
-                    conn.iterate(false).unwrap();
-                }
-
-                loop {
-                    let cl = loop_client.clone();
-                    let l = listener.clone();
-                    match rx.recv() {
-                        Err(_) => return,
-                        Ok(req) => {
-                            let mut introspector = conn.context.borrow_mut().introspect();
-
-                            match req {
-                                PulseAudioClientRequest::GetDefaultDevice(s) => {
-                                    introspector.get_server_info(move |info| {
-                                        let _res = PulseAudioClient::server_info_callback(
-                                            cl.clone(),
-                                            l.clone(),
-                                            info,
-                                        );
-                                        if let Some(s) = &s {
-                                            let _ = s.send(true);
-                                        }
-                                    });
-                                }
-                                PulseAudioClientRequest::GetSinkInfoByIndex(s, index) => {
-                                    introspector.get_sink_info_by_index(index, move |res| {
-                                        PulseAudioClient::sink_info_callback(
-                                            cl.clone(),
-                                            l.clone(),
-                                            res,
-                                        );
-                                        if let Some(s) = &s {
-                                            let _ = s.send(true);
-                                        }
-                                    });
-                                }
-                                PulseAudioClientRequest::GetSinkInfoByName(s, name) => {
-                                    introspector.get_sink_info_by_name(&name, move |res| {
-                                        PulseAudioClient::sink_info_callback(
-                                            cl.clone(),
-                                            l.clone(),
-                                            res,
-                                        );
-                                        if let Some(s) = &s {
-                                            let _ = s.send(true);
-                                        }
-                                    });
-                                }
-                                PulseAudioClientRequest::SetSinkVolumeByName(s, name, volumes) => {
-                                    introspector.set_sink_volume_by_name(&name, &volumes, None);
-                                    if let Some(s) = &s {
-                                        let _ = s.send(true);
-                                    }
-                                }
-                                PulseAudioClientRequest::SetSinkMuteByName(s, name, mute) => {
-                                    introspector.set_sink_mute_by_name(&name, mute, None);
-                                    if let Some(s) = &s {
-                                        let _ = s.send(true);
-                                    }
-                                }
-                            };
-
-                            // send request and receive response
-                            conn.iterate(true).unwrap();
-                            conn.iterate(true).unwrap();
-                        }
-                    }
-                }
-            });
-
-        // subscribe
-        let cl2 = client.clone();
-        let (tx2, rx2) = channel();
-        let _ = thread::Builder::new()
-            .name("pa_reader".to_string())
-            .spawn(move || {
-                let conn = match PulseAudioConnection::new() {
-                    Ok(v) => {
-                        tx2.send(true).unwrap();
-                        v
-                    }
-                    Err(_) => {
-                        tx2.send(false).unwrap();
-                        return;
-                    }
-                };
-                // subcribe for events
-                conn.context
-                    .borrow_mut()
-                    .set_subscribe_callback(Some(Box::new(move |facility, operation, index| {
-                        cl2.lock()
-                            .unwrap()
-                            .subscribe_callback(facility, operation, index)
-                    })));
-                conn.context.borrow_mut().subscribe(
-                    subscription_masks::SERVER | subscription_masks::SINK,
-                    |_| {},
-                );
-
-                conn.mainloop.borrow_mut().run().unwrap();
-            });
-
-        let pa_writer_res = rx1.recv().unwrap();
-        let pa_reader_res = rx2.recv().unwrap();
-
-        if !pa_writer_res || !pa_reader_res {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "unable to start pulseaudio thread",
-            ));
-        }
-
-        Ok(client)
-    }
-
-    fn send(&self, request: PulseAudioClientRequest) -> Result<(), ::std::io::Error> {
-        let res = self.sender.send(request).map_err(|_e| {
-            ::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "unable to send pulseaudio request",
-            )
-        });
-        res
-    }
-
-    fn server_info_callback<F>(s: Arc<Mutex<Self>>, listener: F, server_info: &ServerInfo)
-    where
-        F: Fn(Arc<Mutex<Self>>) -> (),
-        F: Send + 'static,
-    {
-        match server_info.default_sink_name.clone() {
-            None => {}
-            Some(default_sink) => {
-                (*s.lock().unwrap()).default_sink = default_sink.into();
-                listener(s);
-            }
-        }
-    }
-
-    fn sink_info_callback<F>(s: Arc<Mutex<Self>>, listener: F, result: ListResult<&SinkInfo>)
-    where
-        F: Fn(Arc<Mutex<Self>>) -> (),
-        F: Send + 'static,
-    {
-        match result {
-            ListResult::End | ListResult::Error => {}
-            ListResult::Item(sink_info) => match sink_info.name.clone() {
-                None => {}
-                Some(name) => {
-                    let info = PulseAudioSinkInfo {
-                        volume: sink_info.volume,
-                        mute: sink_info.mute,
-                    };
-                    s.lock().unwrap().sinks.insert(name.into(), info);
-                    listener(s);
-                }
-            },
-        }
-    }
-
-    fn subscribe_callback(
-        &self,
-        facility: Option<Facility>,
-        _operation: Option<SubscribeOperation>,
-        index: u32,
-    ) {
-        match facility {
-            None => {}
-            Some(facility) => match facility {
-                Facility::Server => {
-                    let _ = self.send(PulseAudioClientRequest::GetDefaultDevice(None));
-                }
-                Facility::Sink => {
-                    let _ = self.send(PulseAudioClientRequest::GetSinkInfoByIndex(None, index));
-                }
-                _ => {}
-            },
-        }
-    }
-}
-
-impl PulseAudioSoundDevice {
-    fn new<F>(listener: F) -> Result<Self, ::std::io::Error>
-    where
-        F: Fn() -> (),
-        F: Send + 'static + Clone,
-    {
-        let inner = Arc::new(Mutex::new(PulseAudioSoundDeviceInner {
-            name: None,
-            volume: None,
-            volume_avg: 0.0,
-            muted: false,
-            default_sink: "@DEFAULT_SINK@".to_string(),
-        }));
-
-        let cb_inner = inner.clone();
-        let client = PulseAudioClient::new(move |client| {
-            let mut inner = cb_inner.lock().unwrap();
-            inner.default_sink = client.lock().unwrap().default_sink.clone();
-            let name = inner
-                .name
-                .clone()
-                .unwrap_or_else(|| inner.default_sink.clone());
-            let sink_info = match client.lock().unwrap().sinks.get(&name) {
-                None => return,
-                Some(sink_info) => (*sink_info).clone(),
-            };
-
-            inner.volume = Some(sink_info.volume);
-            inner.volume_avg = sink_info.volume.avg().0 as f32 / VOLUME_NORM.0 as f32;
-            inner.muted = sink_info.mute;
-
-            listener();
-        })?;
-
-        let cl = client.clone();
-        let (tx, rx) = channel();
-        {
-            let cl = client.lock().unwrap();
-            cl.send(PulseAudioClientRequest::GetDefaultDevice(Some(tx)))?;
-        }
-        rx.recv().unwrap();
-        let name = {
-            let cl = client.lock().unwrap();
-            cl.default_sink.to_string()
-        };
-        (*inner.lock().unwrap()).name = Some(name.clone());
-        let device = PulseAudioSoundDevice {
-            client: cl,
-            inner: inner,
-        };
-        let (tx, rx) = channel();
-        {
-            let cl = client.lock().unwrap();
-            cl.send(PulseAudioClientRequest::GetSinkInfoByName(Some(tx), name))?;
-        }
-        rx.recv().unwrap();
-
-        Ok(device)
-    }
-
-    fn muted(&self) -> bool {
-        let inner = self.inner.lock().unwrap();
-        inner.muted
-    }
-
-    fn volume(&self) -> f32 {
-        let inner = self.inner.lock().unwrap();
-        inner.volume_avg
-    }
-
-    fn inc_volume(&mut self, step: f32) -> Result<(), ::std::io::Error> {
-        let mut inner = self.inner.lock().unwrap();
-        let mut volume = match inner.volume {
-            Some(volume) => volume,
-            None => {
-                return Err(::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    "unable to set volume",
-                ))
-            }
-        };
-
-        // apply step to volumes
-        let step = (step * VOLUME_NORM.0 as f32).round() as i32;
-        if step > 0 {
-            volume.inc_clamp(Volume(step as u32), VOLUME_MAX);
-        } else {
-            volume.decrease(Volume(-step as u32));
-        }
-
-        let name = inner
-            .name
-            .clone()
-            .unwrap_or_else(|| inner.default_sink.clone());
-
-        // update volumes
-        inner.volume = Some(volume);
-        inner.volume_avg = volume.avg().0 as f32 / VOLUME_NORM.0 as f32;
-        self.client
-            .lock()
-            .unwrap()
-            .send(PulseAudioClientRequest::SetSinkVolumeByName(
-                None, name, volume,
-            ))?;
-        Ok(())
-    }
-
-    fn set_volume(&mut self, val: f32) -> Result<(), ::std::io::Error> {
-        let mut inner = self.inner.lock().unwrap();
-        let mut volume = match inner.volume {
-            Some(volume) => volume,
-            None => {
-                return Err(::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    "unable to set volume",
-                ))
-            }
-        };
-
-        // apply step to volumes
-        volume.scale(Volume((val * VOLUME_NORM.0 as f32).round() as u32));
-
-        let name = inner
-            .name
-            .clone()
-            .unwrap_or_else(|| inner.default_sink.clone());
-
-        // update volumes
-        inner.volume = Some(volume);
-        inner.volume_avg = volume.avg().0 as f32 / VOLUME_NORM.0 as f32;
-        self.client
-            .lock()
-            .unwrap()
-            .send(PulseAudioClientRequest::SetSinkVolumeByName(
-                None, name, volume,
-            ))?;
-        Ok(())
-    }
-
-    fn toggle(&mut self) -> Result<(), ::std::io::Error> {
-        let mut inner = self.inner.lock().unwrap();
-        inner.muted = !inner.muted;
-        self.client
-            .lock()
-            .unwrap()
-            .send(PulseAudioClientRequest::SetSinkMuteByName(
-                None,
-                inner
-                    .name
-                    .clone()
-                    .unwrap_or_else(|| inner.default_sink.clone()),
-                inner.muted,
-            ))?;
-        Ok(())
-    }
-}
-
-pub struct PulseAudio {
-    device: PulseAudioSoundDevice,
-}
-
-impl PulseAudio {
-    pub fn new(
-        font_size: f32,
-        length: u32,
-        sender: Sender<Cmd>,
-    ) -> Result<Box<BarWidget>, ::std::io::Error> {
-        BarWidget::new(font_size, length, move |dirty| {
-            let device = PulseAudioSoundDevice::new(move || {
-                *dirty.lock().unwrap() = true;
-                sender.send(Cmd::Draw).unwrap();
-            })?;
-            Ok(Box::new(PulseAudio { device: device }))
-        })
-    }
-}
-
-impl BarWidgetImpl for PulseAudio {
-    fn wait(&mut self, _: &mut WaitContext) {}
-    fn name(&self) -> &str {
-        "volume"
-    }
-    fn value(&self) -> f32 {
-        self.device.volume()
-    }
-    fn color(&self) -> Color {
-        let muted = self.device.muted();
-        if muted {
-            Color::new(1.0, 1.0, 0.0, 1.0)
-        } else {
-            Color::new(1.0, 1.0, 1.0, 1.0)
-        }
-    }
-    fn inc(&mut self, inc: f32) {
-        self.device.inc_volume(inc).unwrap();
-    }
-    fn set(&mut self, val: f32) {
-        self.device.set_volume(val).unwrap();
-    }
-    fn toggle(&mut self) {
-        self.device.toggle().unwrap();
-    }
-}

src/widgets/backlight.rs

@@ -1,25 +1,23 @@
-use crate::color::Color;
-use crate::widget::WaitContext;
-use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
+use std::{
+    fs::{self, OpenOptions},
+    io::{Error, Write},
+    path::{Path, PathBuf},
+};
 
-use std::fs::OpenOptions;
-use std::io::{Error, ErrorKind};
-use std::io::{Read, Write};
-use std::path::{Path, PathBuf};
+use walkdir::WalkDir;
 
-pub struct Backlight {
-    device_path: PathBuf,
-    cur_brightness: u64,
-    max_brightness: u64,
-}
+use crate::{
+    color::Color,
+    event::PointerButton,
+    fonts::FontMap,
+    widgets::bar_widget::{BarWidget, BarWidgetImpl},
+};
 
 fn read_file_as_u64(path: &Path) -> Result<u64, Error> {
-    let mut file = OpenOptions::new().read(true).open(path)?;
-    let mut str = String::new();
-    file.read_to_string(&mut str)?;
-    str.pop();
-    str.parse::<u64>()
-        .map_err(|_e| Error::new(ErrorKind::Other, "unable to parse value"))
+    let mut s = fs::read_to_string(path)?;
+    s.pop();
+    s.parse::<u64>()
+        .map_err(|_e| Error::other("unable to parse value"))
 }
 
 fn write_file_as_u64(path: &Path, value: u64) -> Result<(), Error> {
@@ -27,115 +25,89 @@ fn write_file_as_u64(path: &Path, value: u64) -> Result<(), Error> {
     file.write_fmt(format_args!("{}", value))
 }
 
+pub struct Backlight {
+    device_path: PathBuf,
+    cur: u64,
+    max: u64,
+    dirty: bool,
+}
+
+/// First device under /sys/class/backlight, if any. `min_depth(1)` skips the
+/// class directory itself, which otherwise got picked up as a "device".
+fn find_device() -> Option<PathBuf> {
+    WalkDir::new("/sys/class/backlight")
+        .min_depth(1)
+        .max_depth(1)
+        .into_iter()
+        .flatten()
+        .map(|e| e.path().to_path_buf())
+        .next()
+}
+
 impl Backlight {
-    pub fn update(&mut self) -> Result<(), Error> {
-        self.cur_brightness = read_file_as_u64(self.device_path.join("brightness").as_path())?;
-        self.max_brightness = read_file_as_u64(self.device_path.join("max_brightness").as_path())?;
-        Ok(())
-    }
-
-    pub fn sync(&mut self) -> Result<(), Error> {
-        write_file_as_u64(
-            self.device_path.join("brightness").as_path(),
-            self.cur_brightness,
-        )?;
-        self.update()?;
-        Ok(())
-    }
-
-    pub fn brightness(&self) -> f32 {
-        if self.cur_brightness > self.max_brightness {
-            // what.
-            return 1.0;
+    fn update(&mut self) {
+        if let Ok(cur) = read_file_as_u64(self.device_path.join("brightness").as_path()) {
+            self.cur = cur;
+        }
+        if let Ok(max) = read_file_as_u64(self.device_path.join("max_brightness").as_path()) {
+            self.max = max;
         }
-
-        (self.cur_brightness as f32 / self.max_brightness as f32)
     }
 
-    pub fn set(&mut self, val: f32) -> Result<(), Error> {
-        self.cur_brightness = (self.max_brightness as f32 * val) as u64;
-        Ok(())
-    }
-
-    pub fn add(&mut self, diff: f32) -> Result<(), Error> {
-        let inc = (self.max_brightness as f32 * diff) as i64;
-
-        self.cur_brightness = if self.cur_brightness as i64 + inc < 1 {
-            1
-        } else if self.cur_brightness as i64 + inc > self.max_brightness as i64 {
-            self.max_brightness
-        } else {
-            (self.cur_brightness as i64 + inc) as u64
-        };
-
-        Ok(())
-    }
-
-    pub fn new(font_size: f32, length: u32) -> Result<Box<BarWidget>, Error> {
-        let devices = Path::new("/sys/class/backlight").read_dir()?;
-
-        let first_device = match devices.take(1).next() {
-            Some(v) => match v {
-                Ok(v) => v,
-                Err(_) => return Err(Error::new(ErrorKind::Other, "no backlight device")),
-            },
-            None => return Err(Error::new(ErrorKind::Other, "no backlight device")),
+    // Wraps the impl in the generic BarWidget on purpose.
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(path: Option<&str>, fm: &mut FontMap, font: &'static str, size: f32) -> BarWidget {
+        let device_path = match path {
+            Some(path) => Some(Path::new("/sys/class/backlight").join(path)),
+            None => find_device(),
         };
         let mut dev = Backlight {
-            device_path: first_device.path(),
-            cur_brightness: 0,
-            max_brightness: 0,
+            device_path: device_path.expect("did not find backlight device"),
+            cur: 0,
+            max: 0,
+            dirty: true,
         };
 
-        dev.update()?;
+        dev.update();
+        BarWidget::new(Box::new(dev), fm, font, size)
+    }
 
-        Ok(BarWidget::new_simple(font_size, length, Box::new(dev)))
+    pub fn detect() -> bool {
+        find_device().is_some()
+    }
+
+    pub fn set(&mut self, brightness: f32) {
+        let val = (self.max as f32 * brightness.clamp(0.0, 1.0)) as u64;
+        let _ = write_file_as_u64(self.device_path.join("brightness").as_path(), val);
+        if let Ok(cur) = read_file_as_u64(self.device_path.join("brightness").as_path()) {
+            self.cur = cur;
+        }
     }
 }
 
 impl BarWidgetImpl for Backlight {
-    fn wait(&mut self, _: &mut WaitContext) {}
-    fn name(&self) -> &str {
+    fn name(&self) -> &'static str {
         "backlight"
     }
-    fn value(&self) -> f32 {
-        self.brightness()
+    fn get_dirty(&self) -> bool {
+        self.dirty
+    }
+    fn value(&mut self) -> f32 {
+        if self.max == 0 || self.cur > self.max {
+            // what.
+            return 1.0;
+        }
+
+        self.dirty = false;
+        self.cur as f32 / self.max as f32
     }
     fn color(&self) -> Color {
-        Color::new(1.0, 1.0, 1.0, 1.0)
+        Color::WHITE
     }
-    fn inc(&mut self, inc: f32) {
-        self.add(inc).unwrap();
-        match self.sync() {
-            Ok(val) => val,
-            Err(err) => {
-                eprintln!("Error while trying to change brightness: {}", err);
-                ()
-            }
-        }
-    }
-    fn set(&mut self, val: f32) {
-        self.set(val).unwrap();
-        match self.sync() {
-            Ok(val) => val,
-            Err(err) => {
-                eprintln!("Error while trying to change brightness: {}", err);
-                ()
-            }
-        }
-    }
-    fn toggle(&mut self) {
-        self.cur_brightness = if self.cur_brightness == 1 {
-            self.max_brightness
-        } else {
-            1
+    fn click(&mut self, pos: f32, btn: PointerButton) {
+        self.dirty = true;
+        if let PointerButton::Left = btn {
+            self.set(pos)
         };
-        match self.sync() {
-            Ok(val) => val,
-            Err(err) => {
-                eprintln!("Error while trying to change brightness: {}", err);
-                ()
-            }
-        }
     }
 }

src/widgets/bar_widget.rs

@@ -1,150 +1,108 @@
-use crate::color::Color;
-use crate::draw::{draw_bar, draw_box, Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use std::{cmp::min, default::Default};
 
-use std::sync::{Arc, Mutex};
+use crate::{
+    buffer::BufferView,
+    color::Color,
+    draw::{draw_bar, draw_box},
+    event::{Event, PointerButton},
+    fonts::FontMap,
+    widgets::{Geometry, Widget},
+};
 
 pub trait BarWidgetImpl {
-    fn wait(&mut self, ctx: &mut WaitContext);
-    fn name(&self) -> &str;
-    fn value(&self) -> f32;
+    fn get_dirty(&self) -> bool {
+        false
+    }
+    fn name(&self) -> &'static str;
+    fn value(&mut self) -> f32;
     fn color(&self) -> Color;
-    fn inc(&mut self, inc: f32);
-    fn set(&mut self, val: f32);
-    fn toggle(&mut self);
+    fn click(&mut self, _pos: f32, _btn: PointerButton) {}
 }
 
 pub struct BarWidget {
-    bar_impl: Box<dyn BarWidgetImpl + Send>,
-    font: Font,
-    font_size: u32,
-    length: u32,
-    dirty: Arc<Mutex<bool>>,
+    font: &'static str,
+    size: f32,
+    geometry: Geometry,
+    inner_widget: Box<dyn BarWidgetImpl>,
 }
 
 impl BarWidget {
-    pub fn new_simple(
-        font_size: f32,
-        length: u32,
-        w: Box<dyn BarWidgetImpl + Send>,
-    ) -> Box<BarWidget> {
-        let mut font = Font::new(&ROBOTO_REGULAR, font_size);
-        font.add_str_to_cache(w.name());
-
-        Box::new(BarWidget {
-            bar_impl: w,
-            dirty: Arc::new(Mutex::new(true)),
+    pub fn new(
+        inner_widget: Box<dyn BarWidgetImpl>,
+        fm: &mut FontMap,
+        font: &'static str,
+        size: f32,
+    ) -> BarWidget {
+        fm.queue_font(font, size, inner_widget.name());
+        BarWidget {
+            geometry: Default::default(),
+            inner_widget,
             font,
-            font_size: font_size as u32,
-            length,
-        })
-    }
-
-    pub fn new<F>(font_size: f32, length: u32, f: F) -> Result<Box<BarWidget>, ::std::io::Error>
-    where
-        F: FnOnce(Arc<Mutex<bool>>) -> Result<Box<dyn BarWidgetImpl + Send>, ::std::io::Error>,
-        F: Send + 'static + Clone,
-    {
-        let dirty = Arc::new(Mutex::new(true));
-        let im = f(dirty.clone())?;
-
-        let mut font = Font::new(&ROBOTO_REGULAR, font_size);
-        font.add_str_to_cache(im.name());
-
-        Ok(Box::new(BarWidget {
-            bar_impl: im,
-            dirty,
-            font,
-            font_size: font_size as u32,
-            length,
-        }))
+            size,
+        }
     }
 }
 
 impl Widget for BarWidget {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.bar_impl.wait(ctx);
+    fn geometry(&self) -> Geometry {
+        self.geometry
     }
-    fn enter(&mut self) {}
-    fn leave(&mut self) {}
-    fn size(&self) -> (u32, u32) {
-        (self.length, self.font_size)
+
+    fn get_dirty(&self) -> bool {
+        self.inner_widget.get_dirty()
     }
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let (width, height) = self.size();
-        {
-            let mut d = self.dirty.lock().unwrap();
-            if !*d && !ctx.force {
-                return Ok(DrawReport::empty(width, height));
-            }
-            *d = false;
+
+    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        let font = fonts.get_font(self.font, self.size);
+        let fg = Color::WHITE;
+
+        font.draw_text(view, fg, self.inner_widget.name()).unwrap();
+        let size = self.size.ceil() as u32;
+        let bar_offset = 4 * size;
+        let val = self.inner_widget.value();
+
+        let c = self.inner_widget.color();
+        let bar_width = self.geometry.width.saturating_sub(bar_offset);
+        if bar_width < 2 {
+            return self.geometry;
         }
+        draw_bar(&mut view.offset((bar_offset, 0)), c, bar_width, size, val).unwrap();
 
-        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        buf.memset(ctx.bg);
-
-        let c = Color::new(1.0, 1.0, 1.0, 1.0);
-        self.font.draw_text(buf, ctx.bg, &c, self.bar_impl.name())?;
-
-        let c = self.bar_impl.color();
-        let bar_off = 5 * self.font_size;
-        let mut val = self.bar_impl.value();
-        draw_bar(
-            &mut buf.offset((bar_off, 0))?,
-            &c,
-            self.length - bar_off,
-            self.font_size,
-            val,
-        )?;
-        let mut iter = 1.0;
-        while val > 1.0 {
-            let c = &Color::new(0.75 / iter, 0.25 / iter, 0.25 / iter, 1.0);
-            val -= 1.0;
-            iter += 1.0;
-            draw_bar(
-                &mut buf.offset((bar_off, 0))?,
-                &c,
-                self.length - bar_off,
-                self.font_size,
-                val,
-            )?;
-        }
-        draw_box(
-            &mut buf.offset((bar_off, 0))?,
-            &c,
-            (self.length - bar_off, self.font_size),
-        )?;
-        Ok(DrawReport {
-            width: width,
-            height: height,
-            damage: vec![buf.get_signed_bounds()],
-            full_damage: false,
-        })
+        draw_box(&mut view.offset((bar_offset, 0)), c, (bar_width, size)).unwrap();
+        self.geometry
     }
 
-    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-    fn mouse_click(&mut self, button: u32, (x, _): (u32, u32)) {
-        *self.dirty.lock().unwrap() = true;
-        match button {
-            272 => {
-                let offset = 5 * self.font_size;
-                if x > offset {
-                    self.bar_impl
-                        .set(((x - offset) + 1) as f32 / (self.length - offset) as f32);
-                }
-            }
-            273 => self.bar_impl.toggle(),
-            x => {
-                dbg!(x);
-            }
+    fn geometry_update(&mut self, _fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+        let w = min(geometry.width, 768);
+        let mut x = geometry.x;
+        if geometry.width > w {
+            x += geometry.width - w;
+        }
+        self.geometry = Geometry {
+            x,
+            y: geometry.y,
+            width: w,
+            height: self.size.ceil() as u32,
+        };
+        self.geometry
+    }
+
+    fn minimum_size(&mut self, _fonts: &mut FontMap) -> Geometry {
+        Geometry {
+            x: 0,
+            y: 0,
+            width: self.size.ceil() as u32 * 6,
+            height: self.size.ceil() as u32,
         }
     }
-    fn mouse_scroll(&mut self, (_, y): (f64, f64), _: (u32, u32)) {
-        *self.dirty.lock().unwrap() = true;
-        self.bar_impl.inc(y as f32 / -800.0);
+
+    fn event(&mut self, event: &Event) {
+        if let Event::PointerEvent(ev) = event {
+            let offset = 4 * self.size.ceil() as u32;
+            if ev.pos.0 >= offset && self.geometry.width > offset {
+                let val = (ev.pos.0 - offset) as f32 / (self.geometry.width - offset) as f32;
+                self.inner_widget.click(val, ev.button);
+            }
+        }
     }
 }

src/widgets/battery.rs

@@ -1,238 +1,186 @@
-use crate::cmd::Cmd;
-use crate::color::Color;
-use crate::widget::WaitContext;
-use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
+use std::{
+    error::Error,
+    sync::{Arc, Mutex},
+    thread,
+    time::Duration,
+};
 
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex};
+use dbus::blocking::{
+    LocalConnection,
+    stdintf::org_freedesktop_dbus::{Properties, PropertiesPropertiesChanged},
+};
 
-use nix::poll::{PollFd, PollFlags};
-
-use dbus;
-
-fn get_upower_property(
-    con: &dbus::Connection,
-    device_path: &str,
-    property: &str,
-) -> Result<dbus::Message, ::std::io::Error> {
-    let msg = dbus::Message::new_method_call(
-        "org.freedesktop.UPower",
-        device_path,
-        "org.freedesktop.DBus.Properties",
-        "Get",
-    )
-    .map_err(|_| {
-        ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not send make dbus method call",
-        )
-    })?
-    .append2(
-        dbus::MessageItem::Str("org.freedesktop.UPower.Device".to_string()),
-        dbus::MessageItem::Str(property.to_string()),
-    );
-
-    con.send_with_reply_and_block(msg, 1000).map_err(|_| {
-        ::std::io::Error::new(::std::io::ErrorKind::Other, "could not send dbus message")
-    })
-}
-
-// The widget is created on a different thread than where it will be used, so
-// we need it to be Send. However, dbus::Connection has a void*, so it's not
-// auto-derived. So, we make a small wrapper where we make it Send.
-struct DbusConnection(dbus::Connection);
-
-impl std::convert::AsRef<dbus::Connection> for DbusConnection {
-    fn as_ref(&self) -> &dbus::Connection {
-        return &self.0;
-    }
-}
-
-unsafe impl Send for DbusConnection {}
-
-pub struct UpowerBattery {
-    device_path: String,
-    sender: Sender<Cmd>,
-    dirty: Arc<Mutex<bool>>,
-    state: UpowerBatteryState,
-    capacity: f64,
-    con: DbusConnection,
-    watch: dbus::Watch,
-}
+use crate::{
+    color::Color,
+    event::{Event, Events},
+    fonts::FontMap,
+    widgets::bar_widget::{BarWidget, BarWidgetImpl},
+};
 
 enum UpowerBatteryState {
+    Unknown,
     Charging,
     Discharging,
     Empty,
-    Full,
-    NotCharging,
-    Unknown,
+    FullyCharged,
+    PendingCharge,
+    PendingDischarge,
 }
 
-impl UpowerBattery {
-    pub fn from_device(
-        dirty: Arc<Mutex<bool>>,
-        sender: Sender<Cmd>,
-        device: &str,
-    ) -> Result<Self, ::std::io::Error> {
-        let con = dbus::Connection::get_private(dbus::BusType::System).map_err(|_| {
-            ::std::io::Error::new(::std::io::ErrorKind::Other, "unable to open dbus")
-        })?;
-        let device_path = format!("/org/freedesktop/UPower/devices/battery_{}", device);
+impl UpowerBatteryState {
+    fn from_dbus(val: u64) -> UpowerBatteryState {
+        match val {
+            1 => UpowerBatteryState::Charging,
+            2 => UpowerBatteryState::Discharging,
+            3 => UpowerBatteryState::Empty,
+            4 => UpowerBatteryState::FullyCharged,
+            5 => UpowerBatteryState::PendingCharge,
+            6 => UpowerBatteryState::PendingDischarge,
+            _ => UpowerBatteryState::Unknown,
+        }
+    }
+}
 
-        let rule = format!(
-            "type='signal',\
-             path='{}',\
-             interface='org.freedesktop.DBus.Properties',\
-             member='PropertiesChanged'",
-            &device_path
-        );
-        con.add_match(&rule).map_err(|_| {
-            ::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "unable to add match rule to dbus connection",
-            )
-        })?;
-        let upower_type: dbus::arg::Variant<u32> =
-            match get_upower_property(&con, &device_path, "Type")?.get1() {
-                Some(v) => v,
-                None => {
-                    return Err(::std::io::Error::new(
-                        ::std::io::ErrorKind::Other,
-                        "no such upower device",
-                    ));
+struct InnerBattery {
+    value: f32,
+    state: UpowerBatteryState,
+    dirty: bool,
+}
+
+const DEVICE_PATH: &str = "/org/freedesktop/UPower/devices/DisplayDevice";
+const DEVICE_IFACE: &str = "org.freedesktop.UPower.Device";
+
+/// True if UPower reports a present battery. The DisplayDevice object exists
+/// even on machines without a battery, so checking for mere reachability
+/// (as before) made every desktop grow a battery widget.
+fn battery_present() -> Result<bool, Box<dyn Error>> {
+    let conn = LocalConnection::new_system()?;
+    let proxy = conn.with_proxy(
+        "org.freedesktop.UPower",
+        DEVICE_PATH,
+        Duration::from_millis(500),
+    );
+    let present: bool = proxy.get(DEVICE_IFACE, "IsPresent")?;
+    Ok(present)
+}
+
+fn monitor(
+    inner: Arc<Mutex<InnerBattery>>,
+    events: Arc<Mutex<Events>>,
+) -> Result<(), Box<dyn Error>> {
+    let conn = LocalConnection::new_system()?;
+    let proxy = conn.with_proxy(
+        "org.freedesktop.UPower",
+        DEVICE_PATH,
+        Duration::from_millis(500),
+    );
+
+    let capacity: f64 = proxy.get(DEVICE_IFACE, "Percentage")?;
+    let state: u32 = proxy.get(DEVICE_IFACE, "State")?;
+
+    {
+        let mut inner = inner.lock().unwrap();
+        inner.value = capacity as f32 / 100.;
+        inner.state = UpowerBatteryState::from_dbus(state as u64);
+        inner.dirty = true;
+    }
+    events.lock().unwrap().add_event(Event::PowerUpdate);
+
+    proxy.match_signal(
+        move |c: PropertiesPropertiesChanged, _: &LocalConnection, _: &dbus::Message| {
+            if c.interface_name != DEVICE_IFACE {
+                return true;
+            }
+            let mut inner = inner.lock().unwrap();
+            for (key, value) in c.changed_properties {
+                match key.as_str() {
+                    "State" => {
+                        if let Some(v) = value.0.as_u64() {
+                            inner.state = UpowerBatteryState::from_dbus(v);
+                            inner.dirty = true;
+                            events.lock().unwrap().add_event(Event::PowerUpdate);
+                        }
+                    }
+                    "Percentage" => {
+                        if let Some(v) = value.0.as_f64() {
+                            inner.value = v as f32 / 100.;
+                            inner.dirty = true;
+                            events.lock().unwrap().add_event(Event::PowerUpdate);
+                        }
+                    }
+                    _ => (),
                 }
-            };
-
-        // https://upower.freedesktop.org/docs/Device.html#Device:Type
-        if upower_type.0 != 2 {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "UPower device is not a battery.",
-            ));
-        }
-
-        let capacity: f64 = match get_upower_property(&con, &device_path, "Percentage")?
-            .get1::<dbus::arg::Variant<f64>>()
-        {
-            Some(v) => v.0,
-            None => {
-                return Err(::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    "no such upower device",
-                ));
             }
-        };
-        let state: UpowerBatteryState = match get_upower_property(&con, &device_path, "State")?
-            .get1::<dbus::arg::Variant<u32>>()
-        {
-            Some(v) => match v.0 {
-                1 => UpowerBatteryState::Charging,
-                2 => UpowerBatteryState::Discharging,
-                3 => UpowerBatteryState::Empty,
-                4 => UpowerBatteryState::Full,
-                5 => UpowerBatteryState::NotCharging,
-                6 => UpowerBatteryState::Discharging,
-                _ => UpowerBatteryState::Unknown,
-            },
-            None => {
-                return Err(::std::io::Error::new(
-                    ::std::io::ErrorKind::Other,
-                    "no such upower device",
-                ));
-            }
-        };
+            true
+        },
+    )?;
 
-        let fds = con.watch_fds();
-        if fds.len() != 1 {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "expected 1 watch fd from dbus",
-            ));
-        }
-
-        Ok(UpowerBattery {
-            device_path,
-            con: DbusConnection(con),
-            dirty,
-            sender,
-            capacity: capacity,
-            state: state,
-            watch: fds[0],
-        })
-    }
-
-    pub fn new(
-        font_size: f32,
-        length: u32,
-        sender: Sender<Cmd>,
-    ) -> Result<Box<BarWidget>, ::std::io::Error> {
-        BarWidget::new(font_size, length, move |dirty| {
-            let d = UpowerBattery::from_device(dirty, sender, "BAT0")?;
-            Ok(Box::new(d))
-        })
+    loop {
+        conn.process(Duration::from_millis(60000))?;
     }
 }
 
-impl BarWidgetImpl for UpowerBattery {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        for _ in self
-            .con
-            .as_ref()
-            .watch_handle(self.watch.fd(), dbus::WatchEvent::Readable as u32)
-        {
-            let capacity = get_upower_property(self.con.as_ref(), &self.device_path, "Percentage")
-                .unwrap()
-                .get1::<dbus::arg::Variant<f64>>()
-                .unwrap()
-                .0;
-            let state = match get_upower_property(self.con.as_ref(), &self.device_path, "State")
-                .unwrap()
-                .get1::<dbus::arg::Variant<u32>>()
-                .unwrap()
-                .0
-            {
-                1 => UpowerBatteryState::Charging,
-                2 => UpowerBatteryState::Discharging,
-                3 => UpowerBatteryState::Empty,
-                4 => UpowerBatteryState::Full,
-                5 => UpowerBatteryState::NotCharging,
-                6 => UpowerBatteryState::Discharging,
-                _ => UpowerBatteryState::Unknown,
-            };
-            self.state = state;
-            self.capacity = capacity;
-            *self.dirty.lock().unwrap() = true;
-            self.sender.send(Cmd::Draw).unwrap();
-        }
+fn start_monitor(inner: Arc<Mutex<InnerBattery>>, events: Arc<Mutex<Events>>) {
+    thread::Builder::new()
+        .name("battmon".to_string())
+        .spawn(move || {
+            // The release profile uses panic = "abort": a panic here would take
+            // the whole dashboard down, so report and leave the bar at 0.
+            if let Err(e) = monitor(inner, events) {
+                eprintln!("wldash: battery monitor stopped: {}", e);
+            }
+        })
+        .unwrap();
+}
 
-        ctx.fds
-            .push(PollFd::new(self.watch.fd(), PollFlags::POLLIN));
+pub struct Battery {
+    inner: Arc<Mutex<InnerBattery>>,
+}
+
+impl Battery {
+    // Wraps the impl in the generic BarWidget on purpose.
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(
+        events: Arc<Mutex<Events>>,
+        fm: &mut FontMap,
+        font: &'static str,
+        size: f32,
+    ) -> BarWidget {
+        let battery = Battery {
+            inner: Arc::new(Mutex::new(InnerBattery {
+                value: 0.,
+                state: UpowerBatteryState::Unknown,
+                dirty: false,
+            })),
+        };
+        start_monitor(battery.inner.clone(), events);
+        BarWidget::new(Box::new(battery), fm, font, size)
     }
-    fn name(&self) -> &str {
+
+    pub fn detect() -> bool {
+        battery_present().unwrap_or(false)
+    }
+}
+
+impl BarWidgetImpl for Battery {
+    fn get_dirty(&self) -> bool {
+        self.inner.lock().unwrap().dirty
+    }
+    fn name(&self) -> &'static str {
         "battery"
     }
-    fn value(&self) -> f32 {
-        (self.capacity as f32) / 100.0
+    fn value(&mut self) -> f32 {
+        let mut inner = self.inner.lock().unwrap();
+        inner.dirty = false;
+        inner.value
     }
     fn color(&self) -> Color {
-        match self.state {
-            UpowerBatteryState::Discharging | UpowerBatteryState::Unknown => {
-                if self.capacity > 10.0 {
-                    Color::new(1.0, 1.0, 1.0, 1.0)
-                } else {
-                    Color::new(1.0, 0.5, 0.0, 1.0)
-                }
-            }
-            UpowerBatteryState::Charging | UpowerBatteryState::Full => {
-                Color::new(0.5, 1.0, 0.5, 1.0)
-            }
-            UpowerBatteryState::NotCharging | UpowerBatteryState::Empty => {
-                Color::new(1.0, 0.5, 0.5, 1.0)
-            }
+        let inner = self.inner.lock().unwrap();
+        match inner.state {
+            UpowerBatteryState::Charging | UpowerBatteryState::FullyCharged => Color::LIGHTGREEN,
+            _ if inner.value > 0.25 => Color::WHITE,
+            _ if inner.value > 0.1 => Color::DARKORANGE,
+            _ => Color::RED,
         }
     }
-    fn inc(&mut self, _: f32) {}
-    fn set(&mut self, _: f32) {}
-    fn toggle(&mut self) {}
 }

src/widgets/calendar.rs

@@ -1,34 +1,114 @@
-use crate::buffer::Buffer;
-use crate::color::Color;
-use crate::draw::{Font, DEJAVUSANS_MONO, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use std::default::Default;
 
-use chrono::{Date, Datelike, Local};
+use crate::{
+    buffer::BufferView,
+    color::Color,
+    event::Event,
+    fonts::FontMap,
+    widgets::{Geometry, Widget},
+};
+
+use chrono::{Datelike, Local, NaiveDate};
 
 pub struct Calendar {
-    cur_date: Date<Local>,
+    font: &'static str,
+    month_font: &'static str,
+    sections_x: i32,
+    sections_y: i32,
+    shown_sections_x: u32,
+    shown_sections_y: u32,
+    size: f32,
     dirty: bool,
-    offset: f64,
-    sections: u32,
-    font_size: u32,
-    calendar_cache: Font,
-    month_cache: Font,
-    year_cache: Font,
-    day_cache: Font,
+    geometry: Geometry,
+    year_width: u32,
+    date_width: u32,
+    day_width: u32,
 }
 
-impl Calendar {
-    fn draw_month(
-        &self,
-        buf: &mut Buffer,
-        background_color: &Color,
-        orig: &Date<Local>,
-        time: &Date<Local>,
-    ) -> Result<(i32, i32, i32, i32), ::std::io::Error> {
-        let mut time = time.clone();
-        let mut y_off = 1;
-        let mut done = false;
+const DAY_FACTOR: f32 = 0.6;
+const YEAR_FACTOR: f32 = 0.75;
+const MONTH_FACTOR: f32 = 1.25;
+const DATE_FACTOR: f32 = 1.;
 
+const LINE_HEIGHT: f32 = 0.85;
+
+impl Calendar {
+    pub fn new(
+        fm: &mut FontMap,
+        font: &'static str,
+        month_font: &'static str,
+        size: f32,
+        sections_x: i32,
+        sections_y: i32,
+    ) -> Calendar {
+        fm.queue_font(font, size * DAY_FACTOR, "ADEFHIMNORSTUW");
+        fm.queue_font(font, size * YEAR_FACTOR, "0123456789");
+        fm.queue_font(font, size * DATE_FACTOR, "0123456789");
+        fm.queue_font(
+            month_font,
+            size * MONTH_FACTOR,
+            "ADFJMNOSabcehgilmnoprstuvy",
+        );
+
+        Calendar {
+            font,
+            month_font,
+            size,
+            sections_x,
+            sections_y,
+            shown_sections_x: 0,
+            shown_sections_y: 0,
+            dirty: true,
+            geometry: Default::default(),
+            date_width: 0,
+            day_width: 0,
+            year_width: 0,
+        }
+    }
+
+    fn draw_month(
+        &mut self,
+        fonts: &mut FontMap,
+        view: &mut BufferView,
+        orig: NaiveDate,
+        mut time: NaiveDate,
+    ) {
+        let cal_width = 8 * self.date_width + 7 * (self.date_width / 2);
+        //
+        // Draw the week day
+        //
+        let day_offset = (self.date_width - self.day_width) / 2;
+        let date_offset = self.date_width + self.date_width / 2;
+        for idx in 1..8 {
+            let day_font = fonts.get_font(self.font, self.size * DAY_FACTOR);
+            let (wk_chr, c) = match idx {
+                1 => ("MON", Color::WHITE),
+                2 => ("TUE", Color::WHITE),
+                3 => ("WED", Color::WHITE),
+                4 => ("THU", Color::WHITE),
+                5 => ("FRI", Color::WHITE),
+                6 => ("SAT", Color::GREY80),
+                7 => ("SUN", Color::GREY80),
+                _ => panic!("impossible value"),
+            };
+
+            day_font
+                .draw_text(
+                    &mut view.offset((
+                        idx * date_offset + day_offset,
+                        (self.size * MONTH_FACTOR).ceil() as u32
+                            + (self.size * DAY_FACTOR * 0.2).ceil() as u32,
+                    )),
+                    c,
+                    wk_chr,
+                )
+                .unwrap();
+        }
+
+        //
+        // Draw the month
+        //
+        let month_font = fonts.get_font(self.month_font, self.size * MONTH_FACTOR);
         let month_str = match time.month() {
             1 => "January",
             2 => "February",
@@ -44,227 +124,222 @@ impl Calendar {
             12 => "December",
             _ => panic!("impossible value"),
         };
+        month_font.draw_text(view, Color::WHITE, month_str).unwrap();
 
         //
-        // Draw the of the month
+        // Draw the year
         //
-
-        self.month_cache.draw_text(
-            buf,
-            background_color,
-            &Color::new(1.0, 1.0, 1.0, 1.0),
-            month_str,
-        )?;
         if time.year() != orig.year() {
-            self.year_cache.draw_text(
-                &mut buf.offset((self.font_size * 20, 0))?,
-                background_color,
-                &Color::new(0.8, 0.8, 0.8, 1.0),
-                &format!("{:}", time.year()),
-            )?;
+            let year_font = fonts.get_font(self.font, self.size * YEAR_FACTOR);
+            year_font
+                .draw_text(
+                    &mut view.offset((cal_width - self.year_width, 0)),
+                    Color::GREY80,
+                    &format!("{:}", time.year()),
+                )
+                .unwrap();
         }
 
-        //
-        // Draw the week day
-        //
-
-        for idx in 1..8 {
-            let wk_chr = match idx {
-                1 => "MON",
-                2 => "TUE",
-                3 => "WED",
-                4 => "THU",
-                5 => "FRI",
-                6 => "SAT",
-                7 => "SUN",
-                _ => panic!("impossible value"),
-            };
-
-            self.day_cache.draw_text(
-                &mut buf.offset((
-                    idx * self.font_size * 3 + self.font_size / 5,
-                    y_off * self.font_size * 2 + self.font_size * 4,
-                ))?,
-                background_color,
-                &Color::new(1.0, 1.0, 1.0, 1.0),
-                &wk_chr,
-            )?;
-        }
-
-        y_off += 1;
-
-        while !done {
-            let mut x_pos = 0;
-
-            //
-            // Find the start of this week
-            //
-            let mut wkday = time.weekday();
-            while wkday != chrono::Weekday::Mon {
-                x_pos += 1;
-                wkday = wkday.pred();
-            }
-
+        let cal_font = fonts.get_font(self.font, self.size * DATE_FACTOR);
+        'row: for y_off in 1.. {
             //
             // Draw the week number
             //
             let wk = time.iso_week();
-            self.calendar_cache.draw_text(
-                &mut buf.offset((0, y_off * self.font_size * 2 + self.font_size * 4))?,
-                background_color,
-                &Color::new(0.75, 0.75, 0.75, 1.0),
-                &format!("{:02}", wk.week()),
-            )?;
-            x_pos += 1;
+            cal_font
+                .draw_text(
+                    &mut view.offset((
+                        0,
+                        y_off * (self.size * LINE_HEIGHT).ceil() as u32
+                            + (self.size * MONTH_FACTOR).ceil() as u32,
+                    )),
+                    if wk == orig.iso_week() {
+                        Color::WHITE
+                    } else {
+                        Color::GREY75
+                    },
+                    &format!("{:02}", wk.week()),
+                )
+                .unwrap();
 
             //
             // Draw the dates
             //
-            while x_pos < 8 {
+            let x_off = time.weekday().number_from_monday();
+            for x_pos in x_off..8 {
                 let c = if time.day() == orig.day() && time.month() == orig.month() {
-                    Color::new(1.0, 1.0, 1.0, 1.0)
+                    Color::WHITE
+                } else if x_pos < 6 {
+                    Color::GREY50
                 } else {
-                    Color::new(0.5, 0.5, 0.5, 1.0)
+                    Color::GREY35
                 };
 
-                self.calendar_cache.draw_text(
-                    &mut buf.offset((
-                        x_pos * self.font_size * 3,
-                        y_off * self.font_size * 2 + self.font_size * 4,
-                    ))?,
-                    background_color,
-                    &c,
-                    &format!("{:02}", time.day()),
-                )?;
+                cal_font
+                    .draw_text(
+                        &mut view.offset((
+                            x_pos * date_offset,
+                            y_off * (self.size * LINE_HEIGHT).ceil() as u32
+                                + (self.size * MONTH_FACTOR).ceil() as u32,
+                        )),
+                        c,
+                        &format!("{:02}", time.day()),
+                    )
+                    .unwrap();
 
                 let t = time.with_day(time.day() + 1);
                 if t.is_none() {
-                    done = true;
-                    break;
+                    break 'row;
                 }
                 time = t.unwrap();
-                x_pos += 1;
             }
-
-            y_off += 1;
         }
-        Ok(buf.get_signed_bounds())
-    }
-}
-
-impl Calendar {
-    pub fn new(font_size: f32, sections: u32) -> Box<Calendar> {
-        let mut calendar_cache = Font::new(&DEJAVUSANS_MONO, font_size * 2.0);
-        calendar_cache.add_str_to_cache("0123456789");
-        let mut month_cache = Font::new(&ROBOTO_REGULAR, font_size * 4.0);
-        month_cache.add_str_to_cache("JanuryFebMchApilJgstSmOoNvD");
-        let mut year_cache = Font::new(&DEJAVUSANS_MONO, font_size * 1.5);
-        year_cache.add_str_to_cache("-0123456789");
-        let mut day_cache = Font::new(&DEJAVUSANS_MONO, font_size);
-        day_cache.add_str_to_cache("MONTUEWDHFRISA");
-        Box::new(Calendar {
-            cur_date: Local::now().date(),
-            dirty: true,
-            offset: 0.0,
-            sections: sections,
-            font_size: font_size as u32,
-            calendar_cache: calendar_cache,
-            month_cache: month_cache,
-            year_cache: year_cache,
-            day_cache: day_cache,
-        })
     }
 }
 
 impl Widget for Calendar {
-    fn wait(&mut self, _: &mut WaitContext) {}
-    fn enter(&mut self) {}
-    fn leave(&mut self) {}
-
-    fn size(&self) -> (u32, u32) {
-        let cal_width = 7 * self.font_size * 3 + self.font_size * 2;
-        let cal_pad = self.font_size * 3;
-        (
-            cal_width * self.sections + cal_pad * (self.sections - 1),
-            (self.font_size as f32 * 21.5) as u32,
-        )
+    fn get_dirty(&self) -> bool {
+        self.dirty
     }
 
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let (width, height) = self.size();
-        if ctx.time.date() == self.cur_date && !ctx.force && !self.dirty {
-            return Ok(DrawReport::empty(width, height));
+    fn geometry(&self) -> Geometry {
+        self.geometry
+    }
+
+    fn event(&mut self, event: &Event) {
+        if let Event::NewMinute = event {
+            self.dirty = true;
         }
-        self.dirty = false;
-        self.cur_date = ctx.time.date();
+    }
 
-        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        buf.memset(ctx.bg);
-        let time = ctx.time.date();
-        let mut t = time.with_day(1).unwrap();
-        let o = (self.offset / 100.0) as i32;
-
-        let cals = self.sections - 1;
-        let pre_cals = cals / 2;
-        for _ in 0..pre_cals {
-            t = t.pred().with_day(1).unwrap();
-        }
-
-        if o != 0 {
-            let mut month = (t.month() - 1) as i32 + o;
-            let mut year = t.year();
-            while month > 11 {
-                year += 1;
-                month -= 12;
-            }
-            while month < 0 {
-                year -= 1;
-                month += 12;
-            }
-            t = t
-                .with_year(year)
-                .unwrap()
-                .with_month((month + 1) as u32)
-                .unwrap();
-        }
-        let cal_pad = 7 * self.font_size * 3 + self.font_size * 5;
-        for idx in 0..self.sections {
-            self.draw_month(&mut buf.offset((cal_pad * idx, 0))?, ctx.bg, &time, &t)?;
-
-            t = if t.month() == 12 {
-                t.with_year(t.year() + 1).unwrap().with_month(1).unwrap()
-            } else {
-                t.with_month(t.month() + 1).unwrap()
+    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        if self.shown_sections_y == 0 || self.shown_sections_x == 0 {
+            return Geometry {
+                x: self.geometry.x,
+                y: self.geometry.y,
+                width: 0,
+                height: 0,
             };
         }
-        Ok(DrawReport {
-            width: width,
-            height: height,
-            damage: vec![buf.get_signed_bounds()],
-            full_damage: false,
-        })
+
+        let time = Local::now().naive_local().date();
+
+        let cal_height =
+            (self.size * MONTH_FACTOR).ceil() as u32 + (self.size * LINE_HEIGHT * 8.).ceil() as u32;
+        let cal_width = 8 * self.date_width + 7 * (self.date_width / 2);
+        let cal_pad = self.date_width * 2;
+
+        let mut t = time.with_day(1).unwrap();
+        let cals = self.shown_sections_y * self.shown_sections_x;
+        if cals >= 3 {
+            t = t.pred_opt().unwrap().with_day(1).unwrap();
+        }
+
+        for ydx in 0..self.shown_sections_y {
+            for idx in 0..self.shown_sections_x {
+                self.draw_month(
+                    fonts,
+                    &mut view.offset(((cal_width + cal_pad) * idx, cal_height * ydx)),
+                    time,
+                    t,
+                );
+                t = if t.month() == 12 {
+                    t.with_year(t.year() + 1).unwrap().with_month(1).unwrap()
+                } else {
+                    t.with_month(t.month() + 1).unwrap()
+                };
+            }
+        }
+        self.dirty = false;
+        self.geometry
     }
 
-    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-    fn mouse_click(&mut self, _: u32, (x, _): (u32, u32)) {
-        let cal_pad = 7 * self.font_size * 3 + self.font_size * 5;
-        let cals = self.sections - 1;
-        let pre_cals = cals / 2;
-        if x < pre_cals * cal_pad {
-            self.offset -= 100.0;
-        } else if x >= (pre_cals + 1) * cal_pad {
-            self.offset += 100.0;
-        } else {
-            self.offset = 0.0;
+    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+        let year_font = fonts.get_font(self.font, self.size * YEAR_FACTOR);
+        self.year_width = year_font.auto_widest("0123456789").unwrap() * 4;
+        let cal_font = fonts.get_font(self.font, self.size * DATE_FACTOR);
+        self.date_width = cal_font.auto_widest("0123456789").unwrap() * 2;
+        let day_font = fonts.get_font(self.font, self.size * DAY_FACTOR);
+        self.day_width = day_font.auto_widest("ADEFHIMNORSTUW").unwrap() * 3;
+
+        let cal_width = 8 * self.date_width + 7 * (self.date_width / 2);
+        let cal_height =
+            (self.size * MONTH_FACTOR).ceil() as u32 + (self.size * LINE_HEIGHT * 8.).ceil() as u32;
+
+        let cal_pad = self.date_width * 2;
+
+        if geometry.width < cal_width || geometry.height < cal_height {
+            self.shown_sections_x = 0;
+            self.shown_sections_y = 0;
+            self.geometry = Default::default();
+            return self.geometry;
         }
-        self.dirty = true;
+
+        let possible_sections_x = 1 + (geometry.width - cal_width) / (cal_width + cal_pad);
+        let possible_sections_y = 1 + (geometry.height - cal_height) / cal_height;
+
+        self.shown_sections_x =
+            if self.sections_x > 0 && self.sections_x < possible_sections_x as i32 {
+                self.sections_x as u32
+            } else {
+                possible_sections_x
+            };
+        self.shown_sections_y =
+            if self.sections_y > 0 && self.sections_y < possible_sections_y as i32 {
+                self.sections_y as u32
+            } else {
+                possible_sections_y
+            };
+
+        self.geometry = Geometry {
+            x: geometry.x,
+            y: geometry.y,
+            width: cal_width * self.shown_sections_x + cal_pad * (self.shown_sections_x - 1),
+            height: cal_height * self.shown_sections_y,
+        };
+        self.geometry
     }
-    fn mouse_scroll(&mut self, (_, y): (f64, f64), _: (u32, u32)) {
-        self.offset += y;
-        self.dirty = true;
+
+    fn minimum_size(&mut self, fonts: &mut FontMap) -> Geometry {
+        let cal_font = fonts.get_font(self.font, self.size * DATE_FACTOR);
+        let date_width = cal_font.auto_widest("0123456789").unwrap() * 2;
+
+        let cal_width = 8 * date_width + 7 * (date_width / 2);
+        let cal_height =
+            (self.size * MONTH_FACTOR).ceil() as u32 + (self.size * LINE_HEIGHT * 8.).ceil() as u32;
+        let cal_pad = date_width * 2;
+
+        let sections_x = match self.sections_x {
+            -1 => 1,
+            0 => {
+                return Geometry {
+                    x: 0,
+                    y: 0,
+                    width: 0,
+                    height: 0,
+                };
+            }
+            x => x,
+        };
+        let sections_y = match self.sections_y {
+            -1 => 1,
+            0 => {
+                return Geometry {
+                    x: 0,
+                    y: 0,
+                    width: 0,
+                    height: 0,
+                };
+            }
+            y => y,
+        };
+        let width = cal_width * sections_x as u32 + cal_pad * (sections_x as u32 - 1);
+        let height = cal_height * sections_y as u32;
+        Geometry {
+            x: 0,
+            y: 0,
+            width,
+            height,
+        }
     }
 }

src/widgets/clock.rs

@@ -1,85 +1,93 @@
-use crate::color::Color;
-use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use std::default::Default;
 
-use chrono::{DateTime, Datelike, Duration, Local, Timelike};
+use crate::{
+    buffer::BufferView,
+    color::Color,
+    event::Event,
+    fonts::FontMap,
+    widgets::{Geometry, Widget},
+};
+
+use chrono::{Local, Timelike};
 
 pub struct Clock {
-    cur_time: DateTime<Local>,
-    clock_cache: Font,
+    font: &'static str,
     size: f32,
+    dirty: bool,
+    geometry: Geometry,
+    digit_width: u32,
+    colon_width: u32,
 }
 
 impl Clock {
-    pub fn new(size: f32) -> Box<Clock> {
-        let mut clock_cache = Font::new(&ROBOTO_REGULAR, size);
-        clock_cache.add_str_to_cache("0123456789:");
-
-        let time = Local::now();
-
-        Box::new(Clock {
-            cur_time: time.with_year(time.year().saturating_sub(1)).unwrap(),
-            clock_cache: clock_cache,
-            size: size,
-        })
+    pub fn new(fm: &mut FontMap, font: &'static str, size: f32) -> Clock {
+        fm.queue_font(font, size, "0123456789: ");
+        Clock {
+            font,
+            size,
+            dirty: true,
+            geometry: Default::default(),
+            digit_width: 0,
+            colon_width: 0,
+        }
     }
 }
 
 impl Widget for Clock {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        let target = (self.cur_time + Duration::seconds(60))
-            .with_second(0)
-            .unwrap()
-            .with_nanosecond(0)
-            .unwrap();
-        ctx.set_time(target);
-    }
-    fn enter(&mut self) {}
-    fn leave(&mut self) {}
-    fn size(&self) -> (u32, u32) {
-        let digit = (self.size * 0.45).ceil() as u32;
-        let colon = (self.size * 0.20).ceil() as u32;
-        (digit * 4 + colon, self.size.ceil() as u32)
+    fn get_dirty(&self) -> bool {
+        self.dirty
     }
 
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let (width, height) = self.size();
-        if !(ctx.time.date() != self.cur_time.date()
-            || ctx.time.hour() != self.cur_time.hour()
-            || ctx.time.minute() != self.cur_time.minute()
-            || ctx.force)
-        {
-            return Ok(DrawReport::empty(width, height));
+    fn geometry(&self) -> Geometry {
+        self.geometry
+    }
+
+    fn event(&mut self, event: &Event) {
+        if let Event::NewMinute = event {
+            self.dirty = true;
         }
-
-        self.cur_time = ctx.time.clone();
-
-        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        buf.memset(ctx.bg);
-
-        let digit = (self.size * 0.45).ceil() as u32;
-        let colon = (self.size * 0.20).ceil() as u32;
-        self.clock_cache.draw_text_fixed_width(
-            buf,
-            ctx.bg,
-            &Color::new(1.0, 1.0, 1.0, 1.0),
-            &[digit, digit, colon, digit, digit],
-            &format!("{:02}:{:02}", ctx.time.hour(), ctx.time.minute()),
-        )?;
-
-        Ok(DrawReport {
-            width: width,
-            height: height,
-            damage: vec![(pos.0 as i32, pos.1 as i32, width as i32, height as i32)],
-            full_damage: false,
-        })
     }
 
-    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-    fn mouse_click(&mut self, _: u32, _: (u32, u32)) {}
-    fn mouse_scroll(&mut self, _: (f64, f64), _: (u32, u32)) {}
+    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        let time = Local::now().naive_local();
+        let fg = Color::WHITE;
+
+        let digit = self.digit_width;
+        let colon = self.colon_width;
+        let font = fonts.get_font(self.font, self.size);
+        font.draw_text_fixed_width(
+            view,
+            fg,
+            &[digit, digit, colon, digit, digit],
+            &format!("{:02}:{:02}", time.hour(), time.minute()),
+        )
+        .unwrap();
+        self.dirty = false;
+        self.geometry
+    }
+
+    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+        let font = fonts.get_font(self.font, self.size);
+        self.digit_width = font.auto_widest("0123456789").unwrap();
+        self.colon_width = font.auto_widest(":").unwrap();
+        self.geometry = Geometry {
+            x: geometry.x,
+            y: geometry.y,
+            width: self.digit_width * 4 + self.colon_width,
+            height: self.size.ceil() as u32,
+        };
+        self.geometry
+    }
+
+    fn minimum_size(&mut self, fonts: &mut FontMap) -> Geometry {
+        let font = fonts.get_font(self.font, self.size);
+        let digit_width = font.auto_widest("0123456789").unwrap();
+        let colon_width = font.auto_widest(":").unwrap();
+        Geometry {
+            x: 0,
+            y: 0,
+            width: digit_width * 4 + colon_width,
+            height: self.size.ceil() as u32,
+        }
+    }
 }

src/widgets/date.rs

@@ -1,76 +1,89 @@
-use crate::color::Color;
-use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use std::default::Default;
 
-use chrono::{DateTime, Datelike, Local};
+use crate::{
+    buffer::BufferView,
+    color::Color,
+    event::Event,
+    fonts::FontMap,
+    widgets::{Geometry, Widget},
+};
+
+use chrono::{Datelike, Local};
 
 pub struct Date {
-    cur_time: DateTime<Local>,
-    date_cache: Font,
+    font: &'static str,
     size: f32,
+    dirty: bool,
+    geometry: Geometry,
 }
 
 impl Date {
-    pub fn new(size: f32) -> Box<Date> {
-        let mut date_cache = Font::new(&ROBOTO_REGULAR, size);
-        date_cache
-            .add_str_to_cache("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789,/ ");
-
-        let time = Local::now();
-
-        Box::new(Date {
-            cur_time: time.with_year(time.year().saturating_sub(1)).unwrap(),
-            date_cache: date_cache,
-            size: size,
-        })
+    pub fn new(fm: &mut FontMap, font: &'static str, size: f32) -> Date {
+        fm.queue_font(font, size, "0123456789/, adehinortuFMSTW");
+        Date {
+            font,
+            size,
+            dirty: true,
+            geometry: Default::default(),
+        }
     }
 }
 
 impl Widget for Date {
-    fn wait(&mut self, _: &mut WaitContext) {}
-    fn enter(&mut self) {}
-    fn leave(&mut self) {}
-    fn size(&self) -> (u32, u32) {
-        ((6.5 * self.size).ceil() as u32, self.size.ceil() as u32)
+    fn get_dirty(&self) -> bool {
+        self.dirty
     }
 
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let (width, height) = self.size();
+    fn geometry(&self) -> Geometry {
+        self.geometry
+    }
 
-        if !(ctx.time.date() != self.cur_time.date() || ctx.force) {
-            return Ok(DrawReport::empty(width, height));
+    fn event(&mut self, event: &Event) {
+        if let Event::NewMinute = event {
+            self.dirty = true;
         }
-
-        self.cur_time = ctx.time.clone();
-
-        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        buf.memset(ctx.bg);
-        self.date_cache.draw_text(
-            buf,
-            ctx.bg,
-            &Color::new(1.0, 1.0, 1.0, 1.0),
-            &format!(
-                "{:?}, {:02}/{:02}/{:4}",
-                ctx.time.weekday(),
-                ctx.time.day(),
-                ctx.time.month(),
-                ctx.time.year()
-            ),
-        )?;
-
-        Ok(DrawReport {
-            width: width,
-            height: height,
-            damage: vec![(pos.0 as i32, pos.1 as i32, width as i32, height as i32)],
-            full_damage: false,
-        })
     }
 
-    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-    fn mouse_click(&mut self, _: u32, _: (u32, u32)) {}
-    fn mouse_scroll(&mut self, _: (f64, f64), _: (u32, u32)) {}
+    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        let time = Local::now().naive_local();
+        let fg = Color::WHITE;
+        let font = fonts.get_font(self.font, self.size);
+        font.draw_text(
+            view,
+            fg,
+            &format!(
+                "{}, {:02}/{:02}/{:4}",
+                time.weekday(),
+                time.day(),
+                time.month(),
+                time.year()
+            ),
+        )
+        .unwrap();
+        self.dirty = false;
+        self.geometry
+    }
+
+    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+        let width = (3. + 2. + 2. + 2. + 4.) * self.size / 2.;
+        let font = fonts.get_font(self.font, self.size);
+        self.geometry = Geometry {
+            x: geometry.x,
+            y: geometry.y,
+            width: width.ceil() as u32,
+            height: font.height().ceil() as u32,
+        };
+        self.geometry
+    }
+
+    fn minimum_size(&mut self, fonts: &mut FontMap) -> Geometry {
+        let width = (3. + 2. + 2. + 2. + 4.) * self.size / 2.;
+        let font = fonts.get_font(self.font, self.size);
+        Geometry {
+            x: 0,
+            y: 0,
+            width: width.ceil() as u32,
+            height: font.height().ceil() as u32,
+        }
+    }
 }

src/widgets/layout.rs

@@ -0,0 +1,286 @@
+// Constructors here deliberately return Box<dyn Layout> so configs compose.
+#![allow(clippy::new_ret_no_self)]
+
+use std::cmp::max;
+
+use crate::{fonts::FontMap, state::State, widgets::Geometry};
+
+pub trait Layout {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry;
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry;
+}
+
+pub struct HorizontalLayout {
+    pub widgets: Vec<Box<dyn Layout>>,
+}
+
+impl HorizontalLayout {
+    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
+        Box::new(HorizontalLayout { widgets })
+    }
+}
+
+impl Layout for HorizontalLayout {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry {
+        let mut geo = *geometry;
+        let mut max_width = 0;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let result = w.geometry_update(fonts, &geo, state);
+            geo.x = result.x + result.width;
+            geo.width -= result.width;
+            max_width += result.width;
+            max_height = max(result.height, max_height);
+        }
+        geo.width = max_width;
+        geo.height = max_height;
+        geo
+    }
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
+        let mut max_width = 0;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let result = w.minimum_size(fonts, state);
+            max_width += result.x + result.width;
+            max_height = max(result.y + result.height, max_height);
+        }
+        Geometry {
+            width: max_width,
+            height: max_height,
+            x: 0,
+            y: 0,
+        }
+    }
+}
+
+pub struct VerticalLayout {
+    pub widgets: Vec<Box<dyn Layout>>,
+}
+
+impl VerticalLayout {
+    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
+        Box::new(VerticalLayout { widgets })
+    }
+}
+
+impl Layout for VerticalLayout {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry {
+        let mut geo = *geometry;
+        let mut max_width = 0;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let result = w.geometry_update(fonts, &geo, state);
+            geo.y = result.y + result.height;
+            geo.height -= result.height;
+            max_width = max(result.width, max_width);
+            max_height += result.height;
+        }
+        geo.width = max_width;
+        geo.height = max_height;
+        geo
+    }
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
+        let mut max_width = 0;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let result = w.minimum_size(fonts, state);
+            max_width = max(result.x + result.width, max_width);
+            max_height += result.y + result.height;
+        }
+        Geometry {
+            width: max_width,
+            height: max_height,
+            x: 0,
+            y: 0,
+        }
+    }
+}
+
+pub trait WidgetUpdater {
+    fn geometry_update(&mut self, idx: usize, fonts: &mut FontMap, geometry: &Geometry)
+    -> Geometry;
+    fn minimum_size(&mut self, idx: usize, fonts: &mut FontMap) -> Geometry;
+}
+
+pub struct IndexedLayout {
+    pub widget_idx: usize,
+}
+
+impl IndexedLayout {
+    pub fn new(widget_idx: usize) -> Box<dyn Layout> {
+        Box::new(IndexedLayout { widget_idx })
+    }
+}
+
+impl Layout for IndexedLayout {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry {
+        state.geometry_update(self.widget_idx, fonts, geometry)
+    }
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
+        state.minimum_size(self.widget_idx, fonts)
+    }
+}
+
+pub struct InvertedHorizontalLayout {
+    pub widgets: Vec<Box<dyn Layout>>,
+}
+
+impl InvertedHorizontalLayout {
+    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
+        Box::new(InvertedHorizontalLayout { widgets })
+    }
+}
+
+impl Layout for InvertedHorizontalLayout {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry {
+        let mut geo = *geometry;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let mut temp_geo = geo;
+            let temp_result = w.geometry_update(fonts, &temp_geo, state);
+            temp_geo.x = geo.x + (geo.width - temp_result.width);
+            let result = w.geometry_update(fonts, &temp_geo, state);
+            geo.width -= result.width;
+            max_height = max(result.height, max_height);
+        }
+        geo.height = max_height;
+        geo
+    }
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
+        let mut max_width = 0;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let result = w.minimum_size(fonts, state);
+            max_width += result.x + result.width;
+            max_height = max(result.y + result.height, max_height);
+        }
+        Geometry {
+            width: max_width,
+            height: max_height,
+            x: 0,
+            y: 0,
+        }
+    }
+}
+
+pub struct InvertedVerticalLayout {
+    pub widgets: Vec<Box<dyn Layout>>,
+}
+
+impl InvertedVerticalLayout {
+    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
+        Box::new(InvertedVerticalLayout { widgets })
+    }
+}
+
+impl Layout for InvertedVerticalLayout {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry {
+        let mut geo = *geometry;
+        let mut max_width = 0;
+        for w in self.widgets.iter() {
+            let mut temp_geo = geo;
+            let temp_result = w.geometry_update(fonts, &temp_geo, state);
+            temp_geo.y = geo.y + (geo.height - temp_result.height);
+            let result = w.geometry_update(fonts, &temp_geo, state);
+            geo.height -= result.height;
+            max_width = max(result.width, max_width);
+        }
+        geo.width = max_width;
+        geo
+    }
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
+        let mut max_width = 0;
+        let mut max_height = 0;
+        for w in self.widgets.iter() {
+            let result = w.minimum_size(fonts, state);
+            max_width = max(result.x + result.width, max_width);
+            max_height += result.y + result.height;
+        }
+        Geometry {
+            width: max_width,
+            height: max_height,
+            x: 0,
+            y: 0,
+        }
+    }
+}
+
+pub struct Margin {
+    pub widget: Box<dyn Layout>,
+    pub margin: (u32, u32, u32, u32),
+}
+
+impl Margin {
+    pub fn new(widget: Box<dyn Layout>, margin: (u32, u32, u32, u32)) -> Box<dyn Layout> {
+        Box::new(Margin { widget, margin })
+    }
+}
+
+impl Layout for Margin {
+    fn geometry_update(
+        &self,
+        fonts: &mut FontMap,
+        geometry: &Geometry,
+        state: &mut State,
+    ) -> Geometry {
+        let geo = Geometry {
+            x: geometry.x + self.margin.0,
+            y: geometry.y + self.margin.1,
+            width: geometry.width - self.margin.0 - self.margin.2,
+            height: geometry.height - self.margin.1 - self.margin.3,
+        };
+        let out = self.widget.geometry_update(fonts, &geo, state);
+        Geometry {
+            x: out.x - self.margin.0,
+            y: out.y - self.margin.1,
+            width: out.width + self.margin.0 + self.margin.2,
+            height: out.height + self.margin.1 + self.margin.3,
+        }
+    }
+
+    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
+        let size = self.widget.minimum_size(fonts, state);
+        Geometry {
+            width: size.x + size.width + self.margin.0 + self.margin.2,
+            height: size.y + size.height + self.margin.1 + self.margin.3,
+            x: 0,
+            y: 0,
+        }
+    }
+}

src/widgets/line.rs

@@ -0,0 +1,62 @@
+use std::default::Default;
+
+use crate::{
+    buffer::BufferView,
+    color::Color,
+    fonts::FontMap,
+    widgets::{Geometry, Widget},
+};
+
+pub struct Line {
+    geometry: Geometry,
+    thickness: u32,
+    vertical: bool,
+}
+
+impl Line {
+    pub fn new(thickness: u32, vertical: bool) -> Line {
+        Line {
+            geometry: Default::default(),
+            thickness,
+            vertical,
+        }
+    }
+}
+
+impl Widget for Line {
+    fn geometry(&self) -> Geometry {
+        self.geometry
+    }
+
+    fn draw(&mut self, _fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        view.memset(Color::WHITE);
+        self.geometry
+    }
+
+    fn geometry_update(&mut self, _fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+        self.geometry = Geometry {
+            x: geometry.x,
+            y: geometry.y,
+            width: if self.vertical {
+                self.thickness
+            } else {
+                geometry.width
+            },
+            height: if self.vertical {
+                geometry.height
+            } else {
+                self.thickness
+            },
+        };
+        self.geometry
+    }
+
+    fn minimum_size(&mut self, _fonts: &mut FontMap) -> Geometry {
+        Geometry {
+            x: 0,
+            y: 0,
+            width: if self.vertical { self.thickness } else { 1 },
+            height: if self.vertical { 1 } else { self.thickness },
+        }
+    }
+}

src/widgets/mod.rs

@@ -1,11 +1,27 @@
-pub mod backlight;
-pub mod bar_widget;
-pub mod battery;
-pub mod calendar;
-pub mod clock;
-pub mod date;
-pub mod launcher;
-pub mod networkmanager;
+//mod alsaaudio;
+mod backlight;
+mod bar_widget;
+mod battery;
+mod calendar;
+mod clock;
+mod date;
+mod launcher;
+mod layout;
+mod line;
+mod pulseaudio;
+mod widget;
 
-#[cfg(any(feature = "alsa-widget", feature = "pulseaudio-widget"))]
-pub mod audio;
+//pub use alsaaudio::AlsaAudio;
+pub use backlight::Backlight;
+pub use battery::Battery;
+pub use calendar::Calendar;
+pub use clock::Clock;
+pub use date::Date;
+pub use launcher::Interface;
+pub use layout::{
+    HorizontalLayout, IndexedLayout, InvertedHorizontalLayout, InvertedVerticalLayout, Layout,
+    Margin, VerticalLayout, WidgetUpdater,
+};
+pub use line::Line;
+pub use pulseaudio::PulseAudio;
+pub use widget::{Geometry, Widget};

src/widgets/networkmanager.rs

@@ -1,516 +0,0 @@
-use crate::color::Color;
-use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
-use crate::cmd::Cmd;
-
-use std::sync::mpsc::Sender;
-use std::cell::RefCell;
-use std::net::Ipv4Addr;
-use std::fmt;
-
-use nix::poll::{PollFd, PollFlags};
-
-use dbus;
-
-
-#[derive(Debug)]
-enum NetworkState {
-    Unknown = 0,
-    Asleep = 10,
-    Disconnected = 20,
-    Disconnecting = 30,
-    Connecting = 40,
-    ConnectedLocal = 50,
-    ConnectedSite = 60,
-    ConnectedGlobal = 70,
-}
-
-impl From<u32> for NetworkState {
-    fn from(id: u32) -> Self {
-        match id {
-            // https://developer.gnome.org/NetworkManager/unstable/nm-dbus-types.html#NMState
-            10 => NetworkState::Asleep,
-            20 => NetworkState::Disconnected,
-            30 => NetworkState::Disconnecting,
-            40 => NetworkState::Connecting,
-            50 => NetworkState::ConnectedLocal,
-            60 => NetworkState::ConnectedSite,
-            70 => NetworkState::ConnectedGlobal,
-            _  => NetworkState::Unknown,
-        }
-    }
-}
-
-enum ActiveConnectionState {
-    Unknown,
-    Activating,
-    Activated,
-    Deactivating,
-    Deactivated,
-}
-
-impl From<u32> for ActiveConnectionState {
-    fn from(id: u32) -> Self {
-        match id {
-            // https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMActiveConnectionState
-            1 => ActiveConnectionState::Activating,
-            2 => ActiveConnectionState::Activated,
-            3 => ActiveConnectionState::Deactivating,
-            4 => ActiveConnectionState::Deactivated,
-            _ => ActiveConnectionState::Unknown,
-        }
-    }
-}
-
-#[derive(Debug)]
-enum DeviceType {
-    Unknown,
-    Ethernet,
-    Wifi,
-    Modem,
-    Bridge,
-    TUN,
-    Wireguard,
-}
-
-impl From<u32> for DeviceType {
-    fn from(id: u32) -> Self {
-        match id {
-            // https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMDeviceType
-            1 => DeviceType::Ethernet,
-            2 => DeviceType::Wifi,
-            8 => DeviceType::Modem,
-            13 => DeviceType::Bridge,
-            16 => DeviceType::TUN,
-            29 => DeviceType::Wireguard,
-            _ => DeviceType::Unknown,
-        }
-    }
-}
-
-#[derive(Debug)]
-struct Ipv4Address {
-    address: Ipv4Addr,
-    prefix: u32,
-    gateway: Ipv4Addr,
-}
-
-trait ByteOrderSwap {
-    fn swap(&self) -> Self;
-}
-
-impl ByteOrderSwap for u32 {
-    fn swap(&self) -> u32 {
-        ((self & 0x000000FF) << 24) | ((self & 0x0000FF00) << 8) | ((self & 0x00FF0000) >> 8) | ((self & 0xFF000000) >> 24)
-    }
-}
-
-impl<'a> From<dbus::arg::Array<'a, u32, dbus::arg::Iter<'a>>> for Ipv4Address {
-    fn from(s: dbus::arg::Array<'a, u32, dbus::arg::Iter<'a>>) -> Ipv4Address {
-        let mut i = s.into_iter();
-        Ipv4Address {
-            address: Ipv4Addr::from(i.next().unwrap().swap()),
-            prefix: i.next().unwrap(),
-            gateway: Ipv4Addr::from(i.next().unwrap().swap()),
-        }
-    }
-}
-
-impl fmt::Display for Ipv4Address {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}/{}", self.address, self.prefix)
-    }
-}
-
-fn get_nm_property<'a>(
-    con: &dbus::Connection,
-    obj: &str,
-    path: &dbus::Path<'a>,
-    property: &str,
-) -> Result<dbus::Message, ::std::io::Error> {
-    let msg = dbus::Message::new_method_call(
-        obj,
-        path,
-        "org.freedesktop.DBus.Properties",
-        "Get",
-    )
-    .map_err(|_| {
-        ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not send make dbus method call",
-        )
-    })?
-    .append2(
-        dbus::MessageItem::Str("org.freedesktop.NetworkManager".to_string()),
-        dbus::MessageItem::Str(property.to_string()),
-    );
-
-    con.send_with_reply_and_block(msg, 1000).map_err(|_| {
-        ::std::io::Error::new(::std::io::ErrorKind::Other, "could not send dbus message")
-    })
-}
-
-fn state(con: &dbus::Connection) -> Result<NetworkState, ::std::io::Error> {
-    let m = get_nm_property(con, "org.freedesktop.NetworkManager", &"/org/freedesktop/NetworkManager".into(), "State").map_err(|_| ::std::io::Error::new(
-        ::std::io::ErrorKind::Other,
-        "could not retrieve state",
-    ))?;
-    let state: dbus::arg::Variant<u32> = m.get1().ok_or_else(|| ::std::io::Error::new(
-        ::std::io::ErrorKind::Other,
-        "could not read property",
-    ))?;
-    Ok(NetworkState::from(state.0))
-}
-
-fn primary_connection(con: &dbus::Connection) -> Result<NmConnection, ::std::io::Error> {
-    let m = get_nm_property(con, "org.freedesktop.NetworkManager", &"/org/freedesktop/NetworkManager".into(), "PrimaryConnection").map_err(|_| ::std::io::Error::new(
-        ::std::io::ErrorKind::Other,
-        "could not primary connection",
-    ))?;
-    let primary_connection: dbus::arg::Variant<dbus::Path> = m.get1().ok_or_else(|| ::std::io::Error::new(
-        ::std::io::ErrorKind::Other,
-        "could not read property",
-    ))?;
-    if let Ok(conn) = primary_connection.0.as_cstr().to_str() {
-        if conn == "/" {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "no primary connection",
-            ));
-        }
-    }
-    Ok(NmConnection { path: primary_connection.0.clone() })
-}
-
-fn active_connections(con: &dbus::Connection) -> Result<Vec<NmConnection>, ::std::io::Error> {
-    let m = get_nm_property(con, "org.freedesktop.NetworkManager", &"/org/freedesktop/NetworkManager".into(), "ActiveConnections").map_err(|_| ::std::io::Error::new(
-        ::std::io::ErrorKind::Other,
-        "could not retrieve active connections",
-    ))?;
-    let active_connections: dbus::arg::Variant<dbus::arg::Array<dbus::Path, dbus::arg::Iter>> = m.get1().ok_or_else(|| ::std::io::Error::new(
-        ::std::io::ErrorKind::Other,
-        "could not read property",
-    ))?;
-    Ok(active_connections.0.into_iter().map(|x| NmConnection { path: x }).collect())
-}
-
-#[derive(Clone)]
-struct NmConnection<'a> {
-    path: dbus::Path<'a>,
-}
-
-impl<'a> NmConnection<'a> {
-    fn state(&self, con: &dbus::Connection) -> Result<ActiveConnectionState, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.Connection.Active", &self.path, "State").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve connection state",
-        ))?;
-        let state: dbus::arg::Variant<u32> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(ActiveConnectionState::from(state.0))
-    }
-
-    fn id(&self, con: &dbus::Connection) -> Result<String, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.Connection.Active", &self.path, "Id").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve connection ID",
-        ))?;
-        let id: dbus::arg::Variant<String> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(id.0)
-    }
-
-    fn devices(&self, con: &dbus::Connection) -> Result<Vec<NmDevice>, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.Connection.Active", &self.path, "Devices").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve connection devices",
-        ))?;
-        let devices: dbus::arg::Variant<dbus::arg::Array<dbus::Path, dbus::arg::Iter>> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(devices.0.into_iter().map(|x| NmDevice { path: x }).collect())
-    }
-}
-
-#[derive(Clone)]
-struct NmDevice<'a> {
-    path: dbus::Path<'a>,
-}
-
-impl<'a> NmDevice<'a> {
-    fn device_type(&self, con: &dbus::Connection) -> Result<DeviceType, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.Device", &self.path, "DeviceType").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve device type",
-        ))?;
-
-        let device_type: dbus::arg::Variant<u32> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(DeviceType::from(device_type.0))
-    }
-
-    fn ip4config(&self, con: &dbus::Connection) -> Result<NmIp4Config, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.Device", &self.path, "Ip4Config").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve ip4config",
-        ))?;
-
-        let ip4config: dbus::arg::Variant<dbus::Path> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(NmIp4Config { path: ip4config.0 })
-    }
-
-    fn active_access_point(&self, con: &dbus::Connection) -> Result<NmAccessPoint, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.Device.Wireless", &self.path, "ActiveAccessPoint").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve device type",
-        ))?;
-
-        let active_ap: dbus::arg::Variant<dbus::Path> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(NmAccessPoint { path: active_ap.0 })
-    }
-}
-
-#[derive(Clone)]
-struct NmAccessPoint<'a> {
-    path: dbus::Path<'a>,
-}
-
-impl<'a> NmAccessPoint<'a> {
-    fn ssid(&self, con: &dbus::Connection) -> Result<String, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.AccessPoint", &self.path, "Ssid").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve ssid",
-        ))?;
-
-        let ssid: dbus::arg::Variant<dbus::arg::Array<u8, dbus::arg::Iter>> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(std::str::from_utf8(&ssid.0.into_iter().collect::<Vec<u8>>())
-            .map_err(|_| ::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "could not parse ssid",
-            ))?
-            .to_string())
-    }
-
-    fn strength(&self, con: &dbus::Connection) -> Result<u8, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.AccessPoint", &self.path, "Strength").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve access point strength",
-        ))?;
-
-        let strength: dbus::arg::Variant<u8> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(strength.0)
-    }
-
-    fn frequency(&self, con: &dbus::Connection) -> Result<u32, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.AccessPoint", &self.path, "Frequency").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve access point frequency",
-        ))?;
-
-        let frequency: dbus::arg::Variant<u32> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(frequency.0)
-    }
-}
-
-#[derive(Clone)]
-struct NmIp4Config<'a> {
-    path: dbus::Path<'a>,
-}
-
-impl<'a> NmIp4Config<'a> {
-    fn addresses(&self, con: &dbus::Connection) -> Result<Vec<Ipv4Address>, ::std::io::Error> {
-        let m = get_nm_property(con, "org.freedesktop.NetworkManager.IP4Config", &self.path, "Addresses").map_err(|_| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not retrieve addresses",
-        ))?;
-
-        let addresses: dbus::arg::Variant<dbus::arg::Array<dbus::arg::Array<u32, dbus::arg::Iter>, dbus::arg::Iter>> = m.get1().ok_or_else(|| ::std::io::Error::new(
-            ::std::io::ErrorKind::Other,
-            "could not read property",
-        ))?;
-        Ok(addresses.0.into_iter().map(|addr| Ipv4Address::from(addr)).collect())
-    }
-}
-
-// The widget is created on a different thread than where it will be used, so
-// we need it to be Send. However, dbus::Connection has a void*, so it's not
-// auto-derived. So, we make a small wrapper where we make it Send.
-struct DbusConnection(dbus::Connection);
-
-impl std::convert::AsRef<dbus::Connection> for DbusConnection {
-    fn as_ref(&self) -> &dbus::Connection {
-        return &self.0;
-    }
-}
-
-unsafe impl Send for DbusConnection {}
-
-#[derive(Debug)]
-struct Device {
-    // name: String,
-    t: DeviceType,
-    ips: Vec<Ipv4Address>,
-}
-
-struct Connection {
-    devices: Vec<Device>,
-}
-
-pub struct NetworkManager {
-    con: DbusConnection,
-    watch: dbus::Watch,
-
-    font: RefCell<Font>,
-    font_size: u32,
-    state: NetworkState,
-    dirty: bool,
-    tx: Sender<Cmd>,
-    length: u32,
-    connections: Vec<Connection>,
-}
-
-impl NetworkManager {
-    fn update(&mut self) -> Result<(), ::std::io::Error> {
-        self.state = state(self.con.as_ref())?;
-
-        self.connections = active_connections(self.con.as_ref())?
-            .into_iter()
-            .map(|c| {
-                let devices = c.devices(self.con.as_ref()).unwrap()
-                    .into_iter()
-                    .map(|d| {
-                        let t = d.device_type(self.con.as_ref()).unwrap();
-                        let ips = d.ip4config(self.con.as_ref()).unwrap().addresses(self.con.as_ref()).unwrap();
-                        Device{
-                            t,
-                            ips,
-                        }
-                    })
-                    .collect();
-                Connection{
-                    devices
-                }
-            })
-            .collect();
-
-        Ok(())
-    }
-
-    pub fn new(font_size: f32, length: u32, tx: Sender<Cmd>) -> Result<Box<NetworkManager>, ::std::io::Error> {
-        let con = dbus::Connection::get_private(dbus::BusType::System).map_err(|_| {
-            ::std::io::Error::new(::std::io::ErrorKind::Other, "unable to open dbus")
-        })?;
-
-
-        let font = Font::new(&ROBOTO_REGULAR, font_size);
-
-        let fds = con.watch_fds();
-        if fds.len() != 1 {
-            return Err(::std::io::Error::new(
-                ::std::io::ErrorKind::Other,
-                "expected 1 watch fd from dbus",
-            ));
-        }
-
-        let mut nm = NetworkManager {
-            con: DbusConnection(con),
-            font: RefCell::new(font),
-            font_size: font_size as u32,
-            length,
-            state: NetworkState::Unknown,
-            dirty: true,
-            watch: fds[0],
-            tx,
-            connections: Vec::new(),
-        };
-
-        nm.update()?;
-
-        Ok(Box::new(nm))
-    }
-}
-
-impl Widget for NetworkManager {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        let mut stuff = false;
-        for _ in self
-            .con
-            .as_ref()
-            .watch_handle(self.watch.fd(), dbus::WatchEvent::Readable as u32)
-        {
-            stuff = true;
-        }
-        if stuff {
-            self.update().unwrap();
-            self.dirty = true;
-            self.tx.send(Cmd::Draw).unwrap();
-        }
-
-        ctx.fds
-            .push(PollFd::new(self.watch.fd(), PollFlags::POLLIN));
-    }
-    fn enter(&mut self) {}
-    fn leave(&mut self) {}
-    fn size(&self) -> (u32, u32) {
-        (self.length, self.font_size * self.connections.len() as u32)
-    }
-    fn draw(
-        &mut self,
-        ctx: &mut DrawContext,
-        pos: (u32, u32),
-    ) -> Result<DrawReport, ::std::io::Error> {
-        let (width, height) = self.size();
-        {
-            if !self.dirty && !ctx.force {
-                return Ok(DrawReport::empty(width, height));
-            }
-            self.dirty = false;
-        }
-
-        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        buf.memset(ctx.bg);
-
-        for con in &self.connections {
-            if con.devices.len() == 0 {
-                continue;
-            }
-            let d = &con.devices[0];
-            let c = Color::new(1.0, 1.0, 1.0, 1.0);
-            self.font.borrow_mut().auto_draw_text(buf, ctx.bg, &c, "network")?;
-            let bar_off = 5 * self.font_size;
-            self.font.borrow_mut().auto_draw_text(&mut buf.offset((bar_off, 0))?, ctx.bg, &c, &format!("{:?}", d))?;
-        }
-        Ok(DrawReport {
-            width: width,
-            height: height,
-            damage: vec![buf.get_signed_bounds()],
-            full_damage: false,
-        })
-    }
-
-    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-    fn mouse_click(&mut self, _: u32, _: (u32, u32)) {}
-    fn mouse_scroll(&mut self, _: (f64, f64), _: (u32, u32)) {}
-}

src/widgets/pulseaudio.rs

@@ -0,0 +1,256 @@
+use std::{
+    cell::RefCell,
+    error::Error,
+    os::fd::RawFd,
+    rc::Rc,
+    sync::{Arc, Mutex},
+    thread,
+};
+
+use nix::unistd::{pipe, read, write};
+
+use crate::{
+    color::Color,
+    event::{Event, Events, PointerButton},
+    fonts::FontMap,
+    widgets::bar_widget::{BarWidget, BarWidgetImpl},
+};
+
+use libpulse_binding::volume::ChannelVolumes;
+
+fn monitor(
+    events: Arc<Mutex<Events>>,
+    inner: Arc<Mutex<InnerAudio>>,
+    pipe: RawFd,
+) -> Result<(), Box<dyn Error>> {
+    use libpulse_binding::{
+        callbacks::ListResult,
+        context::{
+            Context, FlagSet, State,
+            subscribe::{Facility, InterestMaskSet},
+        },
+        mainloop::{
+            self, api::Mainloop, events::io::FlagSet as IoFlagSet, standard::IterateResult,
+        },
+        proplist::{Proplist, properties},
+        volume::Volume,
+    };
+
+    let mut proplist = Proplist::new().unwrap();
+    proplist
+        .set_str(properties::APPLICATION_NAME, "wldash")
+        .unwrap();
+
+    let mut mainloop = mainloop::standard::Mainloop::new().unwrap();
+    let context = Rc::new(RefCell::new(
+        Context::new_with_proplist(&mainloop, "wldash_context", &proplist).unwrap(),
+    ));
+    context.borrow_mut().connect(None, FlagSet::NOFLAGS, None)?;
+
+    loop {
+        match mainloop.iterate(true) {
+            IterateResult::Quit(_) | IterateResult::Err(_) => {
+                return Err("pulseaudio mainloop quit while connecting".into());
+            }
+            _ => (),
+        }
+        match context.borrow().get_state() {
+            State::Ready => break,
+            State::Failed | State::Terminated => {
+                return Err("could not connect to pulseaudio".into());
+            }
+            _ => (),
+        }
+    }
+
+    let local_context = context.clone();
+    let local_inner = inner.clone();
+    let local_events = events.clone();
+    context.borrow_mut().set_subscribe_callback(Some(Box::new(
+        move |facility, _operation, index| {
+            if let Some(Facility::Sink) = facility {
+                let introspector = local_context.borrow_mut().introspect();
+                let inner = local_inner.clone();
+                let events = local_events.clone();
+                introspector.get_sink_info_by_index(index, move |res| match res {
+                    ListResult::End | ListResult::Error => (),
+                    ListResult::Item(sink_info) => {
+                        if sink_info.name.is_some() {
+                            let avg = sink_info.volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
+                            let mut inner = inner.lock().unwrap();
+                            inner.volume = avg;
+                            inner.mute = sink_info.mute;
+                            inner.dirty = true;
+                            drop(inner);
+                            let mut events = events.lock().unwrap();
+                            events.add_event(Event::AudioUpdate);
+                        }
+                    }
+                });
+            }
+        },
+    )));
+
+    context
+        .borrow_mut()
+        .subscribe(InterestMaskSet::SINK, |_| {});
+
+    let introspector = context.borrow_mut().introspect();
+    let local_inner = inner.clone();
+    introspector.get_sink_info_by_name("@DEFAULT_SINK@", move |res| match res {
+        ListResult::End | ListResult::Error => (),
+        ListResult::Item(sink_info) => {
+            if sink_info.name.is_some() {
+                let avg = sink_info.volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
+                let mut inner = local_inner.lock().unwrap();
+                inner.volume = avg;
+                inner.channel_volume = Some(sink_info.volume);
+                inner.mute = sink_info.mute;
+                inner.dirty = true;
+                drop(inner);
+                let mut events = events.lock().unwrap();
+                events.add_event(Event::AudioUpdate);
+            }
+        }
+    });
+    drop(introspector);
+
+    let local_context = context.clone();
+    let local_inner = inner.clone();
+    let event_source = mainloop.new_io_event(
+        pipe,
+        IoFlagSet::INPUT,
+        Box::new(move |_, _, _| {
+            let mut buf = [0; 8];
+            _ = read(pipe, &mut buf);
+
+            let mut inner = local_inner.lock().unwrap();
+            let mut introspector = local_context.borrow_mut().introspect();
+            // Clicks arriving before the first sink query finished have no
+            // channel map to work with; drop them instead of panicking.
+            match (inner.last_click.take(), inner.channel_volume) {
+                (Some(Change::Volume(volume)), Some(mut vol)) => {
+                    vol.scale(Volume((volume * Volume::NORMAL.0 as f32).round() as u32));
+                    introspector.set_sink_volume_by_name("@DEFAULT_SINK@", &vol, None);
+                }
+                (Some(Change::VolumeInc(value)), Some(mut vol)) => {
+                    // apply step to volumes
+                    let step = (value * Volume::NORMAL.0 as f32).round() as i32;
+                    if step > 0 {
+                        vol.inc_clamp(Volume(step as u32), Volume::NORMAL);
+                    } else {
+                        vol.decrease(Volume(-step as u32));
+                    }
+                    // HACK: It would be better to only update the volume from feedback, but axis
+                    // events fire fast and require the last set volume immediately for reference.
+                    inner.channel_volume = Some(vol);
+                    introspector.set_sink_volume_by_name("@DEFAULT_SINK@", &vol, None);
+                }
+                (Some(Change::ToggleMute), _) => {
+                    introspector.set_sink_mute_by_name("@DEFAULT_SINK@", !inner.mute, None);
+                }
+                _ => (),
+            }
+        }),
+    );
+
+    loop {
+        match mainloop.iterate(true) {
+            IterateResult::Quit(_) | IterateResult::Err(_) => break,
+            _ => (),
+        }
+    }
+
+    // Need to keep the event source alive
+    _ = event_source;
+
+    Ok(())
+}
+
+fn start_monitor(events: Arc<Mutex<Events>>, inner: Arc<Mutex<InnerAudio>>, pipe: RawFd) {
+    thread::Builder::new()
+        .name("audiomon".to_string())
+        .spawn(move || {
+            // panic = "abort" in release: a failed audio connection must not
+            // kill the dashboard. The widget simply stays at 0.
+            if let Err(e) = monitor(events, inner, pipe) {
+                eprintln!("wldash: audio monitor stopped: {}", e);
+            }
+        })
+        .unwrap();
+}
+
+enum Change {
+    Volume(f32),
+    VolumeInc(f32),
+    ToggleMute,
+}
+
+struct InnerAudio {
+    volume: f32,
+    channel_volume: Option<ChannelVolumes>,
+    mute: bool,
+    dirty: bool,
+    last_click: Option<Change>,
+    pipe: RawFd,
+}
+
+pub struct PulseAudio {
+    inner: Arc<Mutex<InnerAudio>>,
+}
+
+impl PulseAudio {
+    // Wraps the impl in the generic BarWidget on purpose.
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(
+        events: Arc<Mutex<Events>>,
+        fm: &mut FontMap,
+        font: &'static str,
+        size: f32,
+    ) -> BarWidget {
+        let (a, b) = pipe().unwrap();
+        let audio = PulseAudio {
+            inner: Arc::new(Mutex::new(InnerAudio {
+                volume: 0.0,
+                channel_volume: None,
+                mute: false,
+                dirty: false,
+                last_click: None,
+                pipe: b,
+            })),
+        };
+        start_monitor(events, audio.inner.clone(), a);
+        BarWidget::new(Box::new(audio), fm, font, size)
+    }
+}
+
+impl BarWidgetImpl for PulseAudio {
+    fn get_dirty(&self) -> bool {
+        self.inner.lock().unwrap().dirty
+    }
+    fn name(&self) -> &'static str {
+        "volume"
+    }
+    fn value(&mut self) -> f32 {
+        let mut inner = self.inner.lock().unwrap();
+        inner.dirty = false;
+        inner.volume
+    }
+    fn color(&self) -> Color {
+        match self.inner.lock().unwrap().mute {
+            true => Color::YELLOW,
+            false => Color::WHITE,
+        }
+    }
+    fn click(&mut self, pos: f32, btn: PointerButton) {
+        let mut inner = self.inner.lock().unwrap();
+        inner.last_click = match btn {
+            PointerButton::Left => Some(Change::Volume(pos)),
+            PointerButton::Right => Some(Change::ToggleMute),
+            PointerButton::ScrollVertical(val) => Some(Change::VolumeInc((val / 512.) as f32)),
+            PointerButton::ScrollHorizontal(val) => Some(Change::VolumeInc((val / 100.) as f32)),
+            _ => None,
+        };
+        _ = write(inner.pipe, &[0]);
+    }
+}

src/widgets/widget.rs

@@ -0,0 +1,96 @@
+use std::{
+    cmp::{max, min},
+    fmt,
+};
+
+use crate::{buffer::BufferView, event::Event, fonts::FontMap};
+
+#[derive(Debug, Default, Clone, Copy)]
+pub struct Geometry {
+    pub x: u32,
+    pub y: u32,
+    pub width: u32,
+    pub height: u32,
+}
+
+impl fmt::Display for Geometry {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "(x: {}, y: {}, width: {}, height: {})",
+            self.x, self.y, self.width, self.height
+        )
+    }
+}
+
+impl Geometry {
+    pub fn new() -> Geometry {
+        Geometry {
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+        }
+    }
+
+    pub fn expand(&self, other: Geometry) -> Geometry {
+        let x = min(self.x, other.x);
+        let y = min(self.y, other.y);
+        Geometry {
+            x,
+            y,
+            width: max(self.width + self.x, other.width + other.x) - x,
+            height: max(self.height + self.y, other.height + other.y) - y,
+        }
+    }
+
+    pub fn contains(&self, position: (u32, u32)) -> bool {
+        position.0 >= self.x
+            && position.0 < self.x + self.width
+            && position.1 >= self.y
+            && position.1 < self.y + self.height
+    }
+}
+
+pub trait Widget {
+    fn get_dirty(&self) -> bool {
+        false
+    }
+    fn geometry(&self) -> Geometry;
+    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry;
+    fn minimum_size(&mut self, _fonts: &mut FontMap) -> Geometry {
+        Default::default()
+    }
+    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry;
+    fn event(&mut self, _event: &Event) {}
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Geometry;
+
+    #[test]
+    fn expand_is_bounding_box() {
+        let a = Geometry {
+            x: 10,
+            y: 20,
+            width: 5,
+            height: 5,
+        };
+        let b = Geometry {
+            x: 0,
+            y: 100,
+            width: 2,
+            height: 2,
+        };
+        let e = a.expand(b);
+        assert_eq!((e.x, e.y), (0, 20));
+        assert_eq!(e.x + e.width, 15);
+        assert_eq!(e.y + e.height, 102);
+        let e2 = b.expand(a);
+        assert_eq!(
+            (e2.x, e2.y, e2.width, e2.height),
+            (e.x, e.y, e.width, e.height)
+        );
+    }
+}