Try wl-clipboard-rs

Cargo.lock

@@ -33,6 +33,14 @@ dependencies = [
  "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "approx"
 version = "0.3.2"
@@ -49,11 +57,40 @@ dependencies = [
  "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "backtrace"
+version = "0.3.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "0.9.1"
@@ -93,6 +130,15 @@ name = "byteorder"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "c2-chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.41"
@@ -114,6 +160,21 @@ dependencies = [
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "clap"
+version = "2.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "dbus"
 version = "0.6.5"
@@ -123,6 +184,27 @@ dependencies = [
  "libdbus-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "derive-new"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -149,11 +231,54 @@ name = "dtoa"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "exitfailure"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fixedbitset"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fnv"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "fuzzy-matcher"
 version = "0.2.1"
@@ -167,11 +292,43 @@ dependencies = [
  "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -230,6 +387,14 @@ name = "linked-hash-map"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "log"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "maplit"
 version = "1.0.2"
@@ -244,6 +409,32 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "nix"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nix"
 version = "0.13.1"
@@ -285,6 +476,11 @@ name = "nodrop"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "nom"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "num-bigint"
 version = "0.2.2"
@@ -344,6 +540,11 @@ dependencies = [
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ordermap"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "os_pipe"
 version = "0.8.1"
@@ -353,6 +554,34 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "owning_ref"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "pest"
 version = "2.1.1"
@@ -392,11 +621,25 @@ dependencies = [
  "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "petgraph"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -429,6 +672,68 @@ dependencies = [
  "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rcalc_lib"
 version = "0.9.3"
@@ -444,16 +749,45 @@ dependencies = [
  "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "remove_dir_all"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rusttype"
 version = "0.7.7"
@@ -478,6 +812,19 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "serde"
 version = "1.0.99"
@@ -533,6 +880,11 @@ name = "shlex"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "smallvec"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.6.4"
@@ -548,6 +900,11 @@ dependencies = [
  "wayland-protocols 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "stb_truetype"
 version = "0.2.6"
@@ -556,6 +913,42 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "stderrlog"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "structopt"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "syn"
 version = "0.15.44"
@@ -576,6 +969,65 @@ dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "term_size"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termcolor"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "time"
 version = "0.1.42"
@@ -587,11 +1039,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "timerfd"
+name = "tree_magic"
-version = "1.0.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -604,6 +1060,24 @@ name = "ucd-trie"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicase"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -614,6 +1088,16 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -629,6 +1113,24 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wayland-client"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-commons 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-scanner 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-client"
 version = "0.23.5"
@@ -643,6 +1145,14 @@ dependencies = [
  "wayland-sys 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-commons"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nix 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-commons"
 version = "0.23.5"
@@ -652,6 +1162,17 @@ dependencies = [
  "wayland-sys 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-protocols"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-client 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-commons 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-scanner 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-protocols"
 version = "0.23.5"
@@ -663,6 +1184,16 @@ dependencies = [
  "wayland-scanner 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "wayland-scanner"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wayland-scanner"
 version = "0.23.5"
@@ -682,6 +1213,11 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi"
 version = "0.3.8"
@@ -691,6 +1227,11 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -709,6 +1250,36 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wincolor"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "exitfailure 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "os_pipe 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tree_magic 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-client 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wayland-protocols 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wldash"
 version = "0.2.0"
@@ -717,6 +1288,7 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "dbus 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuzzy-matcher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libpulse-binding 2.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -731,9 +1303,9 @@ dependencies = [
  "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smithay-client-toolkit 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "timerfd 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-client 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-protocols 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wl-clipboard-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -758,27 +1330,45 @@ dependencies = [
 "checksum alsa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe6a5e4eb4879d7cb8d19161927fbf825f0d89761776359c9cf4f9c9c2f35c52"
 "checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58"
 "checksum andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
 "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
+"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5"
+"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
 "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 "checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"
 "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
 "checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 "checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum dbus 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819"
+"checksum derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9"
+"checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839"
 "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
 "checksum downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b92dfd5c2f75260cbf750572f95d387e7ca0ba5e3fbe9e1a33f23025be020f"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
+"checksum exitfailure 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuzzy-matcher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2db8c952765d7250f5fa509db7f6510ceef4be8672affc9bdbeffa2695923f67"
 "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
 "checksum libdbus-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "69382cb3be797cfe62ba89ac5e594a0e3022914ff44867ffbcfc03daa24eebd7"
@@ -787,12 +1377,17 @@ dependencies = [
 "checksum libpulse-sys 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "67df96705dc149577155690c05e067334d1d8a62bcac1a1611ef28eaaeb76354"
 "checksum line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+"checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf"
+"checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599"
+"checksum nix 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "319fffb13b63c0f4ff5a4e1c97566e7e741561ff5d03bf8bbf11653454bbd70b"
 "checksum nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b"
 "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 "checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nom 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff"
 "checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718"
 "checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc"
 "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
@@ -800,49 +1395,94 @@ dependencies = [
 "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
 "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
+"checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
 "checksum os_pipe 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce1d819d394515aae0530eae02156fedfc98b4f0359bf3048a442be89a95157b"
+"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
+"checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
+"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
 "checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c"
 "checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
 "checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
 "checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d"
+"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
 "checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af"
+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 "checksum rcalc_lib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2497fc2d7578e75282922918d96de8d4790714312900d95b6d5f577168f2656e"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rusttype 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "654103d61a05074b268a107cf6581ce120f0fc0115f2610ed9dfea363bb81139"
 "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
 "checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
 "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
 "checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
 "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
 "checksum smithay-client-toolkit 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "93960e8975909fcb14cc755de93af2149d8b8f4eb368315537d40cfd0f324054"
+"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba"
+"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
+"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 "checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
+"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum timerfd 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9a7822e546fa39d0b5ae14a93a33903975b62af6597288aea77f0580a6abbe"
+"checksum tree_magic 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8ed063ec7b632ba8173200d7e818db4ba01564b6c085c1a7d1041b93b55b0e02"
 "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2"
+"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum wayland-client 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a2656a57440ba1db12d4e5f0dce5423eed97bbf91bd321f456f41cde6da6c01e"
 "checksum wayland-client 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)" = "80d909ba6616dd772686f421e111f039402a13acecf395bcb4fc665277a504e0"
+"checksum wayland-commons 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)" = "27b4965c07ee4b63b845e6aef4aa9066668a9ed00ce345afddcc991508ec8025"
 "checksum wayland-commons 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c30463b995db5f8451e921134934319bec89c2458b0bc5c81967060252aa41d8"
+"checksum wayland-protocols 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)" = "56bfad6aef97b909703605ea1321079a00914aa2eb98912641c54bfa9e3b0570"
 "checksum wayland-protocols 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cca5f12d466bb6d060673d9d3f94c4ec72161b44d8123f1ef9d11d1054afd6e7"
+"checksum wayland-scanner 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ada374074230633e2b27c045c6706be02408e1abf76e0e810e0f65cccae43c6e"
 "checksum wayland-scanner 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)" = "842bc498050e1e70ab3b4a09e2532e9039e371b4d2d19345bc1e8e38998fce62"
 "checksum wayland-sys 0.23.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b7676aeac62796e1624d1f615c9073ddf8cdd951cbcb7b0bb555e4cdc1818114"
+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
+"checksum wl-clipboard-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ee99a623aa48d68ff4a3a051544309ef3cb9b9e6c3f5769afc63e4cf4250b16"
 "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
 "checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
 "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"

Cargo.toml

@@ -21,19 +21,20 @@ pulseaudio-widget = ["libpulse-binding"]
 smithay-client-toolkit = "0.6.4"
 byteorder = "1.3"
 rusttype = "0.7"
+failure = "0.1.5"
 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"] }
+wl-clipboard-rs = { version = "0.3" }
 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"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }

src/config.rs

@@ -58,10 +58,6 @@ pub enum Widget {
         font_size: f32,
         length: u32,
     },
-    NetworkManager {
-        font_size: f32,
-        length: u32,
-    }
 }
 
 impl Widget {
@@ -95,7 +91,7 @@ impl Widget {
                     .map(|x| x.unwrap())
                     .collect(),
             )),
-            Widget::Clock { font_size } => Some(widgets::clock::Clock::new(font_size)),
+            Widget::Clock { font_size } => Some(widgets::clock::Clock::new(font_size, tx.clone())),
             Widget::Date { font_size } => Some(widgets::date::Date::new(font_size)),
             Widget::Calendar {
                 font_size,
@@ -145,12 +141,6 @@ impl Widget {
                     Err(_) => None,
                 }
             }
-            Widget::NetworkManager { font_size, length } => {
-                match widgets::networkmanager::NetworkManager::new(font_size, length, tx.clone()) {
-                    Ok(w) => Some(w),
-                    Err(_) => None,
-                }
-            }
         }
     }
 }

src/main.rs

@@ -5,10 +5,8 @@ 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;
@@ -26,7 +24,6 @@ use app::{App, OutputMode};
 use cmd::Cmd;
 use config::Config;
 use configfmt::ConfigFmt;
-use widget::WaitContext;
 
 enum Mode {
     Start,
@@ -189,20 +186,50 @@ fn main() {
             tx_pipe.write_all(&[0x1]).unwrap();
         });
 
-    let mut timer = TimerFd::new().unwrap();
+    let ipc_queue = app.cmd_queue();
-    let ev_fd = PollFd::new(app.event_queue().get_connection_fd(), PollFlags::POLLIN);
+    let _ = std::thread::Builder::new()
-    let rx_fd = PollFd::new(rx_pipe.as_raw_fd(), PollFlags::POLLIN);
+        .name("ipc_server".to_string())
-    let tm_fd = PollFd::new(timer.as_raw_fd(), PollFlags::POLLIN);
+        .spawn(move || loop {
-    let ipc_fd = PollFd::new(listener.as_raw_fd(), PollFlags::POLLIN);
+            for stream in listener.incoming() {
+                match stream {
+                    Ok(stream) => {
+                        let client_queue = ipc_queue.clone();
+                        let mut client_pipe = ipc_pipe.try_clone().unwrap();
+                        let _ = std::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,
+                                    }
+                                    client_pipe.write_all(&[0x1]).unwrap();
+                                }
+                            });
+                    }
+                    Err(_) => break,
+                }
+            }
+        });
+
+    let mut fds = [
+        PollFd::new(app.event_queue().get_connection_fd(), PollFlags::POLLIN),
+        PollFd::new(rx_pipe.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();
@@ -260,35 +287,9 @@ fn main() {
             None => {
                 app.flush_display();
 
-                wait_ctx.fds.clear();
+                poll(&mut fds, -1).unwrap();
-                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 fds[0].revents().unwrap().contains(PollFlags::POLLIN) {
-
-                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 {
@@ -305,56 +306,10 @@ fn main() {
                         .expect("Failed to dispatch all messages.");
                 }
 
-                if wait_ctx.fds[1]
+                if fds[1].revents().unwrap().contains(PollFlags::POLLIN) {
-                    .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)
-                {
-                    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 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,
-                                    }
-                                    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);
-                }
             }
         }
     }

src/widget.rs

@@ -1,7 +1,6 @@
 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> {
@@ -30,25 +29,7 @@ impl DrawReport {
     }
 }
 
-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);
@@ -81,11 +62,6 @@ impl VerticalLayout {
 }
 
 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();
@@ -192,11 +168,6 @@ impl HorizontalLayout {
 }
 
 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();
@@ -309,9 +280,6 @@ impl Margin {
 }
 
 impl Widget for Margin {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.child.wait(ctx)
-    }
     fn enter(&mut self) {
         self.child.enter()
     }
@@ -386,9 +354,6 @@ impl Fixed {
 }
 
 impl Widget for Fixed {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.child.wait(ctx)
-    }
     fn enter(&mut self) {
         self.child.enter()
     }

src/widgets/audio/alsa_sound.rs

@@ -1,5 +1,4 @@
 use crate::color::Color;
-use crate::widget::WaitContext;
 use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
 
 use alsa::mixer::{Mixer, Selem, SelemChannelId, SelemId};
@@ -84,7 +83,6 @@ impl Alsa {
 }
 
 impl BarWidgetImpl for Alsa {
-    fn wait(&mut self, _: &mut WaitContext) {}
     fn name(&self) -> &str {
         "volume"
     }

src/widgets/audio/pulse_sound.rs

@@ -1,6 +1,5 @@
 use crate::cmd::Cmd;
 use crate::color::Color;
-use crate::widget::WaitContext;
 use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
 
 use std::cell::RefCell;
@@ -503,7 +502,6 @@ impl PulseAudio {
 }
 
 impl BarWidgetImpl for PulseAudio {
-    fn wait(&mut self, _: &mut WaitContext) {}
     fn name(&self) -> &str {
         "volume"
     }

src/widgets/backlight.rs

@@ -1,5 +1,4 @@
 use crate::color::Color;
-use crate::widget::WaitContext;
 use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
 
 use std::fs::OpenOptions;
@@ -94,7 +93,6 @@ impl Backlight {
 }
 
 impl BarWidgetImpl for Backlight {
-    fn wait(&mut self, _: &mut WaitContext) {}
     fn name(&self) -> &str {
         "backlight"
     }

src/widgets/bar_widget.rs

@@ -1,11 +1,10 @@
 use crate::color::Color;
 use crate::draw::{draw_bar, draw_box, Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, Widget};
 
 use std::sync::{Arc, Mutex};
 
 pub trait BarWidgetImpl {
-    fn wait(&mut self, ctx: &mut WaitContext);
     fn name(&self) -> &str;
     fn value(&self) -> f32;
     fn color(&self) -> Color;
@@ -34,9 +33,9 @@ impl BarWidget {
         Box::new(BarWidget {
             bar_impl: w,
             dirty: Arc::new(Mutex::new(true)),
-            font,
+            font: font,
             font_size: font_size as u32,
-            length,
+            length: length,
         })
     }
 
@@ -53,23 +52,21 @@ impl BarWidget {
 
         Ok(Box::new(BarWidget {
             bar_impl: im,
-            dirty,
+            dirty: dirty,
-            font,
+            font: font,
             font_size: font_size as u32,
-            length,
+            length: length,
         }))
     }
 }
 
 impl Widget for BarWidget {
-    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.bar_impl.wait(ctx);
-    }
     fn enter(&mut self) {}
     fn leave(&mut self) {}
     fn size(&self) -> (u32, u32) {
         (self.length, self.font_size)
     }
+
     fn draw(
         &mut self,
         ctx: &mut DrawContext,

src/widgets/battery.rs

@@ -1,12 +1,10 @@
 use crate::cmd::Cmd;
 use crate::color::Color;
-use crate::widget::WaitContext;
 use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
 
 use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
-
+use std::thread;
-use nix::poll::{PollFd, PollFlags};
 
 use dbus;
 
@@ -30,34 +28,21 @@ fn get_upower_property(
     .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>,
+    inner: Arc<Mutex<UpowerBatteryInner>>,
-    dirty: Arc<Mutex<bool>>,
+}
+
+pub struct UpowerBatteryInner {
     state: UpowerBatteryState,
     capacity: f64,
-    con: DbusConnection,
-    watch: dbus::Watch,
 }
 
 enum UpowerBatteryState {
@@ -70,29 +55,12 @@ enum UpowerBatteryState {
 }
 
 impl UpowerBattery {
-    pub fn from_device(
+    pub fn from_device(device: &str) -> Result<Self, ::std::io::Error> {
-        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);
-
+        let con = dbus::Connection::get_private(dbus::BusType::System).map_err(|_| {
-        let rule = format!(
+            ::std::io::Error::new(::std::io::ErrorKind::Other, "could not get dbus connection")
-            "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,
@@ -143,22 +111,12 @@ impl UpowerBattery {
             }
         };
 
-        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),
+            inner: Arc::new(Mutex::new(UpowerBatteryInner {
-            dirty,
+                capacity: capacity,
-            sender,
+                state: state,
-            capacity: capacity,
+            })),
-            state: state,
-            watch: fds[0],
         })
     }
 
@@ -168,57 +126,76 @@ impl UpowerBattery {
         sender: Sender<Cmd>,
     ) -> Result<Box<BarWidget>, ::std::io::Error> {
         BarWidget::new(font_size, length, move |dirty| {
-            let d = UpowerBattery::from_device(dirty, sender, "BAT0")?;
+            let d = UpowerBattery::from_device("BAT0")?;
+            let path = d.device_path.clone();
+            let inner = d.inner.clone();
+            let _ = thread::Builder::new()
+                .name("battery_monitor".to_string())
+                .spawn(move || {
+                    let con = dbus::Connection::get_private(dbus::BusType::System)
+                        .expect("Failed to establish D-Bus connection.");
+                    let rule = format!(
+                        "type='signal',\
+                         path='{}',\
+                         interface='org.freedesktop.DBus.Properties',\
+                         member='PropertiesChanged'",
+                        path
+                    );
+
+                    // First we're going to get an (irrelevant) NameAcquired event.
+                    con.incoming(10_000).next();
+
+                    con.add_match(&rule)
+                        .expect("Failed to add D-Bus match rule.");
+
+                    loop {
+                        if con.incoming(10_000).next().is_some() {
+                            let capacity = get_upower_property(&con, &path, "Percentage")
+                                .unwrap()
+                                .get1::<dbus::arg::Variant<f64>>()
+                                .unwrap()
+                                .0;
+                            let state = match get_upower_property(&con, &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,
+                            };
+                            let mut inner = inner.lock().unwrap();
+                            inner.state = state;
+                            inner.capacity = capacity;
+                            *dirty.lock().unwrap() = true;
+                            sender.send(Cmd::Draw).unwrap();
+                        }
+                    }
+                });
+
             Ok(Box::new(d))
         })
     }
 }
 
 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();
-        }
-
-        ctx.fds
-            .push(PollFd::new(self.watch.fd(), PollFlags::POLLIN));
-    }
     fn name(&self) -> &str {
         "battery"
     }
     fn value(&self) -> f32 {
-        (self.capacity as f32) / 100.0
+        let inner = self.inner.lock().unwrap();
+        (inner.capacity as f32) / 100.0
     }
     fn color(&self) -> Color {
-        match self.state {
+        let inner = self.inner.lock().unwrap();
+        match inner.state {
             UpowerBatteryState::Discharging | UpowerBatteryState::Unknown => {
-                if self.capacity > 10.0 {
+                if inner.capacity > 10.0 {
                     Color::new(1.0, 1.0, 1.0, 1.0)
                 } else {
                     Color::new(1.0, 0.5, 0.0, 1.0)

src/widgets/calendar.rs

@@ -1,7 +1,7 @@
 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 crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, Widget};
 
 use chrono::{Date, Datelike, Local};
 
@@ -177,7 +177,6 @@ impl Calendar {
 }
 
 impl Widget for Calendar {
-    fn wait(&mut self, _: &mut WaitContext) {}
     fn enter(&mut self) {}
     fn leave(&mut self) {}
 

src/widgets/clock.rs

@@ -1,6 +1,9 @@
+use crate::cmd::Cmd;
 use crate::color::Color;
 use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, Widget};
+
+use std::sync::mpsc::Sender;
 
 use chrono::{DateTime, Datelike, Duration, Local, Timelike};
 
@@ -11,7 +14,23 @@ pub struct Clock {
 }
 
 impl Clock {
-    pub fn new(size: f32) -> Box<Clock> {
+    pub fn new(size: f32, ch: Sender<Cmd>) -> Box<Clock> {
+        let _ = std::thread::Builder::new()
+            .name("clock_ticker".to_string())
+            .spawn(move || loop {
+                let n = Local::now();
+                let target = (n + Duration::seconds(60))
+                    .with_second(0)
+                    .unwrap()
+                    .with_nanosecond(0)
+                    .unwrap();
+
+                let d = target - n;
+
+                std::thread::sleep(d.to_std().unwrap());
+                ch.send(Cmd::Draw).unwrap();
+            });
+
         let mut clock_cache = Font::new(&ROBOTO_REGULAR, size);
         clock_cache.add_str_to_cache("0123456789:");
 
@@ -26,14 +45,6 @@ impl Clock {
 }
 
 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) {

src/widgets/date.rs

@@ -1,6 +1,6 @@
 use crate::color::Color;
 use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, Widget};
 
 use chrono::{DateTime, Datelike, Local};
 
@@ -27,7 +27,6 @@ impl Date {
 }
 
 impl Widget for Date {
-    fn wait(&mut self, _: &mut WaitContext) {}
     fn enter(&mut self) {}
     fn leave(&mut self) {}
     fn size(&self) -> (u32, u32) {

src/widgets/launcher.rs

@@ -3,7 +3,7 @@ use crate::cmd::Cmd;
 use crate::color::Color;
 use crate::desktop::{load_desktop_files, Desktop};
 use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
+use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, Widget};
 
 use std::cell::RefCell;
 use std::cmp::Ordering;
@@ -178,21 +178,13 @@ fn calc(s: &str) -> Result<String, String> {
 }
 
 fn wlcopy(s: &str) -> Result<(), String> {
-    let mut child = std::process::Command::new("wl-copy")
+    use wl_clipboard_rs::copy::{MimeType, Options, Source};
-        .stdin(std::process::Stdio::null())
+    use failure::Fail;
-        .stdout(std::process::Stdio::null())
+    let opts = Options::new();
-        .stderr(std::process::Stdio::null())
+    opts.copy(Source::Bytes(s.as_bytes()), MimeType::Text).map_err(|e|e.name().unwrap_or("unknown error").to_string())
-        .arg(s)
-        .spawn()
-        .map_err(|_| "wl-copy not available".to_string())?;
-    child
-        .wait()
-        .map_err(|_| "unable to run wl-copy".to_string())?;
-    Ok(())
 }
 
 impl Widget for Launcher {
-    fn wait(&mut self, _: &mut WaitContext) {}
     fn enter(&mut self) {}
     fn leave(&mut self) {
         self.input = "".to_string();

src/widgets/mod.rs

@@ -5,7 +5,6 @@ pub mod calendar;
 pub mod clock;
 pub mod date;
 pub mod launcher;
-pub mod networkmanager;
 
 #[cfg(any(feature = "alsa-widget", feature = "pulseaudio-widget"))]
 pub mod audio;

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)) {}
-}