diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 878ca595..719b0dbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,10 @@ test: - build_meson script: - apt-get -y build-dep . + - apt-get -y install clang-tidy - ninja -C _build test + - cd _build + - clang-tidy --checks=-clang-diagnostic-missing-braces,readability-braces-around-statements, --warnings-as-errors=readability-braces-around-statements -extra-arg=-Wno-unknown-warning-option ../src/*.c ../eek/*.c ../eekboard/*.c check_release: <<: *tags diff --git a/Cargo.lock b/Cargo.lock index 65916991..346ebe6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,483 +4,481 @@ name = "atk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a" dependencies = [ - "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "atk-sys", + "bitflags", + "glib", + "glib-sys", + "gobject-sys", + "libc", ] [[package]] name = "atk-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", ] [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "cairo-rs" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cairo-sys-rs", + "glib", + "glib-sys", + "gobject-sys", + "libc", ] [[package]] name = "cairo-sys-rs" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys", + "libc", + "pkg-config", ] [[package]] name = "cc" -version = "1.0.54" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ - "bitflags 1.2.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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "textwrap", + "unicode-width", ] [[package]] name = "dtoa" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" [[package]] name = "fragile" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9" [[package]] name = "gdk" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cairo-rs", + "cairo-sys-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "libc", + "pango", ] [[package]] name = "gdk-pixbuf" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc" dependencies = [ - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "libc", ] [[package]] name = "gdk-pixbuf-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" dependencies = [ - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", ] [[package]] name = "gdk-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" dependencies = [ - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", ] [[package]] name = "gio" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "fragile", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "lazy_static", + "libc", ] [[package]] name = "gio-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", ] [[package]] name = "glib" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "glib-sys", + "gobject-sys", + "lazy_static", + "libc", ] [[package]] name = "glib-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" dependencies = [ - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "pkg-config", ] [[package]] name = "gobject-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys", + "libc", + "pkg-config", ] [[package]] name = "gtk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60" dependencies = [ - "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "atk", + "bitflags", + "cairo-rs", + "cairo-sys-rs", + "cc", + "gdk", + "gdk-pixbuf", + "gdk-pixbuf-sys", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk-sys", + "lazy_static", + "libc", + "pango", + "pango-sys", ] [[package]] name = "gtk-sys" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" dependencies = [ - "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", ] [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.71" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" [[package]] name = "linked-hash-map" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "maplit" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "memmap" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" dependencies = [ - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "winapi", ] [[package]] name = "pango" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "glib", + "glib-sys", + "gobject-sys", + "lazy_static", + "libc", + "pango-sys", ] [[package]] name = "pango-sys" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", ] [[package]] name = "pkg-config" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "proc-macro2" -version = "1.0.18" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] [[package]] name = "quote" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" dependencies = [ - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] [[package]] name = "regex" version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ - "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" [[package]] name = "rs" version = "0.1.0" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)", - "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cairo-rs", + "cairo-sys-rs", + "clap", + "gdk", + "gio", + "glib", + "glib-sys", + "gtk", + "gtk-sys", + "maplit", + "regex", + "serde", + "serde_yaml", + "xkbcommon", ] [[package]] name = "serde" -version = "1.0.111" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ - "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.111" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_yaml" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "971be8f6e4d4a47163b405a3df70d14359186f9ab0f3a3ec37df144ca1ce089f" dependencies = [ - "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)", - "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "dtoa", + "linked-hash-map", + "serde", + "yaml-rust", ] [[package]] name = "syn" -version = "1.0.31" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" dependencies = [ - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "unicode-width" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" 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)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "xkbcommon" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce" dependencies = [ - "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", - "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "memmap", ] [[package]] name = "yaml-rust" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ - "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "linked-hash-map", ] - -[metadata] -"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a" -"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c" -"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" -"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" -"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" -"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9" -"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5" -"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc" -"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" -"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" -"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3" -"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" -"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b" -"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" -"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" -"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60" -"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" -"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" -"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 pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786" -"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" -"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" -"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" -"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" -"checksum serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" -"checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"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 xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce" -"checksum yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" diff --git a/Cargo.toml.in b/Cargo.toml.in index 887bca26..6ec4c047 100644 --- a/Cargo.toml.in +++ b/Cargo.toml.in @@ -19,6 +19,7 @@ path = "@path@/examples/test_layout.rs" [features] gio_v0_5 = [] gtk_v0_5 = [] +rustc_less_1_36 = [] # Dependencies which don't change based on build flags [dependencies.cairo-sys-rs] diff --git a/README.md b/README.md index 2beb667c..8ccb13ba 100644 --- a/README.md +++ b/README.md @@ -30,29 +30,42 @@ Building ### Dependencies -See `.gitlab-ci.yml`. +See `.gitlab-ci.yml` or run `apt-get build-dep .` ### Build from git repo -``` +```bash $ git clone https://source.puri.sm/Librem5/squeekboard.git $ cd squeekboard -$ mkdir ../build -$ meson ../build/ -$ cd ../build -$ ninja test -$ ninja install +$ mkdir _build +$ meson _build/ +$ cd _build +$ ninja ``` +To run tests use `ninja test`. To install squeekboard run `ninja install`. + Running ------- -``` +```bash $ phoc # if no compatible Wayland compositor is running yet $ cd ../build/ $ src/squeekboard ``` +Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run: + +```bash +$ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true +``` + +To make the keyboard show you can use either an application that does so automatically, like a text editor or `python3 ./tests/entry.py`, or you can manually trigger it with: + +```bash +busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true +``` + Developing ---------- diff --git a/cargo_build.py b/cargo_build.py new file mode 100644 index 00000000..d78ceb9e --- /dev/null +++ b/cargo_build.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 + +"""This script manages Cargo builds +while keeping the artifact directory within the build tree +instead of the source tree. +""" + +from pathlib import Path +import shlex +import subprocess +import sys + +source_dir = Path(__file__).absolute().parent + +args = sys.argv[1:] +binary_dir = "debug" + +if '--release' in args: + binary_dir = "release" + +# The file produced by Cargo will have a special name +try: + i = args.index('--rename') +except ValueError: + filename = None +else: + args.pop(i) + filename = args.pop(i) + +# The target destination of the produced file is a positional argument +out_path = [arg for arg in args if not arg.startswith('--')] +if out_path: + out_path = out_path[0] + i = args.index(out_path) + args.pop(i) + +subprocess.run(['sh', "{}/cargo.sh".format(shlex.quote(source_dir.as_posix())), 'build'] + + args, + check=True) + +if out_path: + out_path = Path(out_path).absolute() + out_basename = out_path.name + filename = filename or out_basename + subprocess.run(['cp', '-a', + './{}/{}'.format(shlex.quote(binary_dir), shlex.quote(filename)), + out_path], + check=True) + diff --git a/cargo_build.sh b/cargo_build.sh deleted file mode 100755 index 840bc1c6..00000000 --- a/cargo_build.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# This script manages Cargo builds -# while keeping the artifact directory within the build tree -# instead of the source tree - -set -e - -SCRIPT_PATH="$(realpath "$0")" -SOURCE_DIR="$(dirname "$SCRIPT_PATH")" - -RELEASE="" -BINARY_DIR="debug" -if [ "${1}" = "--release" ]; then - shift - BINARY_DIR="release" - RELEASE="--release" -fi - -if [ "${1}" = "--rename" ]; then - shift - FILENAME="${1}" - shift -fi -OUT_PATH="$(realpath "${1}")" -shift -OUT_BASENAME="$(basename "${OUT_PATH}")" -FILENAME="${FILENAME:-"${OUT_BASENAME}"}" - -sh "$SOURCE_DIR"/cargo.sh build $RELEASE "$@" - -if [ -n "${OUT_PATH}" ]; then - cp -a ./"${BINARY_DIR}"/"${FILENAME}" "${OUT_PATH}" -fi diff --git a/data/keyboards/be.yaml b/data/keyboards/be.yaml new file mode 100644 index 00000000..ab43116f --- /dev/null +++ b/data/keyboards/be.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 59, height: 52 } + spaceline: { width: 140, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "a z e r t y u i o p" + - "q s d f g h j k l m" + - "Shift_L w x c v b n . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "A Z E R T Y U I O P" + - "Q S D F G H J K L M" + - "Shift_L W X C V B N , BackSpace" + - "show_numbers preferences space show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/be_wide.yaml b/data/keyboards/be_wide.yaml new file mode 100644 index 00000000..f8858954 --- /dev/null +++ b/data/keyboards/be_wide.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 100, height: 42 } + spaceline: { width: 205, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "a z e r t y u i o p" + - "q s d f g h j k l m" + - "Shift_L w x c v b n . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "A Z E R T Y U I O P" + - "Q S D F G H J K L M" + - "Shift_L W X C V B N , BackSpace" + - "show_numbers preferences space show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/bg.yaml b/data/keyboards/bg.yaml new file mode 100644 index 00000000..93e14987 --- /dev/null +++ b/data/keyboards/bg.yaml @@ -0,0 +1,78 @@ +--- +outlines: + default: { width: 32.72, height: 52 } + altline: { width: 47, height: 52 } + wide: { width: 49.09, height: 52 } + spaceline: { width: 185, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "я в е р т ъ у и о п ю" + - "а с д ф г х й к л ш щ" + - "Shift_L з ь ц ж б н м ч BackSpace" + - "show_numbers preferences space . Return" + upper: + - "Я В Е Р Т Ъ У И О П Ю" + - "А С Д Ф Г Х Й К Л Ш Щ" + - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace" + - "show_numbers preferences space , Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space Return" + + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/cz+qwerty.yaml b/data/keyboards/cz+qwerty.yaml new file mode 100644 index 00000000..a9040af9 --- /dev/null +++ b/data/keyboards/cz+qwerty.yaml @@ -0,0 +1,106 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 52.67, height: 52 } + spaceline: { width: 106, height: 52 } + special: { width: 35.33, height: 52 } + +views: + base: + - "q w e r t y u i o p" + - "a s d f g h j k l" + - "Shift_L z x c v b n m BackSpace" + - "show_numbers preferences show_accents space , . Return" + upper: + - "Q W E R T Y U I O P" + - "A S D F G H J K L" + - "Shift_L Z X C V B N M BackSpace" + - "show_numbers preferences show_upper_accents space ! ? Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences show_accents space , . Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences show_accents space , . Return" + accents: + - "ä ě é ř ť ý ů í ó ö" + - "á š ď ë ŕ ú ü ô ľ" + - "accents_Shift_L ž ß č ç ñ ň ĺ BackSpace" + - "show_letters preferences show_accents space , . Return" + upper_accents: + - "Ä Ě É Ř Ť Ý Ů Í Ó Ö" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" + - "accents_Shift_L Ž ẞ Č Ç Ñ Ň Ĺ BackSpace" + - "show_letters preferences show_upper_accents space , . Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + accents_Shift_L: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_accents: + action: + locking: + lock_view: "accents" + unlock_view: "base" + outline: "special" + label: "á" + show_upper_accents: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "special" + label: "Á" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/cz+qwerty_wide.yaml b/data/keyboards/cz+qwerty_wide.yaml new file mode 100644 index 00000000..78fd042d --- /dev/null +++ b/data/keyboards/cz+qwerty_wide.yaml @@ -0,0 +1,106 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 81, height: 42 } + spaceline: { width: 162, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "q w e r t y u i o p" + - "a s d f g h j k l" + - "Shift_L z x c v b n m BackSpace" + - "show_numbers preferences show_accents space , . Return" + upper: + - "Q W E R T Y U I O P" + - "A S D F G H J K L" + - "Shift_L Z X C V B N M BackSpace" + - "show_numbers preferences show_upper_accents space ! ? Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences show_accents space , . Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences show_accents space , . Return" + accents: + - "ä ě é ř ť ý ů í ó ö" + - "á š ď ë ŕ ú ü ô ľ" + - "accents_Shift_L ž ß č ç ñ ň ĺ BackSpace" + - "show_letters preferences show_accents space , . Return" + upper_accents: + - "Ä Ě É Ř Ť Ý Ů Í Ó Ö" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" + - "accents_Shift_L Ž ẞ Č Ç Ñ Ň Ĺ BackSpace" + - "show_letters preferences show_upper_accents space , . Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + accents_Shift_L: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_accents: + action: + locking: + lock_view: "accents" + unlock_view: "base" + outline: "special" + label: "á" + show_upper_accents: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "special" + label: "Á" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/cz.yaml b/data/keyboards/cz.yaml new file mode 100644 index 00000000..889b9674 --- /dev/null +++ b/data/keyboards/cz.yaml @@ -0,0 +1,106 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 52.67, height: 52 } + spaceline: { width: 106, height: 52 } + special: { width: 35.33, height: 52 } + +views: + base: + - "q w e r t z u i o p" + - "a s d f g h j k l" + - "Shift_L y x c v b n m BackSpace" + - "show_numbers preferences show_accents space , . Return" + upper: + - "Q W E R T Z U I O P" + - "A S D F G H J K L" + - "Shift_L Y X C V B N M BackSpace" + - "show_numbers preferences show_upper_accents space ! ? Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences show_accents space , . Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences show_accents space , . Return" + accents: + - "ä ě é ř ť ž ů í ó ö" + - "á š ď ë ŕ ú ü ô ľ" + - "accents_Shift_L ý ß č ç ñ ň ĺ BackSpace" + - "show_letters preferences show_accents space , . Return" + upper_accents: + - "Ä Ě É Ř Ť Ž Ů Í Ó Ö" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" + - "accents_Shift_L Ý ẞ Č Ç Ñ Ň Ĺ BackSpace" + - "show_letters preferences show_upper_accents space , . Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + accents_Shift_L: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_accents: + action: + locking: + lock_view: "accents" + unlock_view: "base" + outline: "special" + label: "á" + show_upper_accents: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "special" + label: "Á" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/cz_wide.yaml b/data/keyboards/cz_wide.yaml new file mode 100644 index 00000000..1ea62758 --- /dev/null +++ b/data/keyboards/cz_wide.yaml @@ -0,0 +1,106 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 81, height: 42 } + spaceline: { width: 162, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "q w e r t z u i o p" + - "a s d f g h j k l" + - "Shift_L y x c v b n m BackSpace" + - "show_numbers preferences show_accents space , . Return" + upper: + - "Q W E R T Z U I O P" + - "A S D F G H J K L" + - "Shift_L Y X C V B N M BackSpace" + - "show_numbers preferences show_upper_accents space ! ? Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences show_accents space , . Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences show_accents space , . Return" + accents: + - "ä ě é ř ť ž ů í ó ö" + - "á š ď ë ŕ ú ü ô ľ" + - "accents_Shift_L ý ß č ç ñ ň ĺ BackSpace" + - "show_letters preferences show_accents space , . Return" + upper_accents: + - "Ä Ě É Ř Ť Ž Ů Í Ó Ö" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" + - "accents_Shift_L Ý ẞ Č Ç Ñ Ň Ĺ BackSpace" + - "show_letters preferences show_upper_accents space , . Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + accents_Shift_L: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_accents: + action: + locking: + lock_view: "accents" + unlock_view: "base" + outline: "special" + label: "á" + show_upper_accents: + action: + locking: + lock_view: "upper_accents" + unlock_view: "base" + outline: "special" + label: "Á" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/de.yaml b/data/keyboards/de.yaml index 06687ebf..51f9ea0a 100644 --- a/data/keyboards/de.yaml +++ b/data/keyboards/de.yaml @@ -21,7 +21,7 @@ views: numbers: - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - - "show_symbols , \" ' : = < > BackSpace" + - "show_symbols ; \" ' : = < > BackSpace" - "show_letters show_eschars preferences space , . Return" symbols: - "~ ` ´ | · √ µ ÷ × ¶" diff --git a/data/keyboards/de_wide.yaml b/data/keyboards/de_wide.yaml index dc5dec0f..b03af5f7 100644 --- a/data/keyboards/de_wide.yaml +++ b/data/keyboards/de_wide.yaml @@ -21,7 +21,7 @@ views: numbers: - "1 2 3 4 5 6 7 8 9 0" - "@ # % & - _ + ( ) ß" - - "show_symbols , \" ' : = < > BackSpace" + - "show_symbols ; \" ' : = < > BackSpace" - "show_letters preferences space , . Return" symbols: - "~ ` ´ · © ® ÷ × ¶" diff --git a/data/keyboards/epo.yaml b/data/keyboards/epo.yaml new file mode 100644 index 00000000..ef4705e1 --- /dev/null +++ b/data/keyboards/epo.yaml @@ -0,0 +1,81 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 62, height: 52 } + spaceline: { width: 99.67, height: 52 } + special: { width: 35.33, height: 52 } + +views: + base: + - "q w e r t y u i o p" + - "a s d f g h j k l" + - "Shift_L z x c v b n m BackSpace" + - "show_numbers show_eschars preferences space , . Return" + upper: + - "Q W E R T Y U I O P" + - "A S D F G H J K L" + - "Shift_L Z X C V B N M BackSpace" + - "show_numbers show_eschars preferences space ! ? Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' : ; ! ? BackSpace" + - "show_letters preferences space . Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space . Return" + eschars: + - "ĉ ĝ ĥ ĵ ŝ ŭ ?" + - "Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ !" + - "show_numbers ' - 🐊 💚 🌐 . BackSpace" + - "show_letters show_eschars preferences space „ “ Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: "erase" + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "altline" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "ŭŜ" + space: + outline: "spaceline" + label: " " + text: " " + Return: + outline: "altline" + icon: "key-enter" + keysym: "Return" diff --git a/data/keyboards/fr_wide.yaml b/data/keyboards/fr_wide.yaml new file mode 100644 index 00000000..f8858954 --- /dev/null +++ b/data/keyboards/fr_wide.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 100, height: 42 } + spaceline: { width: 205, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "a z e r t y u i o p" + - "q s d f g h j k l m" + - "Shift_L w x c v b n . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "A Z E R T Y U I O P" + - "Q S D F G H J K L M" + - "Shift_L W X C V B N , BackSpace" + - "show_numbers preferences space show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/ir.yaml b/data/keyboards/ir.yaml new file mode 100644 index 00000000..310e0789 --- /dev/null +++ b/data/keyboards/ir.yaml @@ -0,0 +1,78 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 62, height: 52 } + spaceline: { width: 142, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "ض ص ق ف غ ع ه خ ح ج" + - "ش س ی ب ل ا ت ن م ک" + - "Shift_L ظ ط ز ر ذ د و BackSpace" + - "show_numbers preferences space period Return" + upper: + - "پ { } [ ] ّ َ ِ ُ چ" + - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ" + - "Shift_L ك ٓ ژ ء > < ؟ BackSpace" + - "show_numbers preferences space period Return" + numbers: + - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰" + - "@ # ﷼ % & - _ + ( )" + - "show_symbols , \" ' colon ؛ ! ? BackSpace" + - "show_letters preferences space period Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space period Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "ABC" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + period: + outline: "special" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/ir_wide.yaml b/data/keyboards/ir_wide.yaml new file mode 100644 index 00000000..e9df0532 --- /dev/null +++ b/data/keyboards/ir_wide.yaml @@ -0,0 +1,78 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 108, height: 42 } + spaceline: { width: 216, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "ض ص ق ف غ ع ه خ ح ج" + - "ش س ی ب ل ا ت ن م ک" + - "Shift_L ظ ط ز ر ذ د و BackSpace" + - "show_numbers preferences space period Return" + upper: + - "پ { } [ ] ّ َ ِ ُ چ" + - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ" + - "Shift_L ك ٓ ژ ء > < ؟ BackSpace" + - "show_numbers preferences space period Return" + numbers: + - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰" + - "@ # ﷼ % & - _ + ( )" + - "show_symbols , \" ' colon ؛ ! ? BackSpace" + - "show_letters preferences space period Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space period Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: "erase" + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "ABC" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + ".": + outline: "special" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/it+fur.yaml b/data/keyboards/it+fur.yaml new file mode 100644 index 00000000..1f81234d --- /dev/null +++ b/data/keyboards/it+fur.yaml @@ -0,0 +1,92 @@ +# Friulian layout created by Fabio Tomat +# 14 october 2020 +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 62, height: 52 } + spaceline: { width: 99.67, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "q w e r t y u i o p" + - "a s d f g h j k l" + - "Shift_L z x c v b n m BackSpace" + - "show_numbers show_eschars preferences space , . Return" + upper: + - "Q W E R T Y U I O P" + - "A S D F G H J K L" + - "Shift_L Z X C V B N M BackSpace" + - "show_numbers show_eschars preferences space “ ” Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! = BackSpace" + - "show_letters show_eschars preferences space ? . Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers \\ / < > = [ ] BackSpace" + - "show_letters show_eschars preferences space ? . Return" + eschars: + - "â ê î ô û Â Ê Î Ô Û" + - "à è ì ò ù À È Ì Ò Ù" + - "show_numbers ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ BackSpace" + - "show_letters show_eschars preferences space ᶠ . Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: "erase" + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "altline" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "àê" + space: + outline: "spaceline" + label: " " + text: " " + Return: + outline: "altline" + icon: "key-enter" + keysym: "Return" + colon: + label: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/no.yaml b/data/keyboards/no.yaml index 44de74cc..0248356b 100644 --- a/data/keyboards/no.yaml +++ b/data/keyboards/no.yaml @@ -2,9 +2,9 @@ outlines: default: { width: 32, height: 52 } altline: { width: 48.39024, height: 52 } - wide: { width: 62, height: 52 } - outline7: { width: 88.97561, height: 52 } - spaceline: { width: 150.5853, height: 52 } + wide: { width: 64, height: 52 } + spaceline: { width: 142, height: 52 } + special: { width: 44, height: 52 } views: base: @@ -25,7 +25,7 @@ views: symbols: - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph" - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }" - - "show_numbers \\ / < > = [ ] BackSpace" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" - "show_letters preferences space . Return" buttons: @@ -42,17 +42,22 @@ buttons: action: erase preferences: action: "show_prefs" - outline: "altline" + outline: "special" icon: "keyboard-mode-symbolic" show_numbers: action: set_view: "numbers" - outline: "altline" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: altline label: "123" show_letters: action: set_view: "base" - outline: "altline" + outline: "wide" label: "ABC" show_symbols: action: @@ -60,7 +65,7 @@ buttons: outline: "altline" label: "*/=" ".": - outline: altline + outline: "special" space: outline: spaceline text: " " diff --git a/data/keyboards/terminal_wide.yaml b/data/keyboards/terminal_wide.yaml new file mode 100644 index 00000000..fab1abe0 --- /dev/null +++ b/data/keyboards/terminal_wide.yaml @@ -0,0 +1,211 @@ +--- +outlines: + default: { width: 54, height: 37 } + action: { width: 90, height: 37 } + altline: { width: 81, height: 37 } + wide: { width: 90, height: 37 } + spaceline: { width: 225, height: 37 } + special: { width: 54, height: 37 } + small: { width: 67.4, height: 22 } + +views: + base: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "q w e r t y u i o p" + - "a s d f g h j k l" + - "Shift_L z x c v b n m BackSpace" + - "show_numbers preferences space show_actions Return" + upper: + - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End" + - "Q W E R T Y U I O P" + - "A S D F G H J K L" + - "Shift_L Z X C V B N M BackSpace" + - "show_numbers preferences space show_actions Return" + numbers: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "1 2 3 4 5 6 7 8 9 0" + - "* # $ / & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space period Return" + symbols: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° @ { }" + - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" + - "show_letters preferences space period Return" + actions: + - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End" + - "F1 F2 F3 F4 F5 F6" + - "F7 F8 F9 F10 F11 F12" + - "Esc Tab Pause Insert Up Del" + - "show_letters Menu Break Left Down Right" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "ABC" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "τ=\\" + show_actions: + action: + set_view: "actions" + outline: "altline" + label: ">_" + period: + outline: "altline" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + F1: + outline: "action" + keysym: "F1" + F2: + outline: "action" + keysym: "F2" + F3: + outline: "action" + keysym: "F3" + F4: + outline: "action" + keysym: "F4" + F5: + outline: "action" + keysym: "F5" + F6: + outline: "action" + keysym: "F6" + F7: + outline: "action" + keysym: "F7" + F8: + outline: "action" + keysym: "F8" + F9: + outline: "action" + keysym: "F9" + F10: + outline: "action" + keysym: "F10" + F11: + outline: "action" + keysym: "F11" + F12: + outline: "action" + keysym: "F12" + Esc: + outline: "action" + keysym: "Escape" + EscSmall: + outline: "small" + keysym: "Escape" + label: "Esc" + Tab: + outline: "action" + keysym: "Tab" + TabSmall: + outline: "small" + keysym: "Tab" + label: "Tab" + Del: + outline: "action" + keysym: "Delete" + Insert: + outline: "action" + keysym: "Insert" + Menu: + outline: "action" + keysym: "Menu" + Pause: + outline: "action" + keysym: "Pause" + Menu: + outline: "action" + keysym: "Menu" + Break: + outline: "action" + keysym: "Break" + Home: + outline: "small" + keysym: "Home" + End: + outline: "small" + keysym: "End" + PgUp: + outline: "small" + keysym: "Page_Up" + PgDn: + outline: "small" + keysym: "Page_Down" + "↑": + outline: "small" + keysym: "Up" + "↓": + outline: "small" + keysym: "Down" + "←": + outline: "small" + keysym: "Left" + "→": + outline: "small" + keysym: "Right" + Up: + label: "↑" + outline: "action" + keysym: "Up" + Left: + label: "←" + outline: "action" + keysym: "Left" + Down: + label: "↓" + outline: "action" + keysym: "Down" + Right: + label: "→" + outline: "action" + keysym: "Right" + Ctrl: + modifier: "Control" + outline: "small" + label: "Ctrl" + Alt: + modifier: "Alt" + outline: "small" + label: "Alt" diff --git a/data/keyboards/th.yaml b/data/keyboards/th.yaml new file mode 100644 index 00000000..161fe273 --- /dev/null +++ b/data/keyboards/th.yaml @@ -0,0 +1,80 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 62, height: 52 } + spaceline: { width: 142, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "ๅ / _ ภ ถ ุ ึ ค ต จ ข ช" + - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล" + - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ" + - "Shift_L ผ ป แ อ ิ ื ท ม ใ ฝ BackSpace" + - "show_numbers preferences space period Return" + upper: + - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙" + - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ," + - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ" + - "Shift_L ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ BackSpace" + - "show_numbers preferences space period Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space period Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space period Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "กขค" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + period: + outline: "special" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/keyboards/us+colemak.yaml b/data/keyboards/us+colemak.yaml new file mode 100644 index 00000000..59d71d96 --- /dev/null +++ b/data/keyboards/us+colemak.yaml @@ -0,0 +1,78 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 62, height: 52 } + spaceline: { width: 142, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "q w f p g j l u y" + - "a r s t d h n e i o" + - "Shift_L z x c v b k m BackSpace" + - "show_numbers preferences space period Return" + upper: + - "Q W F P G J L U Y" + - "A R S T D H N E I O" + - "Shift_L Z X C V B K M BackSpace" + - "show_numbers preferences space period Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # $ % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space period Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ € ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space period Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: show_prefs + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "ABC" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + period: + outline: "special" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" diff --git a/data/langs/bg-BG.txt b/data/langs/bg-BG.txt new file mode 100644 index 00000000..ce59b534 --- /dev/null +++ b/data/langs/bg-BG.txt @@ -0,0 +1,13 @@ +bg Български +de Немски +es Испански +emoji Емоджи +fi Френски +gr Гръцки +it Италянски +no Норевежки +pl Полски +ru Руски +se Шведски +terminal Терминал +us Английски (САЩ) diff --git a/data/langs/cs-CZ.txt b/data/langs/cs-CZ.txt new file mode 100644 index 00000000..6c87837e --- /dev/null +++ b/data/langs/cs-CZ.txt @@ -0,0 +1,21 @@ +be Belgická +cz Česká +cz+qwerty Česká (QWERTY) +de Německá +dk Dánská +emoji Emoji +es Španělská +fi Finská +fr Francouzská +gr Řecká +it Italská +jp Japonská +jp+kana Japonská (Kana) +no Norská +pl Polská +ru Ruská +se Švédská +terminal Terminál +th Thajská +ua Ukrajinská +us Anglická (USA) diff --git a/data/langs/fa-IR.txt b/data/langs/fa-IR.txt new file mode 100644 index 00000000..17a65aec --- /dev/null +++ b/data/langs/fa-IR.txt @@ -0,0 +1,2 @@ +emoji ایموجی +terminal ترمینال diff --git a/data/langs/fur-IT.txt b/data/langs/fur-IT.txt new file mode 100644 index 00000000..05b78268 --- /dev/null +++ b/data/langs/fur-IT.txt @@ -0,0 +1,18 @@ +be Belgjic +br Brasilian +de Todesc +dk Danês +es Spagnûl +fi Finlandês +fr Francês +it+fur Furlan +gr Grêc +it Talian +jp+kana Gjaponês (Kana) +no Norvegjês +pl Polac +ru Rus +se Svedês +terminal Terminâl +ua Ucrain +us American (USA) diff --git a/debian/changelog b/debian/changelog index fd50767b..ab3933ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,355 +1,80 @@ -squeekboard (1.9.3.0pureos0.1) byzantium; urgency=medium - - * Upload to byzantium - - -- Guido Günther Tue, 22 Sep 2020 12:42:41 +0200 - -squeekboard (1.9.3) amber-phone; urgency=medium - - [ Björn Tantau ] - * Show more useful keys at the same time. - * Add Ctrl and Alt modifier keys. - * Add missing Ê key. - * Make f-keys slightly wider. - * Add Menu key. - - [ Guido Günther ] - * d/rules: Only remove Cargo.lock if it exists - * eek: Drop libcanberra usage - * debian: Build-depend on libfeedback - * eek-gtk-keyboard: Trigger event feedback on button press (Closes: #166) +squeekboard (1.12.0pureos0) byzantium; urgency=medium [ Dorota Czaplejewicz ] - * build: Add missing gio-unix dependency - * build: Make compatible with Debian Bullseye - * debian: Add amber to legacy distro list - * ci: Add amber job - * debian: Require lsb-release - * size: Hardcode size to work around screen rotation - * ci: Re-add x64 Buster build - * italian: Fix space and period + * debian: New Byzantium release - [ Sebastian Krzyszkowiak ] - * Revert "Merge branch 'btantau-master-patch-76686' into 'master'" - * Terminal layout: another approach + -- Dorota Czaplejewicz Thu, 28 Jan 2021 14:36:20 +0000 - [ Luís Fernando Stürmer da Rosa ] - * Brazilian Portuguese Keyboard Layout. +squeekboard (1.12.0-1) unstable; urgency=medium - -- Sebastian Krzyszkowiak Wed, 05 Aug 2020 16:16:08 +0200 - -squeekboard (1.9.2) amber-phone; urgency=medium + [ Henry-Nicolas Tourneur ] + * d/rules: fix an FTBFS on mips64el with GOT > 64kb + * d/rules: export RUSTFLAGS only on architecture that needs it [ Dorota Czaplejewicz ] - * keyboard: Remove unused code - * gsettings: Don't crash when unavailable - * dbus: Don't crash if can't make a connection - * gsettings: Don't crash on switching when unavailable - * layout: Split out choice to a struct on its own - * renderer: Simplify by dropping gobjectness - * levelkeyboard: Rearrange to make future conversion easier - * layout: Minor generalizations - * Remove unused code - * sizing: Create a standalone UI shape manager - * sizing: Ignore scaling factor for layout selection - * CI: Fix typo - * Update rust deps for release - - [ Andreas Rönnquist ] - * Swedish keyboard, wide button switching between numbers, symbols and base - * More fixes of button sizes - * Folder is doc, not docs - - [ uzanto ] - * Add new file - * Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing + * debian: Build reproducibly [ Arnaud Ferraris ] - * keyboards: fr: fix keyboard layout - * keyboards: fr: make sure the layout fits the screen - * resources: include French keyboard layout - * keyboards: fr: improve consistency with other layouts - * keyboards: fr: improve diacritics layout - * tests: add french layout + * New upstream version 1.12.0 - [ Vlad ] - * Fresh Russian layout + -- Arnaud Ferraris Tue, 26 Jan 2021 18:19:42 +0100 - [ Jordi Masip ] - * Removed unused dependency 'libcroco' +squeekboard (1.11.1-1) unstable; urgency=medium - [ Florian Klink ] - * sm.puri.Squeekboard.desktop: make path to Exec= absolute + * New upstream version 1.11.1 - [ Ole Guldberg ] - * Danish keyboard layout - * Danish keyboard layout - * add test for danish layout + -- Arnaud Ferraris Tue, 24 Nov 2020 11:52:41 +0100 - -- Dorota Czaplejewicz Mon, 01 Jun 2020 09:39:12 +0000 +squeekboard (1.11.0-1) unstable; urgency=medium -squeekboard (1.9.1) amber-phone; urgency=medium + * New upstream release 1.11.0 - [ Dorota Czaplejewicz ] - * layout: Improve press handling - * settings: Handle empty settings - * Variant: Use proper pointer conversion between C and Rust - * meta: Add doap file - * modifiers: Support Control and Alt - * CI: Test that any bump to changelog has a corresponding tag - * docs: Add the guiding principle - * hacking: Move into docs/ + -- Arnaud Ferraris Mon, 16 Nov 2020 11:17:23 +0100 - [ &t ] - * Fix minor comment typos +squeekboard (1.10.0-2) unstable; urgency=medium - [ Dorota Czaplejewicz ] - * cargo: Bump package versions before release + * Team upload. + * d/rules: set RUSTFLAGS to avoid an FTBFS on mips64el (Closes: #974036) - -- Dorota Czaplejewicz Sun, 08 Mar 2020 10:04:29 +0000 + -- Henry-Nicolas Tourneur Tue, 10 Nov 2020 18:40:50 +0000 -squeekboard (1.9.0) amber-phone; urgency=medium +squeekboard (1.10.0-1) unstable; urgency=medium - [ Dorota Czaplejewicz ] - * imservice: Add commit_string method - * submission: Handle submitting strings - * input_method: Use for erasing - * logging: Use in merged functions - * translations: Remove redundant ones - * translations: Translate builtin layouts - * greek: Rename to gr which is used by gnome settings + * New upstream release 1.10.0 + * d/control: build-depend on libfeedbackd-dev and set team maintainership + * d/control: fix dependency name + * d/copyright: add missing entries + * d/copyright: add entries for new keyboard files and remove duplicate + `src/meson.build` appeared in 2 different paragraphs, remove the + duplicate entry. + * d/gbp.conf: fix debian version number - [ Sebastian Krzyszkowiak ] - * layouts: Add Polish layouts + -- Arnaud Ferraris Fri, 23 Oct 2020 13:18:43 +0200 - [ Dorota Czaplejewicz ] - * locks: Draw based on current view - * locking: Lock keys statelessly - * layouts: Better accented uppercase in PL - * emoji: Add more choices - * row: Eliminate angle - * layout: Center views relative to each other and the layout bounds - * drawing: Generalized foreach_visible_button - * variant: Fix double-free - * variant: Fix leak - * keyboard_layout: Fix leak - * layout: Improve scoping of locked variable - * terminal: Make */ easier to reach +squeekboard (1.9.3-1) experimental; urgency=medium - [ Sebastian Krzyszkowiak ] - * layouts: terminal: Use altline outline for dot key + * Upload to experimental + * Update upstream source from tag 'v1.9.3' + Update to upstream version '1.9.3' + with Debian dir 7a3f8b82779759ba288b75755ba54500250b0ff4 + * d/control: Use librust-xkbcommon-dev + This one avoids the empty feature package. + * Ship sm.puri.OSK0.desktop. + This is needed to fulfill phosh's session dependencies + * Conflict with phosh-osk-stub. + They're not useful at the same time and we'll drop phosh-osk-stub from + Debian once squeekboard is in. + * Drop pathes no longer required due to upstream changes + - 0001-Cargo.toml-update-to-Debian-dependencies-versions.patch + - 0002-popover.rs-fix-build-with-gtk-rs-0.7.0.patch + * d/gbp.conf: Don't use patch numbers. + Ordering is defined via the series file and patch numbers just + cause manual work. - [ Dorota Czaplejewicz ] - * text input: Disable erasing - * cargo: Update deps + -- Guido Günther Sat, 26 Sep 2020 13:01:18 +0200 - -- Dorota Czaplejewicz Wed, 19 Feb 2020 14:32:39 +0000 +squeekboard (1.9.2-1) UNRELEASED; urgency=medium -squeekboard (1.8.1) amber-phone; urgency=medium + * Initial Debian release (Closes: #956960) - [ Dorota Czaplejewicz ] - * action: Rename Level to View - * keyboard: Introduce a KeyCode type wrapping u32 - * layout: Centralize handling key releases - * layout: Make handling presses uniform - * UI: Drop indirection for show/hide functions - * managers: Move visible flag to UI manager - * dbus_service: Remove unused function - * dbus: Remove unneeded gobjectness - * dbus: Rename handler from eekboard_service - * context: Moved keymap setting together with its generation - * key-emitter: Remove unused - * eekboard_context_service: Drop unused enable property - * services: Split out layout management from EekboardContextService - * submission: Move away from virtual-keyboard - * submission: Create a new wrapper over imservice - * imservice: Limited scope of unsafe - * EekGtkKeyboard: Use a direct reference to EekboardContext - * submission: Take over virtual_keyboard handling - * keyboard: Cleanups of unused code - * levelkeyboard: Drop unused manager references - * keyboard: Gather up keymap handling, drop layout - * submission: Remove wildcard reexport - * imservice: Rename commit_state to done to match protocol - * ci: Clean up `..` before it's searched for artifacts - * dbus: Log error on dbus exit - * logging: Try to improve common operations - * imservice: Return something more resembling an Error on failure - * logging: Unified to remove random eprint calls - * press_key: Use proper logging - * number: Fix keysym for Return - * build: Strip clap of optional features - * layouts: Fix segfault on switching to wide - * font: Use font from style context - * font: Only pass relevant data to label renderer - - [ Sebastian Krzyszkowiak ] - * layout: terminal: Swap positions of preferences and actions button - * layout: terminal: Show actions button on all views - * layout: terminal: Replace actions button with period on symbols view - - [ Dorota Czaplejewicz ] - * setup: Connect ui to the state manager - * debian: Add missing commas - - [ David Boddie ] - * Tidy build file and docs - * Use pip to install recommonmark - - -- Dorota Czaplejewicz Fri, 31 Jan 2020 09:59:12 +0000 - -squeekboard (1.8.0) amber-phone; urgency=medium - - [ Dorota Czaplejewicz ] - * translations: Use gnome-desktop's xkb info database for layout names - * translations: Make the code cleaner - * overlay: Add terminal - * eek-layout: Remove unused - * pre-release: Update deps - - -- Dorota Czaplejewicz Tue, 14 Jan 2020 13:55:00 +0000 - -squeekboard (1.7.0) amber-phone; urgency=medium - - * New terminal layout appearing on terminal input hint - - -- Dorota Czaplejewicz Wed, 08 Jan 2020 11:53:07 +0000 - -squeekboard (1.7.0) amber-phone; urgency=medium - - * New terminal layout appearing on terminal input hint - - -- Dorota Czaplejewicz Wed, 08 Jan 2020 11:53:07 +0000 - -squeekboard (1.6.0) amber-phone; urgency=medium - - [ Dorota Czaplejewicz ] - * tools: Move entry.py - * build: Move building of squeekboard-test-layout to tools - * packaging: Install entty.py as squeekboard-entry - * Remove unused build dependencies - * Remove unused header generator - * logging: Move all facilities to one file - * logging: Described the design - * logging: Add described log levels - * popover: Install emoji layout - * popover: Show overlays as selected - * Fix old Rust woes - * emoji: Add a passable layout - * Fix g_ and stdlib allocation/free mismatches - - -- Dorota Czaplejewicz Thu, 02 Jan 2020 12:02:50 +0000 - -squeekboard (1.5.0) amber-phone; urgency=medium - - [ Dorota Czaplejewicz ] - * keycodes: Sort to eliminate runtime indeterminism - * switcher: Switch layout on menu item click - * Drop squeek_key - * renderer: Remove some unneeded vars - * renderer: Simplified outline rendering - * renderer: Drop row from button rendering - * renderer: Drop unused params - * renderer: Simplify surface rendering - * rendering: Simplify Cairo context usage, remove unneeded calls. - * rendering: Remove unneeded redraw after button release - * renderer: Remove unused locked key render function - * renderer: Simply cut off when painting outside bounds - * renderer: Render whole keyboard the same way as pressed buttons - - [ Mark Müller ] - * layout: add German wide layout - - [ Dorota Czaplejewicz ] - * renderer: Remove unused functions - * cleanup: Remove references to squeek_view - * cleanup: Unbox View and Row - * cleanup: Remove unused single frame draw - * positioning: Calculate sizes instead of storing, move position out of widgets - * positioning: Clean up unused code - * Fix old Rust woes - - [ Mark Müller ] - * layout: add Japanese Kana wide layout - - [ Dorota Czaplejewicz ] - * Entry test: Add Terminal input purpose - * readme: Add note about Cargo dependencies - * Create a library/UI module separation - * hacking: Add DCO and licensing requirement - * Fix internal .md link - - [ Mark Müller ] - * squeekboard-test-layout: add argument parsing and some more output - - [ Dorota Czaplejewicz ] - * Use clap in the lockfile - * parsing: Remove bounds which weren't used anyway - * layout: Respect margins - * CI: Build arm64 .deb - - -- Dorota Czaplejewicz Mon, 23 Dec 2019 11:58:57 +0000 - -squeekboard (1.4.0) amber-phone; urgency=medium - - * "text" property in layouts - * Adjusts to user's color scheme - - -- Dorota Czaplejewicz Mon, 02 Dec 2019 19:37:01 +0000 - -squeekboard (1.3.2) amber-phone; urgency=medium - - * Make sure all key presses get accepted by the compositor - - -- Dorota Czaplejewicz Tue, 26 Nov 2019 15:36:27 +0000 - -squeekboard (1.3.1) amber-phone; urgency=medium - - * Update and fix layouts and languages - * Make tests less likely to fail - - -- Dorota Czaplejewicz Wed, 20 Nov 2019 22:10:48 +0000 - -squeekboard (1.3.0) amber-phone; urgency=medium - - * Language selection popup - * Swedish and Finnish layouts - - -- Dorota Czaplejewicz Sat, 16 Nov 2019 15:38:14 +0000 - -squeekboard (1.2.2) amber-phone; urgency=medium - - * Landscape mode - - -- Dorota Czaplejewicz Wed, 30 Oct 2019 12:38:39 +0000 - -squeekboard (1.2.1) amber-phone; urgency=medium - - * Use different distribution - - -- Dorota Czaplejewicz Tue, 08 Oct 2019 10:56:10 +0000 - -squeekboard (1.2.0) unstable; urgency=medium - - * Use Cargo-based dependencies - - -- Dorota Czaplejewicz Tue, 24 Sep 2019 10:42:15 +0000 - -squeekboard (1.1.0) unstable; urgency=medium - - * Use new keyboard layout format - - -- Dorota Czaplejewicz Mon, 02 Sep 2019 10:12:02 +0000 - - -squeekboard (1.0.10) unstable; urgency=medium - - * Use a shared DBus definition - - -- Dorota Czaplejewicz Tue, 02 Jul 2019 20:12:02 +0000 - -squeekboard (1.0.9) unstable; urgency=medium - - * Initial release. - - -- David Boddie Tue, 25 Jun 2019 19:33:00 +0200 + -- Arnaud Ferraris Tue, 09 Jun 2020 23:29:19 +0200 diff --git a/debian/control b/debian/control index 676d5722..f57b943a 100644 --- a/debian/control +++ b/debian/control @@ -26,6 +26,7 @@ Build-Depends: librust-xkbcommon-0.4+wayland-dev (>= 0.4), libwayland-dev (>= 1.16), lsb-release, + python3, rustc, wayland-protocols (>= 1.14), Standards-Version: 4.1.3 @@ -38,6 +39,8 @@ Depends: gnome-themes-extra-data, ${shlibs:Depends}, ${misc:Depends}, +Breaks: + librem5-base (<< 24), Description: On-screen keyboard for Wayland Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone. diff --git a/debian/rules b/debian/rules index 8e5b6bd6..0238bd0d 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,27 @@ export CARGO_HOME = $(CURDIR)/debian/cargo export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# the below avoids an FTBFS on mips64el with a GOT > 64kb +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +ifeq ($(DEB_HOST_ARCH),mips64el) + export RUSTFLAGS = -Ctarget-feature=+xgot +endif + +# the below avoids an FTBFS on mips64el with a GOT > 64kb +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +ifeq ($(DEB_HOST_ARCH),mips64el) + xgot = -Ctarget-feature=+xgot +else + xgot = +endif + +# Don't use paths that may change between builds. +# No need to care about $HOME +# because Cargo will not place any source in ~/.cargo. +# The build directory is a subdirectory of the source directory, +# so it doesn't need to be explicitly taken care of. +export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot) + distrel := $(shell lsb_release --codename --short) ifneq (,$(filter $(distrel),buster amber)) diff --git a/debian/source/format b/debian/source/format index 89ae9db8..163aaf8d 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/doc/hacking.md b/doc/hacking.md index 551b701b..5abc0cce 100644 --- a/doc/hacking.md +++ b/doc/hacking.md @@ -13,16 +13,16 @@ The overarching principle of *squeekboard* is to empower users. Software is primarily meant to solve problems of its users. Often in the quest to make software better, a hard distinction is made between the developer, who becomes the creator, and the user, who takes the role of the consumer, without direct influence on the software they use. This project aims to give users the power to make the software work for them by blurring the lines between users and developers. -Nonwithstanding its current state, *squeekboard* must be structured in a way that provides users a gradual way to gain more experience and power to adjust it. It must be easy, in order of importance: +Notwithstanding its current state, *squeekboard* must be structured in a way that provides users a gradual way to gain more experience and power to adjust it. It must be easy, in order of importance: - to use the software, - to modify its resources, -- to change its behaviour, +- to change its behavior, - to contribute upstream. To give an idea of what it means in practice, those are some examples of what has been important for *squeekboard* so far: -- being quick and useable, +- being quick and usable, - allowing local overrides of resources and config, - storing resources and config as editable, standard files, - having complete, up to date documentation of interfaces, @@ -33,7 +33,7 @@ To give an idea of what it means in practice, those are some examples of what ha - having code that is [simple and obvious](https://www.python.org/dev/peps/pep-0020/), - having an easy process of testing and accepting contributions. -You may notice that they are ordered roughly from "user-focused" to "maintainer-focused". While good properties are desired, sometimes they conflict, and maintainers should give additional weight to those benefitting the user compared to those benefitting regular contributors. +You may notice that they are ordered roughly from "user-focused" to "maintainer-focused". While good properties are desired, sometimes they conflict, and maintainers should give additional weight to those benefiting the user compared to those benefiting regular contributors. Sending patches --------------- @@ -43,7 +43,7 @@ By submitting a change to this project, you agree to license it under the [GPL l Development environment ----------------------- -*Squeekboard* is regularly built and tested on [the develpment environment](https://developer.puri.sm/Librem5/Development_Environment.html). +*Squeekboard* is regularly built and tested on [the development environment](https://developer.puri.sm/Librem5/Development_Environment.html). Recent Fedora releases are likely to be tested as well. @@ -113,7 +113,7 @@ User interface modules should: Code submitted should roughly match the style of surrounding code. Things that will *not* be accepted are ones that often lead to errors: -- skipping brackets `{}` after every `if()`, `else`, and similar +- skipping brackets `{}` after every `if()`, `else`, and similar ([SCI CERT C: EXP19-C](https://wiki.sei.cmu.edu/confluence/display/c/EXP19-C.+Use+braces+for+the+body+of+an+if%2C+for%2C+or+while+statement)) Bad example: @@ -162,7 +162,7 @@ Maintenance Squeekboard uses Rust & Cargo for some of its dependencies. -Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes: +Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positional arguments: source directory, and output artifact. So, `cargo test` becomes: ``` cd build_dir @@ -179,7 +179,10 @@ Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Si ``` cd build_dir -ninja build src/Cargo.toml +ninja ./Cargo.toml sh /source_path/cargo.sh update ninja test +cp ./Cargo.lock /source_path/ ``` + +Since version 1.9.3, `Cargo.lock` is not actually used by the build system, due to `Cargo.toml` being generated at every build. diff --git a/doc/tutorial.md b/doc/tutorial.md index d97c6173..b7911a98 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -1,55 +1,92 @@ -Kareema's guide to creating layouts -=================================== +A guide to creating layouts +=========================== -It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this ](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread. +This guide is based on the original Kareema's [forum post](https://forums.puri.sm/t/translations-and-virtual-touch-keyboards-tracking-localization/7669/48). -So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections welcome. +It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread. -**Get one of the existing keyboard layouts** +So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/) -* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard ](https://source.puri.sm/Librem5/squeekboard) -* The keyboard layouts are located in the subdirectory `data/keyboard/` in the `.yaml` files +## Creating a new layout + +Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout. + +### Get one of the existing keyboard layouts + +* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard) +* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files * Take a look and try to understand them :slight_smile: -**Fork your own copy of squeekboard** + +### Creating the keyboard layout + +* To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) +* The correct name of the .yaml file can be found with the command + +``` +gsettings get org.gnome.desktop.input-sources sources +``` + +The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]` +So for example “de.yaml” would be the correct name for the German keyboard layout. + +If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard. + +### Testing the layout + +Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically. + +You can also use the `test_layout` tool from the -devel package to check it for errors: + +``` +# squeekboard_test_layout ./mylayout.yaml +Test result: OK +``` + +## Contributing your changes + +If you want to share your layout with the world, the best way is to submit it to the Squeekboard project. The workflow is similar to any other Gitlab-based project. + +Above all, your layout should be working, be tested, not break anything, and make sense. + +### Fork your own copy of squeekboard * Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork). * Clone your fork locally with `git clone` and use the uri of your forked repo there -**Workflow to edit your keyboard and get it merged** +### Edit your keyboard and get it merged -* A generic guide how the workflow to contribute works, can be found at https://developer.puri.sm/Librem5/Contact/Contributing.html +* It may be useful to check out the [generic guide how the workflow to contribute works](https://developer.puri.sm/Librem5/Contact/Contributing.html) * Create a branch: Name it “keyboard-layout-mylanguage” or whatever * Checkout your branch, edit your keyboard layout and commit your changes +* Your layout **must** be correctly named, and in `data/keyboards/`. +* Your layout **must** pass the `test_layout` tool with zero problems. +* Your translation **must** be correctly named, and in `data/langs/`. +* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it). + +### Get it merged + +It's always recommended to **compile and run** squeekboard before submitting your changes. This serves as a test that all is working. See instructions in the [compiling section](#compiling-and-running-squeekboard). + * Push the local changes (to the branch of your fork of squeekboard) * Create a merge request for the branch to get your changes merged to the official squeekboard git repository -**Compile squeekboard** +If your changes pass automated tests (CI), then the merge request will be reviewed by the maintainers, and you might be asked to change a thing or two. -* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building) +## Compiling and running Squeekboard -**Running squeekboard** +If you want your change to become part of official Squeekboard, or if you want to add a translation of your layout name, you will have to recompile Squeekboard and test your changes there. -* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running) +### Compile squeekboard + +* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building) + +### Run squeekboard + +* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running) * Additionally take a look at the contribution document for [testing info](HACKING.md#testing) -* You can either test it locally on your Linux system or use the [QEMU Librem 5 image ](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html) +* You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html) * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems: `deb [arch=amd64] http://ci.puri.sm/ scratch librem5` Squeekboard can be installed from there as a Debian package, too (that’s what I often do). But beware - there be dragons! You could bork your system with these packages and you should probably disable this repository again after installing what you need - these packages are not meant for production systems (or so I heard :wink: ) - -**Creating the keyboard layout** - -* To be written: For the time being, take a look at [Using non-latin language on Librem 5 ](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) -* The correct name of the .yaml file can be found with the command `gsettings get org.gnome.desktop.input-sources sources` - -The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]` -So f.ex. “de.yaml” would be the correct name for the German keyboard layout. -* The translations for the keyboard layout names in the different languages can be found at `data/langs/` -* Don’t forget to add your newly created layout or translation to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it) - -**Testing the layout** - -* Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard -* To test the translations in `data/langs/` , you have to compile squeekboard - diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c index 9b839b10..071d0703 100644 --- a/eek/eek-gtk-keyboard.c +++ b/eek/eek-gtk-keyboard.c @@ -104,10 +104,10 @@ eek_gtk_keyboard_real_draw (GtkWidget *self, return FALSE; } -// Units of pixel size +// Units of virtual pixels size static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) { (void)height; - if (width < 1080) { + if (width < 540) { return ARRANGEMENT_KIND_BASE; } return ARRANGEMENT_KIND_WIDE; @@ -119,22 +119,22 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget *self, { EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self)); - uint32_t scale = (uint32_t)gtk_widget_get_scale_factor(self); // check if the change would switch types enum squeek_arrangement_kind new_type = get_type( - (uint32_t)(allocation->width - allocation->x) * scale, - (uint32_t)(allocation->height - allocation->y) * scale); + (uint32_t)(allocation->width - allocation->x), + (uint32_t)(allocation->height - allocation->y)); if (priv->layout->arrangement != new_type) { priv->layout->arrangement = new_type; uint32_t time = gdk_event_get_time(NULL); eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time); } - if (priv->renderer) + if (priv->renderer) { eek_renderer_set_allocation_size (priv->renderer, priv->keyboard->layout, allocation->width, allocation->height); + } GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)-> size_allocate (self, allocation); @@ -356,10 +356,15 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self) EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self)); g_autoptr(GError) err = NULL; - if (lfb_init(SQUEEKBOARD_APP_ID, &err)) + if (lfb_init(SQUEEKBOARD_APP_ID, &err)) { priv->event = lfb_event_new ("button-pressed"); - else + } else { g_warning ("Failed to init libfeedback: %s", err->message); + } + + GtkIconTheme *theme = gtk_icon_theme_get_default (); + + gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons"); } static void diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c index 7d000480..a7e97357 100644 --- a/eek/eek-keyboard.c +++ b/eek/eek-keyboard.c @@ -31,46 +31,31 @@ #include "eek-keyboard.h" -void level_keyboard_free(LevelKeyboard *self) { - xkb_keymap_unref(self->keymap); - close(self->keymap_fd); - squeek_layout_free(self->layout); - g_free(self); -} - -LevelKeyboard* -level_keyboard_new (struct squeek_layout *layout) -{ - LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1); - - if (!keyboard) { - g_error("Failed to create a keyboard"); - } - keyboard->layout = layout; - +/// External linkage for Rust. +/// The corresponding deinit is implemented in vkeyboard::KeyMap::drop +struct keymap squeek_key_map_from_str(const char *keymap_str) { struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (!context) { g_error("No context created"); } - const gchar *keymap_str = squeek_layout_get_keymap(keyboard->layout); - struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS); - if (!keymap) + if (!keymap) { g_error("Bad keymap:\n%s", keymap_str); + } xkb_context_unref(context); - keyboard->keymap = keymap; - keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1); - keyboard->keymap_len = strlen(keymap_str) + 1; + char *xkb_keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1); + size_t keymap_len = strlen(xkb_keymap_str) + 1; g_autofree char *path = strdup("/eek_keymap-XXXXXX"); char *r = &path[strlen(path) - 6]; - if (getrandom(r, 6, GRND_NONBLOCK) < 0) + if (getrandom(r, 6, GRND_NONBLOCK) < 0) { g_error("Failed to get random numbers: %s", strerror(errno)); + } for (unsigned i = 0; i < 6; i++) { r[i] = (r[i] & 0b1111111) | 0b1000000; // A-z r[i] = r[i] > 'z' ? '?' : r[i]; // The randomizer doesn't need to be good... @@ -79,17 +64,39 @@ level_keyboard_new (struct squeek_layout *layout) if (keymap_fd < 0) { g_error("Failed to set up keymap fd"); } - keyboard->keymap_fd = keymap_fd; + shm_unlink(path); - if (ftruncate(keymap_fd, (off_t)keyboard->keymap_len)) { + if (ftruncate(keymap_fd, (off_t)keymap_len)) { g_error("Failed to increase keymap fd size"); } - char *ptr = mmap(NULL, keyboard->keymap_len, PROT_WRITE, MAP_SHARED, + char *ptr = mmap(NULL, keymap_len, PROT_WRITE, MAP_SHARED, keymap_fd, 0); if ((void*)ptr == (void*)-1) { g_error("Failed to set up mmap"); } - strncpy(ptr, keymap_str, keyboard->keymap_len); - munmap(ptr, keyboard->keymap_len); + strncpy(ptr, xkb_keymap_str, keymap_len); + munmap(ptr, keymap_len); + free(xkb_keymap_str); + xkb_keymap_unref(keymap); + struct keymap km = { + .fd = keymap_fd, + .fd_len = keymap_len, + }; + return km; +} + +void level_keyboard_free(LevelKeyboard *self) { + squeek_layout_free(self->layout); + g_free(self); +} + +LevelKeyboard* +level_keyboard_new (struct squeek_layout *layout) +{ + LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1); + if (!keyboard) { + g_error("Failed to create a keyboard"); + } + keyboard->layout = layout; return keyboard; } diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h index b1377c47..be13b0b9 100644 --- a/eek/eek-keyboard.h +++ b/eek/eek-keyboard.h @@ -1,17 +1,17 @@ -/* +/* * Copyright (C) 2010-2011 Daiki Ueno * Copyright (C) 2010-2011 Red Hat, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA @@ -32,19 +32,20 @@ G_BEGIN_DECLS +/// Keymap container for Rust interoperability. +struct keymap { + uint32_t fd; // keymap formatted as XKB string + size_t fd_len; // length of the data inside keymap_fd +}; + /// Keyboard state holder struct _LevelKeyboard { struct squeek_layout *layout; // owned - struct xkb_keymap *keymap; // owned - int keymap_fd; // keymap formatted as XKB string - size_t keymap_len; // length of the data inside keymap_fd - - guint id; // as a key to layout choices +// FIXME: This no longer needs to exist, keymap was folded into layout. }; typedef struct _LevelKeyboard LevelKeyboard; -gchar * eek_keyboard_get_keymap - (LevelKeyboard *keyboard); +gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard); LevelKeyboard* level_keyboard_new (struct squeek_layout *layout); diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index 8e62c560..143c553e 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -265,10 +265,6 @@ renderer_init (EekRenderer *self) self->allocation_height = 0.0; self->scale_factor = 1; - GtkIconTheme *theme = gtk_icon_theme_get_default (); - - gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons"); - self->css_provider = squeek_load_style(); } diff --git a/eek/layersurface.c b/eek/layersurface.c index f74b6bfa..bc2c325f 100644 --- a/eek/layersurface.c +++ b/eek/layersurface.c @@ -590,27 +590,32 @@ phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height) g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self)); priv = phosh_layer_surface_get_instance_private (self); - if (priv->height == height && priv->width == width) + if (priv->height == height && priv->width == width) { return; + } old_width = priv->width; old_height = priv->height; - if (width != -1) + if (width != -1) { priv->width = width; + } - if (height != -1) + if (height != -1) { priv->height = height; + } if (gtk_widget_get_mapped (GTK_WIDGET (self))) { zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height); } - if (priv->height != old_height) + if (priv->height != old_height) { g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT]); + } - if (priv->width != old_width) + if (priv->width != old_width) { g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH]); + } } /** @@ -632,25 +637,31 @@ phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, g old_right = priv->margin_right; old_bottom = priv->margin_bottom; - if (old_top == top && old_left == left && old_right == right && old_bottom == bottom) + if (old_top == top && old_left == left && old_right == right && old_bottom == bottom) { return; + } priv->margin_top = top; priv->margin_left = left; priv->margin_right = right; priv->margin_bottom = bottom; - if (priv->layer_surface) + if (priv->layer_surface) { zwlr_layer_surface_v1_set_margin(priv->layer_surface, top, right, bottom, left); + } - if (old_top != top) + if (old_top != top) { g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_TOP]); - if (old_bottom != bottom) + } + if (old_bottom != bottom) { g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_BOTTOM]); - if (old_left != left) + } + if (old_left != left) { g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_LEFT]); - if (old_right != right) + } + if (old_right != right) { g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_RIGHT]); + } } /** @@ -669,13 +680,15 @@ phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone) old_zone = priv->exclusive_zone; - if (old_zone == zone) + if (old_zone == zone) { return; + } priv->exclusive_zone = zone; - if (priv->layer_surface) + if (priv->layer_surface) { zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, zone); + } g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]); } @@ -693,13 +706,14 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self)); priv = phosh_layer_surface_get_instance_private (self); - if (priv->kbd_interactivity == interactivity) + if (priv->kbd_interactivity == interactivity) { return; - + } priv->kbd_interactivity = interactivity; - if (priv->layer_surface) + if (priv->layer_surface) { zwlr_layer_surface_v1_set_keyboard_interactivity (priv->layer_surface, interactivity); + } g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY]); } @@ -717,6 +731,7 @@ phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self) g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self)); priv = phosh_layer_surface_get_instance_private (self); - if (priv->wl_surface) + if (priv->wl_surface) { wl_surface_commit (priv->wl_surface); + } } diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c index a360c2b6..537be830 100644 --- a/eekboard/eekboard-context-service.c +++ b/eekboard/eekboard-context-service.c @@ -159,7 +159,7 @@ eekboard_context_service_use_layout(EekboardContextService *context, struct sque // Update the keymap if necessary. // TODO: Update submission on change event if (context->submission) { - submission_set_keyboard(context->submission, keyboard, timestamp); + submission_use_layout(context->submission, keyboard->layout, timestamp); } // Update UI @@ -345,7 +345,7 @@ void eekboard_context_service_set_submission(EekboardContextService *context, st context->submission = submission; if (context->submission) { uint32_t time = gdk_event_get_time(NULL); - submission_set_keyboard(context->submission, context->keyboard, time); + submission_use_layout(context->submission, context->keyboard->layout, time); } } diff --git a/examples/test_layout.rs b/examples/test_layout.rs index e2f0dc25..ef763345 100644 --- a/examples/test_layout.rs +++ b/examples/test_layout.rs @@ -5,6 +5,7 @@ use std::env; fn main() -> () { check_builtin_layout( - env::args().nth(1).expect("No argument given").as_str() + env::args().nth(1).expect("No argument given").as_str(), + env::args().nth(2).map(|s| s == "allow_missing_return").unwrap_or(false), ); } diff --git a/meson.build b/meson.build index d8e0e1bb..5a049fed 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'squeekboard', 'c', 'rust', - version: '1.9.3', + version: '1.12.0', license: 'GPLv3', meson_version: '>=0.51.0', default_options: [ @@ -19,14 +19,17 @@ add_project_arguments( '-Werror=missing-field-initializers', '-Werror=incompatible-pointer-types', '-Werror=int-conversion', + '-Werror=redundant-decls', + '-Werror=parentheses', '-Wformat-nonliteral', '-Wformat-security', + '-Wformat', '-Winit-self', '-Wmaybe-uninitialized', '-Wold-style-definition', '-Wredundant-decls', '-Wstrict-prototypes', - '-Wunused-function', + '-Wunused', ], language: 'c' ) @@ -38,6 +41,16 @@ conf_data = configuration_data() if get_option('buildtype').startswith('debug') add_project_arguments('-DDEBUG=1', language : 'c') endif + +if get_option('strict') + add_project_arguments( + [ + '-Werror', + ], + language: 'c' + ) +endif + if get_option('buildtype') != 'plain' add_project_arguments('-fstack-protector-strong', language: 'c') endif @@ -70,6 +83,7 @@ summary = [ message('\n'.join(summary)) # Rust deps are changing, depending on compile flags. Cargo can't handle it alone. +# As a side effect, Cargo.toml never gets used. cargo_toml_in = files('Cargo.toml.in') path_data = configuration_data() path_data.set('path', meson.source_root()) @@ -83,7 +97,7 @@ cargo_toml_base = configure_file( cargo_deps = files('Cargo.deps') if get_option('legacy') == true - cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5'] + cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5,rustc_less_1_36'] cargo_deps = files('Cargo.deps.legacy') endif @@ -97,7 +111,7 @@ cargo_toml = custom_target( dep_cargo = find_program('cargo') cargo_script = find_program('cargo.sh') -cargo_build = find_program('cargo_build.sh') +cargo_build = find_program('cargo_build.py') subdir('data') subdir('protocols') diff --git a/meson_options.txt b/meson_options.txt index 180f12f3..bb68374d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,7 @@ option('tests', option('legacy', type: 'boolean', value: false, description: 'Build with Deban Buster versions of dependencies') + +option('strict', + type: 'boolean', value: true, + description: 'Turn more warnings into errors') diff --git a/src/data.rs b/src/data.rs index 4ff7cc2d..e559c515 100644 --- a/src/data.rs +++ b/src/data.rs @@ -18,7 +18,7 @@ use xkbcommon::xkb; use ::action; use ::keyboard::{ KeyState, PressType, - generate_keymap, generate_keycodes, FormattingError + generate_keymaps, generate_keycodes, KeyCode, FormattingError }; use ::layout; use ::layout::ArrangementKind; @@ -97,6 +97,8 @@ impl fmt::Display for DataSource { } } +type LayoutSource = (ArrangementKind, DataSource); + /// Lists possible sources, with 0 as the most preferred one /// Trying order: native lang of the right kind, native base, /// fallback lang of the right kind, fallback base @@ -104,55 +106,76 @@ fn list_layout_sources( name: &str, kind: ArrangementKind, keyboards_path: Option, -) -> Vec<(ArrangementKind, DataSource)> { - let mut ret = Vec::new(); - { - fn name_with_arrangement(name: String, kind: &ArrangementKind) - -> String - { - match kind { - ArrangementKind::Base => name, - ArrangementKind::Wide => name + "_wide", - } - } - - let mut add_by_name = |name: &str, kind: &ArrangementKind| { - if let Some(path) = keyboards_path.clone() { - ret.push(( - kind.clone(), - DataSource::File( - path.join(name.to_owned()).with_extension("yaml") - ) - )) - } - +) -> Vec { + // Just a simplification of often called code. + let add_by_name = | + mut ret: Vec, + name: &str, + kind: &ArrangementKind, + | -> Vec { + if let Some(path) = keyboards_path.clone() { ret.push(( kind.clone(), - DataSource::Resource(name.into()) - )); - }; + DataSource::File( + path.join(name.to_owned()).with_extension("yaml") + ) + )) + } - match &kind { - ArrangementKind::Base => {}, + ret.push(( + kind.clone(), + DataSource::Resource(name.into()) + )); + ret + }; + + // Another grouping. + let add_by_kind = |ret, name: &str, kind| { + let ret = match kind { + &ArrangementKind::Base => ret, kind => add_by_name( - &name_with_arrangement(name.into(), &kind), - &kind, + ret, + &name_with_arrangement(name.into(), kind), + kind, ), }; - add_by_name(name, &ArrangementKind::Base); + add_by_name(ret, name, &ArrangementKind::Base) + }; - match &kind { - ArrangementKind::Base => {}, - kind => add_by_name( - &name_with_arrangement(FALLBACK_LAYOUT_NAME.into(), &kind), - &kind, - ), - }; - - add_by_name(FALLBACK_LAYOUT_NAME, &ArrangementKind::Base); + fn name_with_arrangement(name: String, kind: &ArrangementKind) -> String { + match kind { + ArrangementKind::Base => name, + ArrangementKind::Wide => name + "_wide", + } } - ret + + let ret = Vec::new(); + + // Name as given takes priority. + let ret = add_by_kind(ret, name, &kind); + + // Then try non-alternative name if applicable (`us` for `us+colemak`). + let ret = { + let mut parts = name.splitn(2, '+'); + match parts.next() { + Some(base) => { + // The name is already equal to base, so it was already added. + if base == name { ret } + else { + add_by_kind(ret, base, &kind) + } + }, + // The layout's base name starts with a "+". Weird but OK. + None => { + log_print!(logging::Level::Surprise, "Base layout name is empty: {}", name); + ret + } + } + }; + + // No other choices left, so give anything. + add_by_kind(ret, FALLBACK_LAYOUT_NAME.into(), &kind) } fn load_layout_data(source: DataSource) @@ -382,56 +405,45 @@ impl Layout { ) )}).collect(); - let keymap: HashMap = generate_keycodes( - button_actions.iter() - .filter_map(|(_name, action)| { - match action { - ::action::Action::Submit { - text: _, keys, - } => Some(keys), - _ => None, - } - }) - .flatten() - .map(|named_keysym| named_keysym.0.as_str()) + let symbolmap: HashMap = generate_keycodes( + extract_symbol_names(&button_actions) ); - let button_states = button_actions.into_iter().map(|(name, action)| { - let keycodes = match &action { - ::action::Action::Submit { text: _, keys } => { - keys.iter().map(|named_keycode| { - *keymap.get(named_keycode.0.as_str()) - .expect( - format!( - "keycode {} in key {} missing from keymap", - named_keycode.0, - name - ).as_str() - ) - }).collect() - }, - action::Action::Erase => vec![ - *keymap.get("BackSpace") - .expect(&format!("BackSpace missing from keymap")), - ], - _ => Vec::new(), - }; - ( - name.into(), - KeyState { - pressed: PressType::Released, - keycodes, - action, - } - ) - }); - let button_states = HashMap::::from_iter( - button_states + button_actions.into_iter().map(|(name, action)| { + let keycodes = match &action { + ::action::Action::Submit { text: _, keys } => { + keys.iter().map(|named_keysym| { + symbolmap.get(named_keysym.0.as_str()) + .expect( + format!( + "keysym {} in key {} missing from symbol map", + named_keysym.0, + name + ).as_str() + ) + .clone() + }).collect() + }, + action::Action::Erase => vec![ + symbolmap.get("BackSpace") + .expect(&format!("BackSpace missing from symbol map")) + .clone(), + ], + _ => Vec::new(), + }; + ( + name.into(), + KeyState { + pressed: PressType::Released, + keycodes, + action, + } + ) + }) ); - // TODO: generate from symbols - let keymap_str = match generate_keymap(&button_states) { + let keymaps = match generate_keymaps(symbolmap) { Err(e) => { return (Err(e), warning_handler) }, Ok(v) => v, }; @@ -459,14 +471,14 @@ impl Layout { &mut warning_handler, )) }); - layout::Row { - buttons: add_offsets( + layout::Row::new( + add_offsets( buttons, |button| button.size.width, ).collect() - } + ) }); - let rows = add_offsets(rows, |row| row.get_height()) + let rows = add_offsets(rows, |row| row.get_size().height) .collect(); ( name.clone(), @@ -484,8 +496,8 @@ impl Layout { name, ( layout::c::Point { - x: (total_size.width - view.get_width()) / 2.0, - y: (total_size.height - view.get_height()) / 2.0, + x: (total_size.width - view.get_size().width) / 2.0, + y: (total_size.height - view.get_size().height) / 2.0, }, view, ), @@ -495,10 +507,10 @@ impl Layout { ( Ok(::layout::LayoutData { views: views, - keymap_str: { + keymaps: keymaps.into_iter().map(|keymap_str| CString::new(keymap_str) .expect("Invalid keymap string generated") - }, + ).collect(), // FIXME: use a dedicated field margins: layout::Margins { top: self.margins.top, @@ -734,20 +746,44 @@ fn create_button( } } +fn extract_symbol_names<'a>(actions: &'a [(&str, action::Action)]) + -> impl Iterator + 'a +{ + actions.iter() + .filter_map(|(_name, act)| { + match act { + action::Action::Submit { + text: _, keys, + } => Some(keys.clone()), + action::Action::Erase => Some(vec!(action::KeySym("BackSpace".into()))), + _ => None, + } + }) + .flatten() + .map(|named_keysym| named_keysym.0) +} + #[cfg(test)] mod tests { use super::*; - - use std::error::Error as ErrorTrait; + use ::logging::ProblemPanic; - const THIS_FILE: &str = file!(); - fn path_from_root(file: &'static str) -> PathBuf { - PathBuf::from(THIS_FILE) - .parent().unwrap() - .parent().unwrap() - .join(file) + let source_dir = env::var("SOURCE_DIR") + .map(PathBuf::from) + .unwrap_or_else(|e| { + if let env::VarError::NotPresent = e { + let this_file = file!(); + PathBuf::from(this_file) + .parent().unwrap() + .parent().unwrap() + .into() + } else { + panic!("{:?}", e); + } + }); + source_dir.join(file) } #[test] @@ -786,7 +822,8 @@ mod tests { Err(e) => { let mut handled = false; if let Error::Yaml(ye) = &e { - handled = ye.description() == "missing field `views`"; + handled = ye.to_string() + .starts_with("missing field `views`"); }; if !handled { println!("Unexpected error {:?}", e); @@ -804,7 +841,7 @@ mod tests { Err(e) => { let mut handled = false; if let Error::Yaml(ye) = &e { - handled = ye.description() + handled = ye.to_string() .starts_with("unknown field `bad_field`"); }; if !handled { @@ -824,7 +861,7 @@ mod tests { assert_eq!( out.views["base"].1 .get_rows()[0].1 - .buttons[0].1 + .get_buttons()[0].1 .label, ::layout::Label::Text(CString::new("test").unwrap()) ); @@ -839,7 +876,7 @@ mod tests { assert_eq!( out.views["base"].1 .get_rows()[0].1 - .buttons[0].1 + .get_buttons()[0].1 .label, ::layout::Label::Text(CString::new("test").unwrap()) ); @@ -855,13 +892,30 @@ mod tests { assert_eq!( out.views["base"].1 .get_rows()[0].1 - .buttons[0].1 + .get_buttons()[0].1 .state.borrow() .keycodes.len(), 2 ); } + /// Test if erase yields a useable keycode + #[test] + fn test_layout_erase() { + let out = Layout::from_file(path_from_root("tests/layout_erase.yaml")) + .unwrap() + .build(ProblemPanic).0 + .unwrap(); + assert_eq!( + out.views["base"].1 + .get_rows()[0].1 + .get_buttons()[0].1 + .state.borrow() + .keycodes.len(), + 1 + ); + } + #[test] fn parsing_fallback() { assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME) @@ -886,7 +940,26 @@ mod tests { ) ); } + + /// If layout contains a "+", it should reach for what's in front of it too. + #[test] + fn fallbacks_order_base() { + let sources = list_layout_sources("nb+aliens", ArrangementKind::Base, None); + + assert_eq!( + sources, + vec!( + (ArrangementKind::Base, DataSource::Resource("nb+aliens".into())), + (ArrangementKind::Base, DataSource::Resource("nb".into())), + ( + ArrangementKind::Base, + DataSource::Resource(FALLBACK_LAYOUT_NAME.into()) + ), + ) + ); + } + #[test] fn unicode_keysym() { let keysym = xkb::keysym_from_name( @@ -939,4 +1012,35 @@ mod tests { } ); } + + #[test] + fn test_extract_symbols() { + let actions = [( + "ac", + action::Action::Submit { + text: None, + keys: vec![ + action::KeySym("a".into()), + action::KeySym("c".into()), + ], + }, + )]; + assert_eq!( + extract_symbol_names(&actions[..]).collect::>(), + vec!["a", "c"], + ); + } + + #[test] + fn test_extract_symbols_erase() { + let actions = [( + "Erase", + action::Action::Erase, + )]; + assert_eq!( + extract_symbol_names(&actions[..]).collect::>(), + vec!["BackSpace"], + ); + } + } diff --git a/src/dbus.c b/src/dbus.c index 046b6bd8..24bab66f 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -59,7 +59,7 @@ handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation, if (service->context) { if (arg_visible) { - server_context_service_show_keyboard (service->context); + server_context_service_force_show_keyboard (service->context); } else { server_context_service_hide_keyboard (service->context); } diff --git a/src/imservice.c b/src/imservice.c index b6b04784..25dc65e4 100644 --- a/src/imservice.c +++ b/src/imservice.c @@ -25,6 +25,7 @@ static const struct zwp_input_method_v2_listener input_method_listener = { struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager, struct zwp_virtual_keyboard_manager_v1 *vkmanager, + struct vis_manager *vis_manager, struct wl_seat *seat, EekboardContextService *state) { struct zwp_input_method_v2 *im = NULL; @@ -35,7 +36,7 @@ struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager, if (vkmanager) { vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat); } - return submission_new(im, vk, state); + return submission_new(im, vk, state, vis_manager); } /// Un-inlined diff --git a/src/imservice.rs b/src/imservice.rs index a4546d94..462c4203 100644 --- a/src/imservice.rs +++ b/src/imservice.rs @@ -23,7 +23,7 @@ pub mod c { use std::os::raw::{c_char, c_void}; - pub use ::submission::c::UIManager; + pub use ::ui_manager::c::UIManager; pub use ::submission::c::StateManager; // The following defined in C @@ -41,8 +41,6 @@ pub mod c { pub fn eek_input_method_delete_surrounding_text(im: *mut InputMethod, before: u32, after: u32); pub fn eek_input_method_commit(im: *mut InputMethod, serial: u32); fn eekboard_context_service_set_hint_purpose(state: *const StateManager, hint: u32, purpose: u32); - fn server_context_service_show_keyboard(imservice: *const UIManager); - fn server_context_service_hide_keyboard(imservice: *const UIManager); } // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers @@ -152,10 +150,8 @@ pub mod c { }; if active_changed { + (imservice.active_callback)(imservice.current.active); if imservice.current.active { - if let Some(ui) = imservice.ui_manager { - unsafe { server_context_service_show_keyboard(ui); } - } unsafe { eekboard_context_service_set_hint_purpose( imservice.state_manager, @@ -163,10 +159,6 @@ pub mod c { imservice.current.content_purpose.clone() as u32, ); } - } else { - if let Some(ui) = imservice.ui_manager { - unsafe { server_context_service_hide_keyboard(ui); } - } } } } @@ -184,9 +176,7 @@ pub mod c { // the keyboard is already decommissioned imservice.current.active = false; - if let Some(ui) = imservice.ui_manager { - unsafe { server_context_service_hide_keyboard(ui); } - } + (imservice.active_callback)(imservice.current.active); } // FIXME: destroy and deallocate @@ -339,8 +329,7 @@ pub struct IMService { pub im: *mut c::InputMethod, /// Unowned reference. Be careful, it's shared with C at large state_manager: *const c::StateManager, - /// Unowned reference. Be careful, it's shared with C at large - pub ui_manager: Option<*const c::UIManager>, + active_callback: Box, pending: IMProtocolState, current: IMProtocolState, // turn current into an idiomatic representation? @@ -357,12 +346,13 @@ impl IMService { pub fn new( im: *mut c::InputMethod, state_manager: *const c::StateManager, + active_callback: Box, ) -> Box { // IMService will be referenced to by C, // so it needs to stay in the same place in memory via Box let imservice = Box::new(IMService { im, - ui_manager: None, + active_callback, state_manager, pending: IMProtocolState::default(), current: IMProtocolState::default(), @@ -377,7 +367,7 @@ impl IMService { } imservice } - + pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> { match self.current.active { true => { diff --git a/src/keyboard.rs b/src/keyboard.rs index 749d21ad..da650c55 100644 --- a/src/keyboard.rs +++ b/src/keyboard.rs @@ -5,11 +5,13 @@ use std::cell::RefCell; use std::collections::HashMap; use std::fmt; use std::io; +use std::mem; +use std::ptr; use std::rc::Rc; use std::string::FromUtf8Error; use ::action::Action; -use ::logging; +use ::util; // Traits use std::io::Write; @@ -21,7 +23,12 @@ pub enum PressType { Pressed = 1, } -pub type KeyCode = u32; +/// The extended, unambiguous layout-keycode +#[derive(Debug, Clone)] +pub struct KeyCode { + pub code: u32, + pub keymap_idx: usize, +} bitflags!{ /// Map to `virtual_keyboard.modifiers` modifiers values @@ -80,10 +87,10 @@ impl KeyState { } /// Sorts an iterator by converting it to a Vector and back -fn sorted<'a, I: Iterator>( +fn sorted<'a, I: Iterator>( iter: I -) -> impl Iterator { - let mut v: Vec<&'a str> = iter.collect(); +) -> impl Iterator { + let mut v: Vec = iter.collect(); v.sort(); v.into_iter() } @@ -91,15 +98,17 @@ fn sorted<'a, I: Iterator>( /// Generates a mapping where each key gets a keycode, starting from ~~8~~ /// HACK: starting from 9, because 8 results in keycode 0, /// which the compositor likes to discard -pub fn generate_keycodes<'a, C: IntoIterator>( - key_names: C -) -> HashMap { - let special_keysyms = ["BackSpace", "Return"].iter().map(|&s| s); +pub fn generate_keycodes<'a, C: IntoIterator>( + key_names: C, +) -> HashMap { HashMap::from_iter( - // sort to remove a source of indeterminism in keycode assignment - sorted(key_names.into_iter().chain(special_keysyms)) - .map(|name| String::from(name)) - .zip(9..) + // Sort to remove a source of indeterminism in keycode assignment. + sorted(key_names.into_iter()) + .zip(util::cycle_count(9..255)) + .map(|(name, (code, keymap_idx))| ( + String::from(name), + KeyCode { code, keymap_idx }, + )) ) } @@ -124,12 +133,54 @@ impl From for FormattingError { } } +/// Index is the key code, String is the occupant. +/// Starts all empty. +/// https://gitlab.freedesktop.org/xorg/xserver/-/issues/260 +type SingleKeyMap = [Option; 256]; + +fn single_key_map_new() -> SingleKeyMap { + // Why can't we just initialize arrays without tricks -_- ? + unsafe { + // Inspired by + // https://www.reddit.com/r/rust/comments/5n7bh1/how_to_create_an_array_of_a_type_with_clone_but/ + #[cfg(feature = "rustc_less_1_36")] + let mut array: SingleKeyMap = mem::uninitialized(); + #[cfg(not(feature = "rustc_less_1_36"))] + let mut array: SingleKeyMap = mem::MaybeUninit::uninit().assume_init(); + + for element in array.iter_mut() { + ptr::write(element, None); + } + array + } +} + +pub fn generate_keymaps(symbolmap: HashMap::) + -> Result, FormattingError> +{ + let mut bins: Vec = Vec::new(); + + for (name, KeyCode { code, keymap_idx }) in symbolmap.into_iter() { + if keymap_idx >= bins.len() { + bins.resize_with( + keymap_idx + 1, + || single_key_map_new(), + ); + } + bins[keymap_idx][code as usize] = Some(name); + } + + let mut out = Vec::new(); + for bin in bins { + out.push(generate_keymap(&bin)?); + } + Ok(out) +} + /// Generates a de-facto single level keymap. -// TODO: don't rely on keys and their order, -// but rather on what keysyms and keycodes are in use. -// Iterating actions makes it hard to deduplicate keysyms. -pub fn generate_keymap( - keystates: &HashMap:: +/// Key codes must not repeat and must remain between 9 and 255. +fn generate_keymap( + symbolmap: &SingleKeyMap, ) -> Result { let mut buf: Vec = Vec::new(); writeln!( @@ -140,86 +191,80 @@ pub fn generate_keymap( minimum = 8; maximum = 255;" )?; + + let pairs: Vec<(&String, usize)> = symbolmap.iter() + // Attach a key code to each cell. + .enumerate() + // Get rid of empty keycodes. + .filter_map(|(code, name)| name.as_ref().map(|n| (n, code))) + .collect(); - for (name, state) in keystates.iter() { - match &state.action { - Action::Submit { text: _, keys } => { - if let 0 = keys.len() { - log_print!( - logging::Level::Warning, - "Key {} has no keysyms", name, - ); - }; - for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) { - write!( - buf, - " - <{}> = {};", - named_keysym.0, - keycode, - )?; - } - }, - Action::Erase => { - let mut keycodes = state.keycodes.iter(); - write!( - buf, - " - = {};", - keycodes.next().expect("Erase key has no keycode"), - )?; - if let Some(_) = keycodes.next() { - log_print!( - logging::Level::Bug, - "Erase key has multiple keycodes", - ); - } - }, - _ => {}, - } + // Xorg can only consume up to 255 keys, so this may not work in Xwayland. + // Two possible solutions: + // - use levels to cram multiple characters into one key + // - swap layouts on key presses + for (_name, keycode) in &pairs { + write!( + buf, + " + = {0};", + keycode, + )?; } - + writeln!( buf, " + indicator 1 = \"Caps Lock\"; // Xwayland won't accept without it. }}; xkb_symbols \"squeekboard\" {{ - - name[Group1] = \"Letters\"; - name[Group2] = \"Numbers/Symbols\"; - - key {{ [ BackSpace ] }};" +" )?; - for (_name, state) in keystates.iter() { - if let Action::Submit { text: _, keys } = &state.action { - for keysym in keys.iter() { - write!( - buf, - " - key <{}> {{ [ {0} ] }};", - keysym.0, - )?; - } - } + for (name, keycode) in pairs { + write!( + buf, + " +key {{ [ {} ] }};", + keycode, + name, + )?; } + writeln!( buf, " }}; xkb_types \"squeekboard\" {{ + virtual_modifiers Squeekboard; // No modifiers! Needed for Xorg for some reason. + + // Those names are needed for Xwayland. + type \"ONE_LEVEL\" {{ + modifiers= none; + level_name[Level1]= \"Any\"; + }}; + type \"TWO_LEVEL\" {{ + level_name[Level1]= \"Base\"; + }}; + type \"ALPHABETIC\" {{ + level_name[Level1]= \"Base\"; + }}; + type \"KEYPAD\" {{ + level_name[Level1]= \"Base\"; + }}; + type \"SHIFT+ALT\" {{ + level_name[Level1]= \"Base\"; + }}; - type \"TWO_LEVEL\" {{ - modifiers = Shift; - map[Shift] = Level2; - level_name[Level1] = \"Base\"; - level_name[Level2] = \"Shift\"; - }}; }}; xkb_compatibility \"squeekboard\" {{ + // Needed for Xwayland again. + interpret Any+AnyOf(all) {{ + action= SetMods(modifiers=modMapMods,clearLocks); + }}; }}; }};" )?; @@ -234,22 +279,15 @@ mod tests { use xkbcommon::xkb; - use ::action::KeySym; - #[test] - fn test_keymap_multi() { - let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS); + fn test_keymap_single_resolve() { + let mut key_map = single_key_map_new(); + key_map[9] = Some("a".into()); + key_map[10] = Some("c".into()); - let keymap_str = generate_keymap(&hashmap!{ - "ac".into() => KeyState { - action: Action::Submit { - text: None, - keys: vec!(KeySym("a".into()), KeySym("c".into())), - }, - keycodes: vec!(9, 10), - pressed: PressType::Released, - }, - }).unwrap(); + let keymap_str = generate_keymap(&key_map).unwrap(); + + let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS); let keymap = xkb::Keymap::new_from_string( &context, @@ -263,4 +301,36 @@ mod tests { assert_eq!(state.key_get_one_sym(9), xkb::KEY_a); assert_eq!(state.key_get_one_sym(10), xkb::KEY_c); } + + #[test] + fn test_keymap_second_resolve() { + let keymaps = generate_keymaps(hashmap!( + "a".into() => KeyCode { keymap_idx: 1, code: 9 }, + )).unwrap(); + + let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS); + + let keymap = xkb::Keymap::new_from_string( + &context, + keymaps[1].clone(), // this index is part of the test + xkb::KEYMAP_FORMAT_TEXT_V1, + xkb::KEYMAP_COMPILE_NO_FLAGS, + ).expect("Failed to create keymap"); + + let state = xkb::State::new(&keymap); + + assert_eq!(state.key_get_one_sym(9), xkb::KEY_a); + } + + #[test] + fn test_symbolmap_overflow() { + // The 257th key (U1101) is interesting. + // Use Unicode encoding for being able to use in xkb keymaps. + let keynames = (0..258).map(|num| format!("U{:04X}", 0x1000 + num)); + let keycodes = generate_keycodes(keynames); + + // test now + let code = keycodes.get("U1101").expect("Did not find the tested keysym"); + assert_eq!(code.keymap_idx, 1); + } } diff --git a/src/layout.h b/src/layout.h index 756f90d5..53318bc4 100644 --- a/src/layout.h +++ b/src/layout.h @@ -39,7 +39,6 @@ struct transformation squeek_layout_calculate_transformation( double allocation_width, double allocation_size); struct squeek_layout *squeek_load_layout(const char *name, uint32_t type); -const char *squeek_layout_get_keymap(const struct squeek_layout*); enum squeek_arrangement_kind squeek_layout_get_kind(const struct squeek_layout *); void squeek_layout_free(struct squeek_layout*); diff --git a/src/layout.rs b/src/layout.rs index b1cae8ee..03b20039 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -236,13 +236,6 @@ pub mod c { height: allocation_height, }) } - - #[no_mangle] - pub extern "C" - fn squeek_layout_get_keymap(layout: *const Layout) -> *const c_char { - let layout = unsafe { &*layout }; - layout.keymap_str.as_ptr() - } #[no_mangle] pub extern "C" @@ -493,38 +486,63 @@ pub struct Button { } /// The graphical representation of a row of buttons +#[derive(Clone, Debug)] pub struct Row { - /// Buttons together with their offset from the left - pub buttons: Vec<(f64, Box