From f436e6b455ea18975a8d4ffa866410a7b4264f8c Mon Sep 17 00:00:00 2001 From: buffet Date: Thu, 14 Feb 2019 14:52:26 +0100 Subject: [PATCH] Removed old kiwmi --- .gitignore | 2 - .gitmodules | 3 - Cargo.lock | 809 ------------------------------------------ Cargo.toml | 12 - src/input/keyboard.rs | 64 ---- src/input/manager.rs | 62 ---- src/input/mod.rs | 8 - src/input/pointer.rs | 74 ---- src/main.rs | 93 ----- src/output/manager.rs | 41 --- src/output/mod.rs | 6 - src/output/output.rs | 61 ---- src/shells/mod.rs | 1 - src/shells/xdg_v6.rs | 61 ---- wlroots-rs | 1 - 15 files changed, 1298 deletions(-) delete mode 100644 .gitignore delete mode 100644 .gitmodules delete mode 100644 Cargo.lock delete mode 100644 Cargo.toml delete mode 100644 src/input/keyboard.rs delete mode 100644 src/input/manager.rs delete mode 100644 src/input/mod.rs delete mode 100644 src/input/pointer.rs delete mode 100644 src/main.rs delete mode 100644 src/output/manager.rs delete mode 100644 src/output/mod.rs delete mode 100644 src/output/output.rs delete mode 100644 src/shells/mod.rs delete mode 100644 src/shells/xdg_v6.rs delete mode 160000 wlroots-rs diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 53eaa21..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -**/*.rs.bk diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 888dde7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "wlroots-rs"] - path = wlroots-rs - url = https://github.com/swaywm/wlroots-rs diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index d2b5b5f..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,809 +0,0 @@ -[[package]] -name = "aho-corasick" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.1.2 (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.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "aster" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "atty" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bindgen" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cexpr 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "clang-sys 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "which 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bitflags" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "calloop" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cc" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cexpr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cfg-if" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "clang-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "clap" -version = "2.32.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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.5 (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 = "dlib" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "downcast-rs" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "env_logger" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "glob" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "iovec" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (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 = "kiwmi" -version = "0.1.0" -dependencies = [ - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wlroots 0.2.4", -] - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "lazy_static" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "lazycell" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "libc" -version = "0.2.47" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "libloading" -version = "0.4.3" -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)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "libloading" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "log" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "memchr" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "memchr" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "meson" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "mio" -version = "0.6.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mio-extras" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "miow" -version = "0.2.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)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "net2" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "nix" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (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.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "nom" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "pkg-config" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "proc-macro2" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quasi" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quasi_codegen" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quote" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "redox_syscall" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "redox_termios" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "slab" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "strsim" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "syn" -version = "0.15.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (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 = "syntex" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syntex_errors" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syntex_pos" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syntex_syntax" -version = "0.58.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "term" -version = "0.4.6" -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)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "termion" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "textwrap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-width 0.1.5 (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.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ucd-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-width" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "utf8-ranges" -version = "1.0.2" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "vsprintf" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-commons" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-scanner" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-server" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "calloop 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "downcast-rs 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-commons 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-sys" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "which" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "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" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "wlroots" -version = "0.2.4" -dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "vsprintf 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wlroots-dehandle 1.0.0", - "wlroots-sys 0.2.1", - "xkbcommon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wlroots-dehandle" -version = "1.0.0" -dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wlroots-sys" -version = "0.2.1" -dependencies = [ - "bindgen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "meson 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-commons 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-server 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -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 = "xkbcommon" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xml-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0" -"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -"checksum bindgen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33024f55a754d920637461adf87fb485702a69bdf7ac1d307b7e18da93bae505" -"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" -"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" -"checksum calloop 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4d5c2f21cbb322bacc9a32a815116c345057d47be11bf33f8038854b256ec01f" -"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" -"checksum cexpr 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42aac45e9567d97474a834efdee3081b3c942b2205be932092f53354ce503d6c" -"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" -"checksum clang-sys 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "611ec2e3a7623afd8a8c0d027887b6b55759d894abbf5fe11b9dc11b50d5b49a" -"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" -"checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a" -"checksum downcast-rs 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "18df8ce4470c189d18aa926022da57544f31e154631eb4cfe796aea97051fe6c" -"checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" -"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" -"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.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" -"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476" -"checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" -"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" -"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" -"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" -"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9" -"checksum meson 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de6e688268407ad0a7c589bf2d7313db6c2079dae5c96df0f2d5903bc6343a91" -"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" -"checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" -"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" -"checksum nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "921f61dc817b379d0834e45d5ec45beaacfae97082090a49c2cf30dcbc30206f" -"checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" -"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" -"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d" -"checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3" -"checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4" -"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" -"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2" -"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" -"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" -"checksum syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f5e3aaa79319573d19938ea38d068056b826db9883a5d47f86c1cecc688f0e" -"checksum syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "867cc5c2d7140ae7eaad2ae9e8bf39cb18a67ca651b7834f88d46ca98faadb9c" -"checksum syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13ad4762fe52abc9f4008e85c4fb1b1fe3aa91ccb99ff4826a439c7c598e1047" -"checksum syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e0e4dbae163dd98989464c23dd503161b338790640e11537686f2ef0f25c791" -"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" -"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" -"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" -"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" -"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 vsprintf 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e3972a36b5053b7dbf84a3cd9328fbf7ec29a8367c4f3c3664884c611b4c0fa" -"checksum wayland-commons 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d985937818df10af90fe61bf8fc520fc6179539d972378b78be773694bb9f432" -"checksum wayland-scanner 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)" = "1c8b867a824057b856790776e7cee37daf0435fc06543f2d96b2e37d15322e99" -"checksum wayland-server 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)" = "b244c1545fd7888847628659171b3cff0c3422881b72f7aec0ce5a18c977fd09" -"checksum wayland-sys 0.21.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6807f24ccb5b1a76a854fbd18160ae11cea64717b2f643d10810e5ef7fba2f59" -"checksum which 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e84a603e7e0b1ce1aa1ee2b109c7be00155ce52df5081590d1ffb93f4f515cb2" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" -"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-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -"checksum xkbcommon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ac975d685d902d49d5ae9b52dbd217b2accb40ae17ee6e62beec95fafe8c856" -"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index 7bee079..0000000 --- a/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "kiwmi" -version = "0.1.0" -authors = ["buffet "] -edition = "2018" - -[dependencies] -log = "0.4" - -[dependencies.wlroots] -path = "wlroots-rs" -features = ["static", "unstable"] diff --git a/src/input/keyboard.rs b/src/input/keyboard.rs deleted file mode 100644 index 4803727..0000000 --- a/src/input/keyboard.rs +++ /dev/null @@ -1,64 +0,0 @@ -use crate::CompositorState; - -use log::debug; - -use wlroots::{ - compositor, - input::{self, keyboard}, - wlroots_dehandle, - xkbcommon::xkb::{keysym_get_name, keysyms}, - WLR_KEY_PRESSED, -}; - -use std::{process::Command, thread}; - -pub struct Keyboard; - -impl input::keyboard::Handler for Keyboard { - #[wlroots_dehandle(compositor, seat, keyboard)] - fn on_key( - &mut self, - compositor_handle: compositor::Handle, - keyboard_handle: keyboard::Handle, - key_event: &keyboard::event::Key, - ) { - use compositor_handle as compositor; - - if key_event.key_state() == WLR_KEY_PRESSED { - for key in key_event.pressed_keys() { - debug!("Key down: {}", keysym_get_name(key)); - - match key { - keysyms::KEY_Escape => compositor::terminate(), - keysyms::KEY_F1 => { - thread::spawn(move || { - Command::new("weston-terminal").output().unwrap(); - }); - } - keysyms::KEY_XF86Switch_VT_1..=keysyms::KEY_XF86Switch_VT_12 => { - let backend = compositor.backend_mut(); - if let Some(mut session) = backend.get_session() { - session.change_vt(key - keysyms::KEY_XF86Switch_VT_1 + 1); - } - } - _ => {} - } - } - } else { - for key in key_event.pressed_keys() { - debug!("Key up: {}", keysym_get_name(key)); - } - } - - let state: &mut CompositorState = compositor.downcast(); - let seat_handle = state.seat_handle.clone().unwrap(); - use seat_handle as seat; - use keyboard_handle as keyboard; - seat.keyboard_send_modifiers(&mut keyboard.get_modifier_masks()); - seat.keyboard_notify_key( - key_event.time_msec(), - key_event.keycode(), - key_event.key_state() as u32, - ); - } -} diff --git a/src/input/manager.rs b/src/input/manager.rs deleted file mode 100644 index fe397cc..0000000 --- a/src/input/manager.rs +++ /dev/null @@ -1,62 +0,0 @@ -use crate::{ - input::{Keyboard, Pointer}, - CompositorState, -}; - -use log::debug; - -use wlroots::{ - compositor, - input::{self, keyboard, pointer}, - wlroots_dehandle, -}; - -pub fn build() -> input::manager::Builder { - input::manager::Builder::default() - .keyboard_added(keyboard_added) - .pointer_added(pointer_added) -} - -#[wlroots_dehandle(compositor, keyboard, seat)] -fn keyboard_added( - compositor_handle: compositor::Handle, - keyboard_handle: keyboard::Handle, -) -> Option> { - { - debug!("Keyboard added"); - - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.data.downcast_mut().unwrap(); - - { - let seat_handle = state.seat_handle.as_ref().unwrap(); - use keyboard_handle as keyboard; - use seat_handle as seat; - seat.set_keyboard(keyboard.input_device()); - } - - state.keyboards.push(keyboard_handle); - } - - Some(Box::new(Keyboard)) -} - -#[wlroots_dehandle(compositor, pointer, cursor)] -fn pointer_added( - compositor_handle: compositor::Handle, - pointer_handle: pointer::Handle, -) -> Option> { - { - debug!("Pointer added"); - - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.downcast(); - - let cursor_handle = &state.cursor_handle; - use cursor_handle as cursor; - use pointer_handle as pointer; - cursor.attach_input_device(pointer.input_device()); - } - - Some(Box::new(Pointer)) -} diff --git a/src/input/mod.rs b/src/input/mod.rs deleted file mode 100644 index 37cd2ca..0000000 --- a/src/input/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -mod keyboard; -mod manager; -mod pointer; - -pub use self::manager::*; - -use self::keyboard::*; -use self::pointer::*; diff --git a/src/input/pointer.rs b/src/input/pointer.rs deleted file mode 100644 index a5b48a1..0000000 --- a/src/input/pointer.rs +++ /dev/null @@ -1,74 +0,0 @@ -use crate::CompositorState; - -use wlroots::{compositor, input::pointer, wlroots_dehandle, shell::xdg_shell_v6}; - -pub struct Pointer; - -impl pointer::Handler for Pointer { - #[wlroots_dehandle(compositor, cursor)] - fn on_motion_absolute( - &mut self, - compositor_handle: compositor::Handle, - _pointer_handle: pointer::Handle, - absolute_motion_event: &pointer::event::AbsoluteMotion, - ) { - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.downcast(); - let (x, y) = absolute_motion_event.pos(); - - let cursor_handle = &state.cursor_handle; - use cursor_handle as cursor; - cursor.warp_absolute(absolute_motion_event.device(), x, y); - } - - #[wlroots_dehandle(compositor, cursor)] - fn on_motion( - &mut self, - compositor_handle: compositor::Handle, - _pointer_handle: pointer::Handle, - motion_event: &pointer::event::Motion, - ) { - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.downcast(); - let (dx, dy) = motion_event.delta(); - - let cursor_handle = &state.cursor_handle; - use cursor_handle as cursor; - cursor.move_to(None, dx, dy); - } - - #[wlroots_dehandle(compositor, shell, keyboard, seat, surface)] - fn on_button( - &mut self, - compositor_handle: compositor::Handle, - _pointer_handle: pointer::Handle, - _: &pointer::event::Button, - ) { - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.downcast(); - - let shell_handle = &state.shells[0]; - let seat_handle = state.seat_handle.clone().unwrap(); - let keyboard_handle = &state.keyboards[0]; - - use shell_handle as shell; - match shell.state() { - Some(&mut xdg_shell_v6::ShellState::TopLevel(ref mut toplevel)) => { - toplevel.set_activated(true); - } - _ => {} - }; - - let surface_handle = shell.surface(); - use keyboard_handle as keyboard; - use seat_handle as seat; - use surface_handle as surface; - - seat.set_keyboard(keyboard.input_device()); - seat.keyboard_notify_enter( - surface, - &mut keyboard.keycodes(), - &mut keyboard.get_modifier_masks(), - ); - } -} diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index daa2c00..0000000 --- a/src/main.rs +++ /dev/null @@ -1,93 +0,0 @@ -mod input; -mod output; -mod shells; - -use log::{info, warn, LevelFilter}; - -use wlroots::{ - compositor, - cursor::{self, xcursor, Cursor}, - input::keyboard, - output::layout, - seat::{self, Seat}, - shell::xdg_shell_v6, - utils::log::Logger, -}; - -struct ExCursor; -impl cursor::Handler for ExCursor {} - -struct ExOutputLayout; -impl layout::Handler for ExOutputLayout {} - -struct CompositorState { - xcursor_manager: xcursor::Manager, - cursor_handle: cursor::Handle, - layout_handle: layout::Handle, - keyboards: Vec, - shells: Vec, - seat_handle: Option, -} - -impl CompositorState { - pub fn new() -> Self { - let mut xcursor_manager = xcursor::Manager::create(String::from("default"), 24) - .expect("Could not create xcursor manager"); - - if xcursor_manager.load(1.0) { - warn!("Cursor did not load"); - } - - let cursor_handle = Cursor::create(Box::new(ExCursor)); - cursor_handle - .run(|c| xcursor_manager.set_cursor_image(String::from("left_ptr"), c)) - .unwrap(); - - let layout_handle = layout::Layout::create(Box::new(ExOutputLayout)); - - CompositorState { - xcursor_manager: xcursor_manager, - cursor_handle: cursor_handle, - layout_handle: layout_handle, - keyboards: vec![], - shells: vec![], - seat_handle: None, - } - } -} - -fn main() { - Logger::init(LevelFilter::Debug, None); - info!("Logger initialized"); - - build_compositor().run(); -} - -struct SeatHandler; -impl seat::Handler for SeatHandler {} - -fn build_compositor() -> compositor::Compositor { - let mut compositor = compositor::Builder::new() - .gles2(true) - .wl_shm(true) - .data_device(true) - .input_manager(input::build()) - .output_manager(output::build()) - .xdg_shell_v6_manager(shells::xdg_v6::build()) - .build_auto(CompositorState::new()); - - let seat_handle = Seat::create( - &mut compositor, - String::from("seat0"), - Box::new(SeatHandler), - ); - - seat_handle - .run(|seat| seat.set_capabilities(seat::Capability::all())) - .unwrap(); - - let state: &mut CompositorState = compositor.downcast(); - state.seat_handle = Some(seat_handle); - - compositor -} diff --git a/src/output/manager.rs b/src/output/manager.rs deleted file mode 100644 index 2770771..0000000 --- a/src/output/manager.rs +++ /dev/null @@ -1,41 +0,0 @@ -use crate::{output::Output, CompositorState}; - -use log::debug; -use wlroots::{compositor, output, wlroots_dehandle}; - -pub fn build() -> output::manager::Builder { - output::manager::Builder::default().output_added(output_added) -} - -#[wlroots_dehandle(compositor, layout, cursor, output)] -fn output_added<'output>( - compositor_handle: compositor::Handle, - output_builder: output::Builder<'output>, -) -> Option> { - debug!("Output added"); - - let result = output_builder.build_best_mode(Output); - - { - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.data.downcast_mut().unwrap(); - - let xcursor_manager = &mut state.xcursor_manager; - let layout_handle = &state.layout_handle; - let cursor_handle = &state.cursor_handle; - let output_handle = &result.output; - - use cursor_handle as cursor; - use layout_handle as layout; - use output_handle as output; - - layout.add_auto(output); - cursor.attach_output_layout(layout); - xcursor_manager.load(output.scale()); - xcursor_manager.set_cursor_image("left_ptr".to_string(), cursor); - let (x, y) = cursor.coords(); - cursor.warp(None, x, y); - } - - Some(result) -} diff --git a/src/output/mod.rs b/src/output/mod.rs deleted file mode 100644 index 5cb79fa..0000000 --- a/src/output/mod.rs +++ /dev/null @@ -1,6 +0,0 @@ -mod manager; -mod output; - -pub use self::manager::*; - -use self::output::*; diff --git a/src/output/output.rs b/src/output/output.rs deleted file mode 100644 index 637bd3d..0000000 --- a/src/output/output.rs +++ /dev/null @@ -1,61 +0,0 @@ -use crate::CompositorState; - -use wlroots::{ - area::{Area, Origin, Size}, - compositor, output, - render::{matrix, Renderer}, - utils::current_time, - wlroots_dehandle, -}; - -pub struct Output; - -impl output::Handler for Output { - #[wlroots_dehandle(compositor, output)] - fn on_frame(&mut self, compositor_handle: compositor::Handle, output_handle: output::Handle) { - use compositor_handle as compositor; - use output_handle as output; - let state: &mut CompositorState = compositor.data.downcast_mut().unwrap(); - let renderer = compositor - .renderer - .as_mut() - .expect("Compositor was not loaded with a renderer"); - let mut render_context = renderer.render(output, None); - render_context.clear([0.45, 0.25, 0.25, 1.0]); - render_shells(state, &mut render_context) - } -} - -#[wlroots_dehandle(shell, surface, layout)] -fn render_shells(state: &mut CompositorState, renderer: &mut Renderer) { - let layout_handle = &state.layout_handle; - for shell_handle in &state.shells { - use shell_handle as shell; - let surface_handle = shell.surface(); - use layout_handle as layout; - use surface_handle as surface; - let (width, height) = surface.current_state().size(); - let (render_width, render_height) = ( - width * renderer.output.scale() as i32, - height * renderer.output.scale() as i32, - ); - let (lx, ly) = (0.0, 0.0); - let render_box = Area::new( - Origin::new(lx as i32, ly as i32), - Size::new(render_width, render_height), - ); - if layout.intersects(renderer.output, render_box) { - let transform = renderer.output.get_transform().invert(); - let matrix = matrix::project_box( - render_box, - transform, - 0.0, - renderer.output.transform_matrix(), - ); - if let Some(texture) = surface.texture().as_ref() { - renderer.render_texture_with_matrix(texture, matrix); - } - surface.send_frame_done(current_time()); - } - } -} diff --git a/src/shells/mod.rs b/src/shells/mod.rs deleted file mode 100644 index 2f49118..0000000 --- a/src/shells/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod xdg_v6; diff --git a/src/shells/xdg_v6.rs b/src/shells/xdg_v6.rs deleted file mode 100644 index 6a04eb9..0000000 --- a/src/shells/xdg_v6.rs +++ /dev/null @@ -1,61 +0,0 @@ -use crate::CompositorState; - -use log::debug; - -use wlroots::{compositor, shell::xdg_shell_v6, surface, utils::Handleable, wlroots_dehandle}; - -pub fn build() -> xdg_shell_v6::manager::Builder { - xdg_shell_v6::manager::Builder::default().surface_added(surface_added) -} - -struct XdgShellV6Handler; - -impl xdg_shell_v6::Handler for XdgShellV6Handler { - #[wlroots_dehandle(compositor)] - fn destroyed( - &mut self, - compositor_handle: compositor::Handle, - shell_handle: xdg_shell_v6::Handle, - ) { - use compositor_handle as compositor; - let state: &mut CompositorState = compositor.downcast(); - let weak = shell_handle; - - if let Some(index) = state.shells.iter().position(|s| *s == weak) { - state.shells.remove(index); - } - } -} - -struct Surface; - -impl surface::Handler for Surface { - fn on_commit(&mut self, _: compositor::Handle, surface_handle: surface::Handle) { - debug!("Commiting for surface {:?}", surface_handle); - } -} - -#[wlroots_dehandle(compositor, shell, layout, output)] -fn surface_added( - compositor_handle: compositor::Handle, - shell_handle: xdg_shell_v6::Handle, -) -> ( - Option>, - Option>, -) { - { - use compositor_handle as compositor; - use shell_handle as shell; - shell.ping(); - let state: &mut CompositorState = compositor.downcast(); - state.shells.push(shell.weak_reference()); - let layout_handle = &state.layout_handle; - use layout_handle as layout; - for (output_handle, _) in layout.outputs() { - use output_handle as output; - output.schedule_frame() - } - } - - (Some(Box::new(XdgShellV6Handler)), Some(Box::new(Surface))) -} diff --git a/wlroots-rs b/wlroots-rs deleted file mode 160000 index efae7ee..0000000 --- a/wlroots-rs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit efae7ee8f4fb32f553ccd2a5ab05b399efecfa14