Compare commits
14 Commits
pureos/1.1
...
sizing
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ce2cf254b | |||
| 6d7360a230 | |||
| 33039e65cb | |||
| 4007754de9 | |||
| 6abaa36db8 | |||
| 710509a671 | |||
| 16d7fcae7c | |||
| e504154571 | |||
| b19938da01 | |||
| b409df15bb | |||
| 7dd2866b17 | |||
| f6fc6c83dc | |||
| fa5c7c63d9 | |||
| 1093e32325 |
@ -1,4 +1,4 @@
|
|||||||
image: debian:bullseye
|
image: debian:buster
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
@ -11,7 +11,7 @@ stages:
|
|||||||
before_script:
|
before_script:
|
||||||
- apt-get -y update
|
- apt-get -y update
|
||||||
- apt-get -y install wget ca-certificates gnupg
|
- apt-get -y install wget ca-certificates gnupg
|
||||||
- echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
|
- echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
|
||||||
- wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
|
- wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
|
||||||
- apt-get -y update
|
- apt-get -y update
|
||||||
|
|
||||||
@ -27,8 +27,7 @@ build_docs:
|
|||||||
- ./doc/build.sh _build
|
- ./doc/build.sh _build
|
||||||
|
|
||||||
build_meson:
|
build_meson:
|
||||||
tags:
|
<<: *tags
|
||||||
- librem5
|
|
||||||
stage: build
|
stage: build
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
@ -36,7 +35,7 @@ build_meson:
|
|||||||
expire_in: 3h
|
expire_in: 3h
|
||||||
script:
|
script:
|
||||||
- apt-get -y build-dep .
|
- apt-get -y build-dep .
|
||||||
- meson . _build/ -Ddepdatadir=/usr/share --werror
|
- meson . _build/ -Ddepdatadir=/usr/share
|
||||||
- ninja -C _build install
|
- ninja -C _build install
|
||||||
|
|
||||||
build_deb:
|
build_deb:
|
||||||
@ -53,44 +52,10 @@ build_deb:
|
|||||||
- debuild -i -us -uc -b
|
- debuild -i -us -uc -b
|
||||||
- cp ../*.deb .
|
- cp ../*.deb .
|
||||||
|
|
||||||
build_deb:amber:
|
|
||||||
image: pureos/amber
|
|
||||||
tags:
|
|
||||||
- librem5
|
|
||||||
stage: build
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- "*.deb"
|
|
||||||
script:
|
|
||||||
- echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
|
|
||||||
- apt-get -y update
|
|
||||||
- rm -f ../*.deb
|
|
||||||
- apt-get -y build-dep .
|
|
||||||
- apt-get -y install devscripts
|
|
||||||
- debuild -i -us -uc -b
|
|
||||||
- cp ../*.deb .
|
|
||||||
|
|
||||||
build_deb:buster:
|
|
||||||
image: "debian:buster"
|
|
||||||
tags:
|
|
||||||
- librem5
|
|
||||||
stage: build
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- "*.deb"
|
|
||||||
script:
|
|
||||||
- echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
|
|
||||||
- apt-get -y update
|
|
||||||
- rm -f ../*.deb
|
|
||||||
- apt-get -y build-dep .
|
|
||||||
- apt-get -y install devscripts
|
|
||||||
- debuild -i -us -uc -b
|
|
||||||
- cp ../*.deb .
|
|
||||||
|
|
||||||
|
|
||||||
build_deb:arm64:
|
build_deb:arm64:
|
||||||
tags:
|
tags:
|
||||||
- librem5:arm64
|
- librem5:arm64
|
||||||
|
allow_failure: true
|
||||||
stage: build
|
stage: build
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
@ -102,23 +67,6 @@ build_deb:arm64:
|
|||||||
- debuild -i -us -uc -b
|
- debuild -i -us -uc -b
|
||||||
- cp ../*.deb .
|
- cp ../*.deb .
|
||||||
|
|
||||||
build_deb:arm64_buster:
|
|
||||||
image: "debian:buster"
|
|
||||||
tags:
|
|
||||||
- librem5:arm64
|
|
||||||
stage: build
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- "*.deb"
|
|
||||||
script:
|
|
||||||
- echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
|
|
||||||
- apt-get -y update
|
|
||||||
- rm -f ../*.deb
|
|
||||||
- apt-get -y build-dep .
|
|
||||||
- apt-get -y install devscripts
|
|
||||||
- debuild -i -us -uc -b
|
|
||||||
- cp ../*.deb .
|
|
||||||
|
|
||||||
test_lintian:
|
test_lintian:
|
||||||
<<: *tags
|
<<: *tags
|
||||||
stage: test
|
stage: test
|
||||||
@ -129,17 +77,13 @@ test_lintian:
|
|||||||
- lintian *.deb
|
- lintian *.deb
|
||||||
|
|
||||||
test:
|
test:
|
||||||
tags:
|
<<: *tags
|
||||||
- librem5
|
|
||||||
stage: test
|
stage: test
|
||||||
needs:
|
needs:
|
||||||
- build_meson
|
- build_meson
|
||||||
script:
|
script:
|
||||||
- apt-get -y build-dep .
|
- apt-get -y build-dep .
|
||||||
- apt-get -y install clang-tidy
|
|
||||||
- ninja -C _build test
|
- 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:
|
check_release:
|
||||||
<<: *tags
|
<<: *tags
|
||||||
|
|||||||
22
Cargo.deps
22
Cargo.deps
@ -1,22 +0,0 @@
|
|||||||
# Dependencies which change based on build flags
|
|
||||||
bitflags = "1.2.*"
|
|
||||||
clap = { version = "2.33.*", default-features = false }
|
|
||||||
regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
|
|
||||||
|
|
||||||
[dependencies.cairo-rs]
|
|
||||||
version = "0.7.*"
|
|
||||||
|
|
||||||
[dependencies.gdk]
|
|
||||||
version = "0.11.*"
|
|
||||||
|
|
||||||
[dependencies.gio]
|
|
||||||
version = "0.7.*"
|
|
||||||
features = ["v2_44"]
|
|
||||||
|
|
||||||
[dependencies.glib]
|
|
||||||
version = "0.8.*"
|
|
||||||
features = ["v2_44"]
|
|
||||||
|
|
||||||
[dependencies.gtk]
|
|
||||||
version = "0.7.*"
|
|
||||||
features = ["v3_22"]
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
# Dependencies which change based on build flags
|
|
||||||
bitflags = "1.0.*"
|
|
||||||
clap = { version = "2.32.*", default-features = false }
|
|
||||||
regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
|
|
||||||
|
|
||||||
[dependencies.cairo-rs]
|
|
||||||
version = "0.5.*"
|
|
||||||
|
|
||||||
[dependencies.gdk]
|
|
||||||
version = "0.9.*"
|
|
||||||
|
|
||||||
[dependencies.gio]
|
|
||||||
version = "0.5.*"
|
|
||||||
features = ["v2_44"]
|
|
||||||
|
|
||||||
[dependencies.glib]
|
|
||||||
version = "0.6.*"
|
|
||||||
features = ["v2_44"]
|
|
||||||
|
|
||||||
[dependencies.gtk]
|
|
||||||
version = "0.5.*"
|
|
||||||
features = ["v3_22"]
|
|
||||||
492
Cargo.lock
generated
492
Cargo.lock
generated
@ -1,484 +1,506 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "atk"
|
name = "aho-corasick"
|
||||||
version = "0.7.0"
|
version = "0.7.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atk-sys",
|
"memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bitflags",
|
|
||||||
"glib",
|
|
||||||
"glib-sys",
|
|
||||||
"gobject-sys",
|
|
||||||
"libc",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "atk-sys"
|
name = "atk-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "1.2.1"
|
version = "1.0.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cairo-rs"
|
name = "cairo-rs"
|
||||||
version = "0.7.1"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-sys-rs",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cairo-sys-rs"
|
name = "cairo-sys-rs"
|
||||||
version = "0.9.2"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glib-sys",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.0.67"
|
version = "1.0.50"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap"
|
name = "clap"
|
||||||
version = "2.33.3"
|
version = "2.32.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"textwrap",
|
"textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"unicode-width",
|
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dtoa"
|
name = "dtoa"
|
||||||
version = "0.4.8"
|
version = "0.4.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fragile"
|
name = "fragile"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gdk"
|
name = "gdk"
|
||||||
version = "0.11.0"
|
version = "0.9.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-rs",
|
"cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-sys-rs",
|
"cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-pixbuf",
|
"gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-sys",
|
"gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio",
|
"gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio-sys",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pango",
|
"pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gdk-pixbuf"
|
name = "gdk-pixbuf"
|
||||||
version = "0.7.0"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gdk-pixbuf-sys",
|
"gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio",
|
"gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio-sys",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gdk-pixbuf-sys"
|
name = "gdk-pixbuf-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gio-sys",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gdk-sys"
|
name = "gdk-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cairo-sys-rs",
|
"cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-pixbuf-sys",
|
"gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio-sys",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pango-sys",
|
"pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gio"
|
name = "gio"
|
||||||
version = "0.7.0"
|
version = "0.5.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"fragile",
|
"fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio-sys",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"lazy_static",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gio-sys"
|
name = "gio-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "glib"
|
name = "glib"
|
||||||
version = "0.8.2"
|
version = "0.6.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"lazy_static",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "glib-sys"
|
name = "glib-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gobject-sys"
|
name = "gobject-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gtk"
|
name = "gtk"
|
||||||
version = "0.7.0"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atk",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bitflags",
|
"cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-rs",
|
"cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-sys-rs",
|
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cc",
|
"gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk",
|
"gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-pixbuf",
|
"gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-pixbuf-sys",
|
"gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-sys",
|
"gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio-sys",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gtk-sys",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"lazy_static",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pango",
|
|
||||||
"pango-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gtk-sys"
|
name = "gtk-sys"
|
||||||
version = "0.9.2"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atk-sys",
|
"atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-sys-rs",
|
"cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-pixbuf-sys",
|
"gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk-sys",
|
"gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio-sys",
|
"gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pango-sys",
|
"pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy_static"
|
name = "lazy_static"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.94"
|
version = "0.2.66"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "linked-hash-map"
|
name = "linked-hash-map"
|
||||||
version = "0.5.4"
|
version = "0.5.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "maplit"
|
name = "maplit"
|
||||||
version = "1.0.2"
|
version = "1.0.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
|
|
||||||
|
[[package]]
|
||||||
|
name = "memchr"
|
||||||
|
version = "2.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memmap"
|
name = "memmap"
|
||||||
version = "0.7.0"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"winapi",
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pango"
|
name = "pango"
|
||||||
version = "0.7.0"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"lazy_static",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pango-sys",
|
"pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pango-sys"
|
name = "pango-sys"
|
||||||
version = "0.9.1"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gobject-sys",
|
"gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pkg-config"
|
name = "pkg-config"
|
||||||
version = "0.3.19"
|
version = "0.3.17"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.26"
|
version = "1.0.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-xid",
|
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.9"
|
version = "1.0.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.3.9"
|
version = "1.1.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"regex-syntax",
|
"aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex-syntax"
|
name = "regex-syntax"
|
||||||
version = "0.6.25"
|
version = "0.6.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rs"
|
name = "rs"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-rs",
|
"cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cairo-sys-rs",
|
"cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"clap",
|
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk",
|
"gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio",
|
"gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gtk",
|
"gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gtk-sys",
|
"gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"maplit",
|
"maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"regex",
|
"regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde",
|
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde_yaml",
|
"serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"xkbcommon",
|
"xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.126"
|
version = "1.0.104"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.126"
|
version = "1.0.104"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"quote",
|
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"syn",
|
"syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_yaml"
|
name = "serde_yaml"
|
||||||
version = "0.8.17"
|
version = "0.8.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dtoa",
|
"dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"linked-hash-map",
|
"linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde",
|
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"yaml-rust",
|
"yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.72"
|
version = "1.0.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"quote",
|
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"unicode-xid",
|
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "textwrap"
|
name = "textwrap"
|
||||||
version = "0.11.0"
|
version = "0.10.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-width",
|
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thread_local"
|
||||||
|
version = "0.3.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-width"
|
name = "unicode-width"
|
||||||
version = "0.1.8"
|
version = "0.1.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-xid"
|
name = "unicode-xid"
|
||||||
version = "0.2.2"
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "utf8-ranges"
|
||||||
|
version = "1.0.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.3.9"
|
version = "0.3.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"winapi-i686-pc-windows-gnu",
|
"winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"winapi-x86_64-pc-windows-gnu",
|
"winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xkbcommon"
|
name = "xkbcommon"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"memmap",
|
"memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yaml-rust"
|
name = "yaml-rust"
|
||||||
version = "0.4.5"
|
version = "0.4.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"linked-hash-map",
|
"linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[metadata]
|
||||||
|
"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
|
||||||
|
"checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
|
||||||
|
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
|
||||||
|
"checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
|
||||||
|
"checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
|
||||||
|
"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
|
||||||
|
"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
|
||||||
|
"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.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc52c7244046df9d959df87289f1fc5cca23f9f850bab0c967963e2ecb83a96"
|
||||||
|
"checksum gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc3aa730cb4df3de5d9fed59f43afdf9e5fb2d3d10bfcbd04cec031435ce87f5"
|
||||||
|
"checksum gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08284f16ce4d909b10d785a763ba190e222d2c1557b29908bf0a661e27a8ac3b"
|
||||||
|
"checksum gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "108548ebf5329b551f2b97ab356908d14627905abb74b936c3372de1535aee81"
|
||||||
|
"checksum gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29a44b051990573448edc80b1995237f8b97b5734d2aec05105b9242aa10af11"
|
||||||
|
"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
|
||||||
|
"checksum glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a333edf5b9f1411c246ef14e7881b087255f04c56dbef48c64a0cb039b4b340"
|
||||||
|
"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d"
|
||||||
|
"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
|
||||||
|
"checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
|
||||||
|
"checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
|
||||||
|
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
|
||||||
|
"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
|
||||||
|
"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
|
||||||
|
"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
|
||||||
|
"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
|
||||||
|
"checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
|
||||||
|
"checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
|
||||||
|
"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
|
||||||
|
"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
|
||||||
|
"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
|
||||||
|
"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
|
||||||
|
"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
|
||||||
|
"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
|
||||||
|
"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
|
||||||
|
"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
|
||||||
|
"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
|
||||||
|
"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
|
||||||
|
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
|
||||||
|
"checksum 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 utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
|
||||||
|
"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.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
|
||||||
|
|||||||
@ -2,40 +2,46 @@
|
|||||||
name = "rs"
|
name = "rs"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
||||||
[lib]
|
[dependencies]
|
||||||
name = "rs"
|
bitflags = "1.0.*"
|
||||||
path = "@path@/src/lib.rs"
|
clap = { version = "2.32.*", default-features = false }
|
||||||
crate-type = ["staticlib", "rlib"]
|
maplit = "1.0.*"
|
||||||
|
regex = "1.1.*"
|
||||||
|
serde = { version = "1.0.*", features = ["derive"] }
|
||||||
|
serde_yaml = "0.8.*"
|
||||||
|
xkbcommon = { version = "0.4.*", features = ["wayland"] }
|
||||||
|
|
||||||
# Cargo can't do autodiscovery if Cargo.toml is not in the root.
|
[dependencies.cairo-rs]
|
||||||
[[bin]]
|
version = "0.5.*"
|
||||||
name = "test_layout"
|
|
||||||
path = "@path@/src/bin/test_layout.rs"
|
|
||||||
|
|
||||||
[[example]]
|
|
||||||
name = "test_layout"
|
|
||||||
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]
|
[dependencies.cairo-sys-rs]
|
||||||
version = ""
|
version = ""
|
||||||
|
|
||||||
|
[dependencies.gdk]
|
||||||
|
version = ""
|
||||||
|
|
||||||
|
[dependencies.gio]
|
||||||
|
version = ""
|
||||||
|
features = ["v2_44"]
|
||||||
|
|
||||||
|
[dependencies.glib]
|
||||||
|
version = ""
|
||||||
|
features = ["v2_44"]
|
||||||
|
|
||||||
[dependencies.glib-sys]
|
[dependencies.glib-sys]
|
||||||
version = ""
|
version = ""
|
||||||
features = ["v2_44"]
|
features = ["v2_44"]
|
||||||
|
|
||||||
|
[dependencies.gtk]
|
||||||
|
version = "0.5.*"
|
||||||
|
features = ["v3_22"]
|
||||||
|
|
||||||
[dependencies.gtk-sys]
|
[dependencies.gtk-sys]
|
||||||
version = ""
|
version = ""
|
||||||
features = ["v3_22"]
|
features = ["v3_22"]
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
maplit = "1.0.*"
|
[lib]
|
||||||
serde = { version = "1.0.*", features = ["derive"] }
|
name = "rs"
|
||||||
serde_yaml = "0.8.*"
|
path = "src/lib.rs"
|
||||||
xkbcommon = { version = "0.4.*", features = ["wayland"] }
|
crate-type = ["staticlib", "rlib"]
|
||||||
# Here is inserted the Cargo.deps file
|
|
||||||
31
README.md
31
README.md
@ -30,43 +30,30 @@ Building
|
|||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
|
|
||||||
See `.gitlab-ci.yml` or run `apt-get build-dep .`
|
See `.gitlab-ci.yml`.
|
||||||
|
|
||||||
### Build from git repo
|
### Build from git repo
|
||||||
|
|
||||||
```bash
|
```
|
||||||
$ git clone https://source.puri.sm/Librem5/squeekboard.git
|
$ git clone https://source.puri.sm/Librem5/squeekboard.git
|
||||||
$ cd squeekboard
|
$ cd squeekboard
|
||||||
$ mkdir _build
|
$ mkdir ../build
|
||||||
$ meson _build/
|
$ meson ../build/
|
||||||
$ cd _build
|
$ cd ../build
|
||||||
$ ninja
|
$ ninja test
|
||||||
|
$ ninja install
|
||||||
```
|
```
|
||||||
|
|
||||||
To run tests use `ninja test`. To install squeekboard run `ninja install`.
|
|
||||||
|
|
||||||
Running
|
Running
|
||||||
-------
|
-------
|
||||||
|
|
||||||
```bash
|
```
|
||||||
$ phoc # if no compatible Wayland compositor is running yet
|
$ phoc # if no compatible Wayland compositor is running yet
|
||||||
$ cd ../build/
|
$ cd ../build/
|
||||||
$ src/squeekboard
|
$ 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
|
Developing
|
||||||
----------
|
----------
|
||||||
|
|
||||||
See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
|
See [`docs/hacking.md`](docs/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
|
||||||
|
|||||||
7
cargo.sh
7
cargo.sh
@ -13,10 +13,5 @@ CARGO_TARGET_DIR="$(pwd)"
|
|||||||
export CARGO_TARGET_DIR
|
export CARGO_TARGET_DIR
|
||||||
|
|
||||||
cd "$SOURCE_DIR"
|
cd "$SOURCE_DIR"
|
||||||
|
cargo "$@"
|
||||||
# the 'run" command takes arguments at the end,
|
|
||||||
# so --manifest-path must not be last
|
|
||||||
CMD="$1"
|
|
||||||
shift
|
|
||||||
cargo "$CMD" --manifest-path "$CARGO_TARGET_DIR"/Cargo.toml "$@"
|
|
||||||
|
|
||||||
|
|||||||
@ -1,49 +0,0 @@
|
|||||||
#!/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(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(binary_dir, filename),
|
|
||||||
out_path],
|
|
||||||
check=True)
|
|
||||||
|
|
||||||
34
cargo_build.sh
Executable file
34
cargo_build.sh
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
#!/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
|
||||||
@ -1,89 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
---
|
|
||||||
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 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 , 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 space period Return"
|
|
||||||
numbers:
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "à À á Á ã Ã â Â é É"
|
|
||||||
- "show_symbols ê Ê í Í ó Ó ô Ô"
|
|
||||||
- "show_letters õ Õ ú Ú ü Ü period BackSpace"
|
|
||||||
symbols:
|
|
||||||
- "@ # $ % - + ÷ × = ≠"
|
|
||||||
- "( ) § & < > / * { }"
|
|
||||||
- "show_numbers_from_symbols º \" ' colon ; ! ? 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: "1ã"
|
|
||||||
show_numbers_from_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: "altline"
|
|
||||||
label: "1ã"
|
|
||||||
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: ":"
|
|
||||||
@ -1,106 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,106 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,106 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,106 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -21,7 +21,7 @@ views:
|
|||||||
numbers:
|
numbers:
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
- "1 2 3 4 5 6 7 8 9 0"
|
||||||
- "@ # € % & - _ + ( )"
|
- "@ # € % & - _ + ( )"
|
||||||
- "show_symbols ; \" ' : = < > BackSpace"
|
- "show_symbols , \" ' : = < > BackSpace"
|
||||||
- "show_letters show_eschars preferences space , . Return"
|
- "show_letters show_eschars preferences space , . Return"
|
||||||
symbols:
|
symbols:
|
||||||
- "~ ` ´ | · √ µ ÷ × ¶"
|
- "~ ` ´ | · √ µ ÷ × ¶"
|
||||||
|
|||||||
@ -21,7 +21,7 @@ views:
|
|||||||
numbers:
|
numbers:
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
- "1 2 3 4 5 6 7 8 9 0"
|
||||||
- "@ # % & - _ + ( ) ß"
|
- "@ # % & - _ + ( ) ß"
|
||||||
- "show_symbols ; \" ' : = < > BackSpace"
|
- "show_symbols , \" ' : = < > BackSpace"
|
||||||
- "show_letters preferences space , . Return"
|
- "show_letters preferences space , . Return"
|
||||||
symbols:
|
symbols:
|
||||||
- "~ ` ´ · © ® ÷ × ¶"
|
- "~ ` ´ · © ® ÷ × ¶"
|
||||||
|
|||||||
@ -1,98 +0,0 @@
|
|||||||
---
|
|
||||||
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 }
|
|
||||||
|
|
||||||
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 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 space . Return"
|
|
||||||
numbers:
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "@ # $ % & - _ + ( )"
|
|
||||||
- "show_symbols , \" ' : ; ! ? BackSpace"
|
|
||||||
- "show_letters preferences space . Return"
|
|
||||||
symbols:
|
|
||||||
- "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
|
|
||||||
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
|
|
||||||
- "show_numbers \\ / < > = [ ] 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: "altline"
|
|
||||||
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: "*/="
|
|
||||||
".":
|
|
||||||
outline: altline
|
|
||||||
space:
|
|
||||||
outline: spaceline
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
U00B7:
|
|
||||||
text: "·"
|
|
||||||
squareroot:
|
|
||||||
text: "√"
|
|
||||||
Greek_pi:
|
|
||||||
text: "π"
|
|
||||||
division:
|
|
||||||
text: "÷"
|
|
||||||
multiply:
|
|
||||||
text: "×"
|
|
||||||
paragraph:
|
|
||||||
text: "¶"
|
|
||||||
Greek_tau:
|
|
||||||
text: "τ"
|
|
||||||
copyright:
|
|
||||||
text: "©"
|
|
||||||
U00AE:
|
|
||||||
text: "®"
|
|
||||||
U00A3:
|
|
||||||
text: "£"
|
|
||||||
EuroSign:
|
|
||||||
text: "€"
|
|
||||||
U00A5:
|
|
||||||
text: "¥"
|
|
||||||
asciicircum:
|
|
||||||
text: "^"
|
|
||||||
degree:
|
|
||||||
text: "°"
|
|
||||||
@ -1,81 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
---
|
|
||||||
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 ? period 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 ¿ period Return"
|
|
||||||
numbers:
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "@ # € % & - _ + ( )"
|
|
||||||
- "show_symbols , \" ' colon ; ! = BackSpace"
|
|
||||||
- "show_letters show_eschars preferences space ? period Return"
|
|
||||||
symbols:
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ $ ¥ ^ ° * { }"
|
|
||||||
- "show_numbers \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters show_eschars preferences space ? period 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: "default"
|
|
||||||
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: "àÀ"
|
|
||||||
|
|
||||||
period:
|
|
||||||
outline: "default"
|
|
||||||
text: "."
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "altline"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
text: ":"
|
|
||||||
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 40, height: 60 }
|
|
||||||
altline: { width: 56, height: 60 }
|
|
||||||
wide: { width: 62, height: 60 }
|
|
||||||
spaceline: { width: 142, height: 60 }
|
|
||||||
special: { width: 44, height: 60 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "' - ק ר א ט ו ן ם פ"
|
|
||||||
- "ש ד ג כ ע י ח ל ך ף"
|
|
||||||
- "ז ס ב ה נ מ צ ת ץ BackSpace"
|
|
||||||
- "show_numbers comma 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:
|
|
||||||
BackSpace:
|
|
||||||
outline: "default"
|
|
||||||
icon: "edit-clear-symbolic"
|
|
||||||
action: erase
|
|
||||||
comma:
|
|
||||||
outline: "special"
|
|
||||||
text: ","
|
|
||||||
|
|
||||||
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: ":"
|
|
||||||
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
# 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 , \" ' : ; ! = 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"
|
|
||||||
|
|
||||||
@ -13,22 +13,22 @@ views:
|
|||||||
- "q w e r t y u i o p"
|
- "q w e r t y u i o p"
|
||||||
- "a s d f g h j k l"
|
- "a s d f g h j k l"
|
||||||
- "Shift_L z x c v b n m BackSpace"
|
- "Shift_L z x c v b n m BackSpace"
|
||||||
- "show_numbers show_eschars preferences space , . Return"
|
- "show_numbers show_eschars preferences space , period Return"
|
||||||
upper:
|
upper:
|
||||||
- "Q W E R T Y U I O P"
|
- "Q W E R T Y U I O P"
|
||||||
- "A S D F G H J K L"
|
- "A S D F G H J K L"
|
||||||
- "Shift_L Z X C V B N M BackSpace"
|
- "Shift_L Z X C V B N M BackSpace"
|
||||||
- "show_numbers show_eschars preferences space ? . Return"
|
- "show_numbers show_eschars preferences space ? period Return"
|
||||||
numbers:
|
numbers:
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
- "1 2 3 4 5 6 7 8 9 0"
|
||||||
- "@ # € % & - _ + ( )"
|
- "@ # € % & - _ + ( )"
|
||||||
- "show_symbols , \" ' : ; ! ? BackSpace"
|
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
||||||
- "show_letters show_eschars preferences space ? . Return"
|
- "show_letters show_eschars preferences space ? period Return"
|
||||||
symbols:
|
symbols:
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
- "~ ` | · √ π τ ÷ × ¶"
|
||||||
- "© ® £ $ ¥ ^ ° * { }"
|
- "© ® £ $ ¥ ^ ° * { }"
|
||||||
- "show_numbers \\ / < > = [ ] BackSpace"
|
- "show_numbers \\ / < > = [ ] BackSpace"
|
||||||
- "show_letters show_eschars preferences space ? . Return"
|
- "show_letters show_eschars preferences space ? period Return"
|
||||||
eschars:
|
eschars:
|
||||||
- "á é í ó ú Á É Í Ó Ú"
|
- "á é í ó ú Á É Í Ó Ú"
|
||||||
- "à è ì ò « » ù ! { }"
|
- "à è ì ò « » ù ! { }"
|
||||||
@ -76,12 +76,17 @@ buttons:
|
|||||||
set_view: "eschars"
|
set_view: "eschars"
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "àè"
|
label: "àè"
|
||||||
|
period:
|
||||||
|
outline: "default"
|
||||||
|
label: "."
|
||||||
space:
|
space:
|
||||||
outline: "spaceline"
|
outline: "spaceline"
|
||||||
label: " "
|
label: " "
|
||||||
text: " "
|
|
||||||
Return:
|
Return:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "key-enter"
|
icon: "key-enter"
|
||||||
keysym: "Return"
|
keysym: "Return"
|
||||||
|
colon:
|
||||||
|
label: ":"
|
||||||
|
"\"":
|
||||||
|
keysym: "quotedbl"
|
||||||
|
|||||||
@ -438,7 +438,7 @@ buttons:
|
|||||||
unlock_view: "カタカナ"
|
unlock_view: "カタカナ"
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "。"
|
label: "。"
|
||||||
# Buttons for Latin characters
|
# Buttons for Latin charachters
|
||||||
RSYM1:
|
RSYM1:
|
||||||
action:
|
action:
|
||||||
locking:
|
locking:
|
||||||
|
|||||||
@ -438,7 +438,7 @@ buttons:
|
|||||||
unlock_view: "カタカナ"
|
unlock_view: "カタカナ"
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "。"
|
label: "。"
|
||||||
# Buttons for Latin characters
|
# Buttons for Latin charachters
|
||||||
RSYM1:
|
RSYM1:
|
||||||
action:
|
action:
|
||||||
locking:
|
locking:
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
outlines:
|
outlines:
|
||||||
default: { width: 32, height: 52 }
|
default: { width: 32, height: 52 }
|
||||||
altline: { width: 48.39024, height: 52 }
|
altline: { width: 48.39024, height: 52 }
|
||||||
wide: { width: 64, height: 52 }
|
wide: { width: 62, height: 52 }
|
||||||
spaceline: { width: 142, height: 52 }
|
outline7: { width: 88.97561, height: 52 }
|
||||||
special: { width: 44, height: 52 }
|
spaceline: { width: 150.5853, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -25,7 +25,7 @@ views:
|
|||||||
symbols:
|
symbols:
|
||||||
- "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
|
- "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
|
||||||
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
|
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
|
||||||
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
|
- "show_numbers \\ / < > = [ ] BackSpace"
|
||||||
- "show_letters preferences space . Return"
|
- "show_letters preferences space . Return"
|
||||||
|
|
||||||
buttons:
|
buttons:
|
||||||
@ -42,22 +42,17 @@ buttons:
|
|||||||
action: erase
|
action: erase
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "special"
|
outline: "altline"
|
||||||
icon: "keyboard-mode-symbolic"
|
icon: "keyboard-mode-symbolic"
|
||||||
show_numbers:
|
show_numbers:
|
||||||
action:
|
action:
|
||||||
set_view: "numbers"
|
set_view: "numbers"
|
||||||
outline: "wide"
|
outline: "altline"
|
||||||
label: "123"
|
|
||||||
show_numbers_from_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: altline
|
|
||||||
label: "123"
|
label: "123"
|
||||||
show_letters:
|
show_letters:
|
||||||
action:
|
action:
|
||||||
set_view: "base"
|
set_view: "base"
|
||||||
outline: "wide"
|
outline: "altline"
|
||||||
label: "ABC"
|
label: "ABC"
|
||||||
show_symbols:
|
show_symbols:
|
||||||
action:
|
action:
|
||||||
@ -65,7 +60,7 @@ buttons:
|
|||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "*/="
|
label: "*/="
|
||||||
".":
|
".":
|
||||||
outline: "special"
|
outline: altline
|
||||||
space:
|
space:
|
||||||
outline: spaceline
|
outline: spaceline
|
||||||
text: " "
|
text: " "
|
||||||
|
|||||||
@ -52,8 +52,6 @@ buttons:
|
|||||||
locking:
|
locking:
|
||||||
lock_view: "upper_accents"
|
lock_view: "upper_accents"
|
||||||
unlock_view: "accents"
|
unlock_view: "accents"
|
||||||
looks_locked_from:
|
|
||||||
- "upper"
|
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "key-shift"
|
icon: "key-shift"
|
||||||
BackSpace:
|
BackSpace:
|
||||||
@ -96,8 +94,6 @@ buttons:
|
|||||||
locking:
|
locking:
|
||||||
lock_view: "upper_accents"
|
lock_view: "upper_accents"
|
||||||
unlock_view: "upper"
|
unlock_view: "upper"
|
||||||
looks_locked_from:
|
|
||||||
- "accents"
|
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "ĄĘ"
|
label: "ĄĘ"
|
||||||
period:
|
period:
|
||||||
|
|||||||
@ -1,94 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 32, height: 52 }
|
|
||||||
altline: { width: 32, height: 52 }
|
|
||||||
wide: { width: 57, height: 52 }
|
|
||||||
narrow: { width: 26, height: 52 }
|
|
||||||
spaceline: { width: 107, height: 52 }
|
|
||||||
fill: { width: 159, height: 52 }
|
|
||||||
special: { width: 42, height: 52 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "й ц у к е н г ш щ з х"
|
|
||||||
- "ф ы в а п р о л д ж э"
|
|
||||||
- "Shift_L я ч с м и т ь б ю BackSpace"
|
|
||||||
- "show_numbers preferences ё space ъ period Return"
|
|
||||||
upper:
|
|
||||||
- "Й Ц У К Е Н Г Ш Щ З Х"
|
|
||||||
- "Ф Ы В А П Р О Л Д Ж Э"
|
|
||||||
- "Shift_L Я Ч С М И Т Ь Б Ю BackSpace"
|
|
||||||
- "show_numbers preferences Ё space Ъ comma Return"
|
|
||||||
numbers:
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "@ # $ % & - _ + ( )"
|
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
|
||||||
- "show_letters preferences space_fill period Return"
|
|
||||||
symbols:
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ € ¥ ^ ° * { }"
|
|
||||||
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters preferences space_fill 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: "wide"
|
|
||||||
label: "123"
|
|
||||||
show_letters:
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "wide"
|
|
||||||
label: "АБВ"
|
|
||||||
show_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "symbols"
|
|
||||||
outline: "wide"
|
|
||||||
label: "*/="
|
|
||||||
period:
|
|
||||||
outline: "special"
|
|
||||||
text: "."
|
|
||||||
comma:
|
|
||||||
outline: "special"
|
|
||||||
text: ","
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
text: " "
|
|
||||||
space_fill:
|
|
||||||
outline: "fill"
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
text: ":"
|
|
||||||
ё:
|
|
||||||
outline: "narrow"
|
|
||||||
Ё:
|
|
||||||
outline: "narrow"
|
|
||||||
ъ:
|
|
||||||
outline: "narrow"
|
|
||||||
Ъ:
|
|
||||||
outline: "narrow"
|
|
||||||
@ -2,10 +2,9 @@
|
|||||||
outlines:
|
outlines:
|
||||||
default: { width: 32, height: 52 }
|
default: { width: 32, height: 52 }
|
||||||
altline: { width: 48.39024, height: 52 }
|
altline: { width: 48.39024, height: 52 }
|
||||||
wide: { width: 64, height: 52 }
|
wide: { width: 62, height: 52 }
|
||||||
spaceline: { width: 142, height: 52 }
|
outline7: { width: 88.97561, height: 52 }
|
||||||
special: { width: 44, height: 52 }
|
spaceline: { width: 150.5853, height: 52 }
|
||||||
|
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -26,7 +25,7 @@ views:
|
|||||||
symbols:
|
symbols:
|
||||||
- "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
|
- "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
|
||||||
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
|
- "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
|
||||||
- "show_numbers_from_symbols backslash slash less greater equal bracketleft bracketright BackSpace"
|
- "show_numbers backslash slash less greater equal bracketleft bracketright BackSpace"
|
||||||
- "show_letters preferences space . Return"
|
- "show_letters preferences space . Return"
|
||||||
|
|
||||||
buttons:
|
buttons:
|
||||||
@ -38,27 +37,22 @@ buttons:
|
|||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "key-shift"
|
icon: "key-shift"
|
||||||
BackSpace:
|
BackSpace:
|
||||||
outline: altline
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: erase
|
action: erase
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "special"
|
outline: "altline"
|
||||||
icon: "keyboard-mode-symbolic"
|
icon: "keyboard-mode-symbolic"
|
||||||
show_numbers:
|
show_numbers:
|
||||||
outline: "wide"
|
|
||||||
action:
|
action:
|
||||||
set_view: "numbers"
|
set_view: "numbers"
|
||||||
label: "123"
|
outline: "altline"
|
||||||
show_numbers_from_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: altline
|
|
||||||
label: "123"
|
label: "123"
|
||||||
show_letters:
|
show_letters:
|
||||||
outline: "wide"
|
|
||||||
action:
|
action:
|
||||||
set_view: "base"
|
set_view: "base"
|
||||||
|
outline: "altline"
|
||||||
label: "ABC"
|
label: "ABC"
|
||||||
show_symbols:
|
show_symbols:
|
||||||
action:
|
action:
|
||||||
@ -66,7 +60,7 @@ buttons:
|
|||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "*/="
|
label: "*/="
|
||||||
".":
|
".":
|
||||||
outline: "special"
|
outline: altline
|
||||||
space:
|
space:
|
||||||
outline: spaceline
|
outline: spaceline
|
||||||
text: " "
|
text: " "
|
||||||
@ -162,3 +156,4 @@ buttons:
|
|||||||
text: "["
|
text: "["
|
||||||
bracketright:
|
bracketright:
|
||||||
text: "]"
|
text: "]"
|
||||||
|
|
||||||
|
|||||||
@ -1,44 +1,38 @@
|
|||||||
---
|
---
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 35.33, height: 46 }
|
default: { width: 35.33, height: 52 }
|
||||||
action: { width: 59, height: 46 }
|
action: { width: 59, height: 52 }
|
||||||
altline: { width: 52.67, height: 46 }
|
altline: { width: 52.67, height: 52 }
|
||||||
wide: { width: 59, height: 46 }
|
wide: { width: 59, height: 52 }
|
||||||
spaceline: { width: 140, height: 46 }
|
spaceline: { width: 140, height: 52 }
|
||||||
special: { width: 44, height: 46 }
|
special: { width: 44, height: 52 }
|
||||||
small: { width: 59, height: 22 }
|
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
- "Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "q w e r t y u i o p"
|
- "q w e r t y u i o p"
|
||||||
- "a s d f g h j k l"
|
- "a s d f g h j k l"
|
||||||
- "Shift_L z x c v b n m BackSpace"
|
- "Shift_L z x c v b n m BackSpace"
|
||||||
- "show_numbers preferences space show_actions Return"
|
- "show_numbers preferences space show_actions Return"
|
||||||
upper:
|
upper:
|
||||||
- "Ctrl Alt PgUp PgDn Home End"
|
|
||||||
- "Q W E R T Y U I O P"
|
- "Q W E R T Y U I O P"
|
||||||
- "A S D F G H J K L"
|
- "A S D F G H J K L"
|
||||||
- "Shift_L Z X C V B N M BackSpace"
|
- "Shift_L Z X C V B N M BackSpace"
|
||||||
- "show_numbers preferences space show_actions Return"
|
- "show_numbers preferences space show_actions Return"
|
||||||
numbers:
|
numbers:
|
||||||
- "Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
- "1 2 3 4 5 6 7 8 9 0"
|
||||||
- "* # $ / & - _ + ( )"
|
- "* # $ / & - _ + ( )"
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
||||||
- "show_letters preferences space period Return"
|
- "show_letters preferences space period Return"
|
||||||
symbols:
|
symbols:
|
||||||
- "Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
- "~ ` | · √ π τ ÷ × ¶"
|
||||||
- "© ® £ € ¥ ^ ° @ { }"
|
- "© ® £ € ¥ ^ ° @ { }"
|
||||||
- "show_numbers_from_symbols \\ % < > = [ ] BackSpace"
|
- "show_numbers_from_symbols \\ % < > = [ ] BackSpace"
|
||||||
- "show_letters preferences space period Return"
|
- "show_letters preferences space period Return"
|
||||||
actions:
|
actions:
|
||||||
- "Ctrl Alt PgUp PgDn Home End"
|
|
||||||
- "F1 F2 F3 F4 F5 F6"
|
- "F1 F2 F3 F4 F5 F6"
|
||||||
- "F7 F8 F9 F10 F11 F12"
|
- "F7 F8 F9 F10 F11 F12"
|
||||||
- "Esc Tab Pause Insert Up Del"
|
- "Esc Tab Del PgUp ↑ PgDn"
|
||||||
- "show_letters Menu Break Left Down Right"
|
- "show_letters Home End ← ↓ →"
|
||||||
|
|
||||||
buttons:
|
buttons:
|
||||||
Shift_L:
|
Shift_L:
|
||||||
@ -138,63 +132,28 @@ buttons:
|
|||||||
Del:
|
Del:
|
||||||
outline: "action"
|
outline: "action"
|
||||||
keysym: "Delete"
|
keysym: "Delete"
|
||||||
Insert:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Insert"
|
|
||||||
Menu:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Menu"
|
|
||||||
Pause:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Pause"
|
|
||||||
Break:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Break"
|
|
||||||
Home:
|
Home:
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "Home"
|
keysym: "Home"
|
||||||
End:
|
End:
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "End"
|
keysym: "End"
|
||||||
PgUp:
|
PgUp:
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "Page_Up"
|
keysym: "Page_Up"
|
||||||
PgDn:
|
PgDn:
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "Page_Down"
|
keysym: "Page_Down"
|
||||||
"↑":
|
"↑":
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "Up"
|
keysym: "Up"
|
||||||
"↓":
|
"↓":
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "Down"
|
keysym: "Down"
|
||||||
"←":
|
"←":
|
||||||
outline: "small"
|
outline: "action"
|
||||||
keysym: "Left"
|
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"
|
outline: "action"
|
||||||
keysym: "Right"
|
keysym: "Right"
|
||||||
Ctrl:
|
|
||||||
modifier: "Control"
|
|
||||||
outline: "small"
|
|
||||||
label: "Ctrl"
|
|
||||||
Alt:
|
|
||||||
modifier: "Alt"
|
|
||||||
outline: "small"
|
|
||||||
label: "Alt"
|
|
||||||
@ -1,220 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
action: { width: 59, height: 46 }
|
|
||||||
small: { width: 50, height: 22 }
|
|
||||||
default: { width: 35.33, height: 46 }
|
|
||||||
altline: { width: 48, height: 46 }
|
|
||||||
wide: { width: 50, height: 46 }
|
|
||||||
spaceline: { width: 110, height: 46 }
|
|
||||||
special: { width: 44, height: 46 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "Ctrl Alt Tabsmall ↑ ↓ ← →"
|
|
||||||
- "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 period BackSpace"
|
|
||||||
- "show_numbers preferences space show_eschars show_actions Return"
|
|
||||||
upper:
|
|
||||||
- "Ctrl Alt Tabsmall PgUp PgDn Home End"
|
|
||||||
- "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 show_actions Return"
|
|
||||||
numbers:
|
|
||||||
- "Ctrl Alt Tabsmall ↑ ↓ ← →"
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "@ # € % & - _ + ( )"
|
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
|
||||||
- "show_letters preferences space show_eschars show_actions Return"
|
|
||||||
symbols:
|
|
||||||
- "Ctrl Alt Tabsmall ↑ ↓ ← →"
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ $ ¥ ^ ° * { }"
|
|
||||||
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters preferences space show_eschars show_actions Return"
|
|
||||||
eschars:
|
|
||||||
- "Ctrl Alt Tabsmall ↑ ↓ ← →"
|
|
||||||
- "à â ç é è ê î ô ù û"
|
|
||||||
- "À Â Ç É È Ê Î Ô Ù Û"
|
|
||||||
- "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace"
|
|
||||||
- "show_letters preferences space show_eschars show_actions Return"
|
|
||||||
actions:
|
|
||||||
- "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:
|
|
||||||
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"
|
|
||||||
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"
|
|
||||||
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"
|
|
||||||
period:
|
|
||||||
outline: "special"
|
|
||||||
text: "."
|
|
||||||
show_actions:
|
|
||||||
action:
|
|
||||||
set_view: "actions"
|
|
||||||
outline: "special"
|
|
||||||
label: ">_"
|
|
||||||
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"
|
|
||||||
@ -1,223 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
action: { width: 90, height: 37 }
|
|
||||||
small: { width: 67.4, height: 22 }
|
|
||||||
default: { width: 54, height: 37 }
|
|
||||||
altline: { width: 81, height: 37 }
|
|
||||||
wide: { width: 100, height: 37 }
|
|
||||||
spaceline: { width: 110, height: 37 }
|
|
||||||
special: { width: 54, height: 37 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "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 period BackSpace"
|
|
||||||
- "show_numbers preferences space show_eschars show_actions Return"
|
|
||||||
upper:
|
|
||||||
- "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
|
|
||||||
- "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 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 show_eschars show_actions Return"
|
|
||||||
symbols:
|
|
||||||
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ $ ¥ ^ ° * { }"
|
|
||||||
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters preferences space show_eschars show_actions Return"
|
|
||||||
eschars:
|
|
||||||
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "à â ç é è ê î ô ù û"
|
|
||||||
- "À Â Ç É È Ê Î Ô Ù Û"
|
|
||||||
- "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace"
|
|
||||||
- "show_letters preferences space show_eschars show_actions 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:
|
|
||||||
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"
|
|
||||||
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"
|
|
||||||
period:
|
|
||||||
outline: "special"
|
|
||||||
text: "."
|
|
||||||
show_actions:
|
|
||||||
action:
|
|
||||||
set_view: "actions"
|
|
||||||
outline: "special"
|
|
||||||
label: ">_"
|
|
||||||
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"
|
|
||||||
@ -1,208 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
||||||
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"
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 75, height: 56 }
|
|
||||||
altline: { width: 75, height: 56 }
|
|
||||||
wide: { width: 135, height: 56 }
|
|
||||||
spaceline: { width: 450, height: 56 }
|
|
||||||
spacelinesymbol: { width: 300, height: 56 }
|
|
||||||
special: { width: 90, height: 56 }
|
|
||||||
|
|
||||||
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 spacesymbol period Return"
|
|
||||||
symbols:
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ € ¥ ^ ° * { }"
|
|
||||||
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters preferences spacesymbol 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: " "
|
|
||||||
spacesymbol:
|
|
||||||
outline: "spacelinesymbol"
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
text: ":"
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 32, height: 52 }
|
|
||||||
altline: { width: 32, height: 52 }
|
|
||||||
wide: { width: 57, height: 52 }
|
|
||||||
narrow: { width: 26, height: 52 }
|
|
||||||
spaceline: { width: 107, height: 52 }
|
|
||||||
fill: { width: 159, height: 52 }
|
|
||||||
special: { width: 42, height: 52 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "й ц у к е н г ш щ з х"
|
|
||||||
- "ф і в а п р о л д ж є"
|
|
||||||
- "Shift_L я ч с м и т ь б ю BackSpace"
|
|
||||||
- "show_numbers preferences ґ space ї period Return"
|
|
||||||
upper:
|
|
||||||
- "Й Ц У К Е Н Г Ш Щ З Х"
|
|
||||||
- "Ф І В А П Р О Л Д Ж Є"
|
|
||||||
- "Shift_L Я Ч С М И Т Ь Б Ю BackSpace"
|
|
||||||
- "show_numbers preferences Ґ space Ї comma Return"
|
|
||||||
numbers:
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "@ # $ % & - _ + ( )"
|
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
|
||||||
- "show_letters preferences space_fill period Return"
|
|
||||||
symbols:
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ € ¥ ^ ° * { }"
|
|
||||||
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters preferences space_fill 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: "wide"
|
|
||||||
label: "123"
|
|
||||||
show_letters:
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "wide"
|
|
||||||
label: "АБВ"
|
|
||||||
show_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "symbols"
|
|
||||||
outline: "wide"
|
|
||||||
label: "*/="
|
|
||||||
period:
|
|
||||||
outline: "special"
|
|
||||||
text: "."
|
|
||||||
comma:
|
|
||||||
outline: "special"
|
|
||||||
text: ","
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
text: " "
|
|
||||||
space_fill:
|
|
||||||
outline: "fill"
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
text: ":"
|
|
||||||
ґ:
|
|
||||||
outline: "narrow"
|
|
||||||
Ґ:
|
|
||||||
outline: "narrow"
|
|
||||||
ї:
|
|
||||||
outline: "narrow"
|
|
||||||
Ї:
|
|
||||||
outline: "narrow"
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
---
|
|
||||||
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: ":"
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
---
|
|
||||||
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:
|
|
||||||
- "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 . 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 . 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: "*/="
|
|
||||||
".":
|
|
||||||
outline: "special"
|
|
||||||
text: "."
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
text: ":"
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
---
|
|
||||||
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 p y f g c r l BackSpace"
|
|
||||||
- "a o e u i d h t n s"
|
|
||||||
- ", q j k x b m w v z"
|
|
||||||
- "show_numbers preferences space period Return"
|
|
||||||
upper:
|
|
||||||
- "Shift_L P Y F G C R L BackSpace"
|
|
||||||
- "A O E U I D H T N S"
|
|
||||||
- ", Q J K X B M W V Z"
|
|
||||||
- "show_numbers preferences space period Return"
|
|
||||||
numbers:
|
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
|
||||||
- "* # $ / & - _ + ( )"
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "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: ":"
|
|
||||||
|
|
||||||
# The US QWERTY layout has fewer letters on the third row, and so has
|
|
||||||
# the shift & backspace keys placed there. In contrast, the US DVORAK
|
|
||||||
# layout has fewer letters on the first row, which makes it a good
|
|
||||||
# choice for the shift & backspace keys. That leads to what may be,
|
|
||||||
# for many people, an unexpected layout in numbers mode: the numerals
|
|
||||||
# are on the third row (not the first) so that the backspace key
|
|
||||||
# remains in a consistent location regardless of mode, without
|
|
||||||
# sacrificing key width. (Once could argue that in numbers mode, the
|
|
||||||
# numerals should be closer to the enter key.) As with any keyboard
|
|
||||||
# layout, familiarity comes with repeated use.
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
---
|
|
||||||
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 p y f g c r l BackSpace"
|
|
||||||
- "a o e u i d h t n s"
|
|
||||||
- ", q j k x b m w v z"
|
|
||||||
- "show_numbers preferences space period Return"
|
|
||||||
upper:
|
|
||||||
- "Shift_L P Y F G C R L BackSpace"
|
|
||||||
- "A O E U I D H T N S"
|
|
||||||
- ", Q J K X B M W V Z"
|
|
||||||
- "show_numbers preferences space period Return"
|
|
||||||
numbers:
|
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
|
||||||
- "* # $ / & - _ + ( )"
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "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: ":"
|
|
||||||
|
|
||||||
# The US QWERTY layout has fewer letters on the third row, and so has
|
|
||||||
# the shift & backspace keys placed there. In contrast, the US DVORAK
|
|
||||||
# layout has fewer letters on the first row, which makes it a good
|
|
||||||
# choice for the shift & backspace keys. That leads to what may be,
|
|
||||||
# for many people, an unexpected layout in numbers mode: the numerals
|
|
||||||
# are on the third row (not the first) so that the backspace key
|
|
||||||
# remains in a consistent location regardless of mode, without
|
|
||||||
# sacrificing key width. (Once could argue that in numbers mode, the
|
|
||||||
# numerals should be closer to the enter key.) As with any keyboard
|
|
||||||
# layout, familiarity comes with repeated use.
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
bg Български
|
|
||||||
de Немски
|
|
||||||
es Испански
|
|
||||||
emoji Емоджи
|
|
||||||
fi Френски
|
|
||||||
gr Гръцки
|
|
||||||
it Италянски
|
|
||||||
no Норевежки
|
|
||||||
pl Полски
|
|
||||||
ru Руски
|
|
||||||
se Шведски
|
|
||||||
terminal Терминал
|
|
||||||
us Английски (САЩ)
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
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)
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
emoji ایموجی
|
|
||||||
terminal ترمینال
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
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)
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
be בלגית
|
|
||||||
br פורטוגזית (ברזיל)
|
|
||||||
cz צ'כית
|
|
||||||
de גרמנית
|
|
||||||
dk דנית
|
|
||||||
es ספרדית
|
|
||||||
emoji אימוג'י
|
|
||||||
fi פינית
|
|
||||||
fr צרפתית
|
|
||||||
gr יוונית
|
|
||||||
il עברית
|
|
||||||
it איטלקית
|
|
||||||
no נורווגית
|
|
||||||
pl פולנית
|
|
||||||
ru רוסית
|
|
||||||
se שוודית
|
|
||||||
terminal טרמינל
|
|
||||||
ua אוקראינית
|
|
||||||
us אנגלית (ארה"ב)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
de Немецкий
|
|
||||||
es Испанский
|
|
||||||
fi Финский
|
|
||||||
gr Греческий
|
|
||||||
it Итальянский
|
|
||||||
no Норвежский
|
|
||||||
pl Польский
|
|
||||||
ru Русский
|
|
||||||
se Шведский
|
|
||||||
terminal Терминал
|
|
||||||
us Английский (США)
|
|
||||||
@ -7,20 +7,13 @@ squeekboard_resources = gnome.compile_resources(
|
|||||||
c_name: 'squeekboard',
|
c_name: 'squeekboard',
|
||||||
)
|
)
|
||||||
|
|
||||||
desktopconf = configuration_data()
|
|
||||||
desktopconf.set('bindir', bindir)
|
|
||||||
|
|
||||||
desktop_file = 'sm.puri.Squeekboard.desktop'
|
desktop_file = 'sm.puri.Squeekboard.desktop'
|
||||||
|
|
||||||
i18n.merge_file('desktop',
|
i18n.merge_file('desktop',
|
||||||
input: configure_file(
|
input: desktop_file + '.in',
|
||||||
input: desktop_file + '.in.in',
|
|
||||||
output: desktop_file + '.in',
|
|
||||||
configuration: desktopconf
|
|
||||||
),
|
|
||||||
output: desktop_file,
|
output: desktop_file,
|
||||||
po_dir: '../po',
|
po_dir: '../po',
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: desktopdir,
|
install_dir: join_paths(datadir, 'applications'),
|
||||||
type: 'desktop'
|
type: 'desktop'
|
||||||
)
|
)
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
Name=Squeekboard
|
Name=Squeekboard
|
||||||
GenericName=Squeekboard Virtual Keyboard
|
GenericName=Squeekboard Virtual Keyboard
|
||||||
Comment=Virtual Keyboard
|
Comment=Virtual Keyboard
|
||||||
Exec=@bindir@/squeekboard
|
Exec=squeekboard
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
NoDisplay=true
|
NoDisplay=true
|
||||||
@ -31,24 +31,15 @@ sq_button.wide {
|
|||||||
border-color: #3e3a44;
|
border-color: #3e3a44;
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.latched {
|
sq_button.locked {
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
color: #2b292f;
|
color: #2b292f;
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.locked {
|
|
||||||
background: #ffffff;
|
|
||||||
color: #1c71d8;
|
|
||||||
}
|
|
||||||
|
|
||||||
sq_button.action {
|
sq_button.action {
|
||||||
font-size: 0.75em;
|
font-size: 0.75em;
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.small {
|
|
||||||
font-size: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#Return {
|
#Return {
|
||||||
background: #1c71d8;
|
background: #1c71d8;
|
||||||
border-color: #1a5fb4;
|
border-color: #1a5fb4;
|
||||||
|
|||||||
@ -34,24 +34,15 @@ sq_button.wide {
|
|||||||
border-color: @borders; /* #3e3a44; */
|
border-color: @borders; /* #3e3a44; */
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.latched {
|
sq_button.locked {
|
||||||
background: @theme_fg_color; /*#ffffff;*/
|
background: @theme_fg_color; /*#ffffff;*/
|
||||||
color: @theme_bg_color; /*#2b292f;*/
|
color: @theme_bg_color; /*#2b292f;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.locked {
|
|
||||||
background: @theme_fg_color; /*#ffffff;*/
|
|
||||||
color: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#2b292f;*/
|
|
||||||
}
|
|
||||||
|
|
||||||
sq_button.action {
|
sq_button.action {
|
||||||
font-size: 0.75em;
|
font-size: 0.75em;
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.small {
|
|
||||||
font-size: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#Return {
|
#Return {
|
||||||
background: @theme_selected_bg_color; /* #1c71d8; */
|
background: @theme_selected_bg_color; /* #1c71d8; */
|
||||||
border-color: @borders; /*#1a5fb4;*/
|
border-color: @borders; /*#1a5fb4;*/
|
||||||
|
|||||||
343
debian/changelog
vendored
343
debian/changelog
vendored
@ -1,346 +1,3 @@
|
|||||||
squeekboard (1.14.0pureos0~amber0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* data: Split into loading and parsing
|
|
||||||
* layout: Remove unused code
|
|
||||||
* build: Fix unnecessary shell quotes
|
|
||||||
* popover: Allow spanning outside panel area
|
|
||||||
* cargo: Update dependencies before release
|
|
||||||
|
|
||||||
[ undef ]
|
|
||||||
* Fix typos jp keyboard comments
|
|
||||||
|
|
||||||
[ anteater ]
|
|
||||||
* use the correct GtkStyleProviderPriority to indicate that the styles are provided by the application
|
|
||||||
* remove some unnecessary unsafe code
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Sat, 15 May 2021 12:45:20 +0000
|
|
||||||
|
|
||||||
squeekboard (1.13.0pureos0~amber0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* layout: Latch keys when clicked twice
|
|
||||||
* layout: Add stateless view switching
|
|
||||||
* layout: Plug in stateless view switching
|
|
||||||
* layout: Remove the little abomination of view change promise
|
|
||||||
* view: Ąto-unlatching when multiple latching buttons pressed
|
|
||||||
* renderer: Bring button drawing closer to Rust
|
|
||||||
* ffi: Eliminate squeek_button and squeek_row
|
|
||||||
* imservice: Increment serials on receiving done, not sending commit
|
|
||||||
* input-method: Fix commit/done mixup in protocol text
|
|
||||||
* CI: fix xheck_tag to be compatible with Amber
|
|
||||||
* italian: Fix colon
|
|
||||||
* popover: Fix prematurely deallocated CString
|
|
||||||
* Rust: Remove unnecessary no_mangle statements to silence warnings
|
|
||||||
* renderer: Reduce reliance on knowing the transform
|
|
||||||
* renderer: Split mutable geometry and place it directly in GtkKeyboard
|
|
||||||
* Revert "moved data/langs/he_IL.txt -> data/langs/he-IL.txt to better conform with existing translations."
|
|
||||||
* layout: Make it possible to opt out of latching per-key
|
|
||||||
* renderer: Mark latched buttons differently than locked
|
|
||||||
* appearance: Colour latched/locked according to design
|
|
||||||
* docs: Describe view switching
|
|
||||||
* language-terminal: Place keyboards in a sub-path
|
|
||||||
* layout selection: Fix emoji and number
|
|
||||||
* rust: Fix compiler warnings
|
|
||||||
* layout: Take into account text purpose again
|
|
||||||
* layouts: Make selection testable
|
|
||||||
* layouts: Stop assuming that layout name always changes on switch
|
|
||||||
* Cargo: Version bump
|
|
||||||
|
|
||||||
[ J.D. Laub ]
|
|
||||||
* Add US Dvorak layout (and Colemak wide)
|
|
||||||
* Add US Dvorak layout (and Colemak wide)
|
|
||||||
|
|
||||||
[ Jordi Masip ]
|
|
||||||
* Catalan keyboard layout
|
|
||||||
|
|
||||||
[ Myth ]
|
|
||||||
* Added hebrew keyboard layout
|
|
||||||
|
|
||||||
[ David96 ]
|
|
||||||
* Add Mod4 (Windows) key
|
|
||||||
|
|
||||||
[ Panawat Wong-klaew ]
|
|
||||||
* Add wide Thai keyboard layout
|
|
||||||
|
|
||||||
[ Guido Günther ]
|
|
||||||
* server-main: Add quit()
|
|
||||||
* server-main: Properly register to gnome-session (Closes: #274)
|
|
||||||
|
|
||||||
[ Kozova1 ]
|
|
||||||
* Added Hebrew translations for most layouts.
|
|
||||||
* moved data/langs/he_IL.txt -> data/langs/he-IL.txt to better conform with existing translations.
|
|
||||||
* Fixed Hebrew layout.
|
|
||||||
* moved data/langs/he_IL.txt -> data/langs/he-IL.txt to better conform with existing translations.
|
|
||||||
|
|
||||||
[ M33 ]
|
|
||||||
* Revert "Update tests/meson.build"
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Mon, 12 Apr 2021 10:40:32 +0000
|
|
||||||
|
|
||||||
squeekboard (1.12.0pureos0~amber0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* docs: Correct Cargo update instructions
|
|
||||||
* visibility: Centralize keyboard panel visibility policy and handling
|
|
||||||
* build: Fix release
|
|
||||||
* tests: Prefer the env var for finding test layouts
|
|
||||||
* tests: Explicitly pass source directory to tests
|
|
||||||
* debian: Build reproducibly
|
|
||||||
* tests: Allow legacy mode to have much longer tests.
|
|
||||||
* build: Enable unused warnings in C
|
|
||||||
* build: Enable wformat to remove warnings about missing wformat
|
|
||||||
* build: Fail on any C warnings when strict
|
|
||||||
* data: Made data flow in fallback clearer
|
|
||||||
* data: Flattened layout fallback function
|
|
||||||
* layouts: Use base as fallback for alternative layouts
|
|
||||||
* layouts: Simplify the main flow of source list
|
|
||||||
* tests: Add some description to the list of tested layouts
|
|
||||||
* layout_names: Unmess the list of builtin layouts
|
|
||||||
* dbus: Reset hints if text input missing
|
|
||||||
* visibility: Stop calling GTK functions from the visibility manager
|
|
||||||
|
|
||||||
[ Wannaphong Phatthiyaphaibun ]
|
|
||||||
* Add thai keyboard
|
|
||||||
* Update resources.rs
|
|
||||||
* Update meson.build
|
|
||||||
* escape " on thai keyboard
|
|
||||||
|
|
||||||
[ clonex10100 ]
|
|
||||||
* Added US Colemak Keyboard Layout
|
|
||||||
|
|
||||||
[ Henry-Nicolas Tourneur ]
|
|
||||||
* d/rules: fix an FTBFS on mips64el with GOT > 64kb
|
|
||||||
* d/rules: export RUSTFLAGS only on architecture that needs it
|
|
||||||
* d/rules: export RUSTFLAGS only on architecture that needs it
|
|
||||||
|
|
||||||
[ Jiří Stránský ]
|
|
||||||
* Add Czech keyboard layouts
|
|
||||||
|
|
||||||
[ Stefan Grotz ]
|
|
||||||
* Esperanto keyboard
|
|
||||||
|
|
||||||
[ Vladimir ]
|
|
||||||
* Bulgarian language keyboard layout
|
|
||||||
|
|
||||||
[ Vladimir Stoilov ]
|
|
||||||
* bulgarian add translation and to needed lists
|
|
||||||
* Fix bulgarian layout size
|
|
||||||
|
|
||||||
[ Andreas Rönnquist ]
|
|
||||||
* no: Use wide button switching between numbers, symbols and base
|
|
||||||
|
|
||||||
[ jranaraki ]
|
|
||||||
* Farsi/Persian keyboard layout
|
|
||||||
* Farsi/Persian keyboard layout
|
|
||||||
* Added requirements to resources.rs and meson.build
|
|
||||||
* Updated the layout to provide more convenient and faster typing experience
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Sun, 10 Jan 2021 09:43:42 +0000
|
|
||||||
|
|
||||||
squeekboard (1.11.1) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Mark Müller ]
|
|
||||||
* keyboard: Fix semicolon in German layout
|
|
||||||
* keyboard: Move semicolon in German layout to numbers view replacing redundant comma key
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* imservice: Set up UI according to current needs when it shows up
|
|
||||||
* UI: Keep visibility factors in a central place
|
|
||||||
* cargo: Update deps
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Sat, 21 Nov 2020 11:08:06 +0000
|
|
||||||
|
|
||||||
squeekboard (1.11.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* UI: Delay hiding only when leaving a text field
|
|
||||||
* ui: Cancel hiding delay when activity requested again
|
|
||||||
* Update dependencies
|
|
||||||
|
|
||||||
[ Fabio Tomat ]
|
|
||||||
* Update fur-IT.txt fix typo for Spanish
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Sat, 14 Nov 2020 06:46:28 +0000
|
|
||||||
|
|
||||||
squeekboard (1.10.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* virtual_keyboard: Fix desynced modifiers state
|
|
||||||
* rust: Fix deprecation warnings
|
|
||||||
* docs: Tutorial syntax cleanups
|
|
||||||
* docs: Reorganize tutorial
|
|
||||||
* build: Error on repeating declarations
|
|
||||||
* keymap: Generate from symbol map, not layout
|
|
||||||
* data: Restore testability of action->keysym conversion
|
|
||||||
* syntax: Let older rustc understand symbolmap's lifetime
|
|
||||||
* debian: Insert a "breaks" for librem5-base < 24
|
|
||||||
* keymap: Keep keymap fd management in one place
|
|
||||||
* vkeyboard: Use a generic slice instead of a vector
|
|
||||||
* tests: Check for missing return in builtin layouts except emoji
|
|
||||||
* keymap: Concentrate special handling of BackSpace, which is implicit in Erase action
|
|
||||||
* keymaps: Use multiple key maps, each within the limit of what Xorg can accept.
|
|
||||||
* build: Avoid MaybeUninit on older Debian
|
|
||||||
* tests: Fix bad field access
|
|
||||||
* cargo: Update dependencies
|
|
||||||
|
|
||||||
[ Guido Günther ]
|
|
||||||
* eekboard-context-service: Return early if schema is unavailable
|
|
||||||
* treewide: Use new style function definitions
|
|
||||||
* build: Enable '-Wold-style-definition' '-Wstrict-prototypes'
|
|
||||||
* build: Enable '-Wunused-function'
|
|
||||||
* eekboard-context-service: Drop EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE
|
|
||||||
* keyboard: Fix warning
|
|
||||||
* layout: Fix warning
|
|
||||||
* gitlab-ci: Enable --Werror
|
|
||||||
* eek-keyboard: Don't ignore return value
|
|
||||||
* build: Enable -Winit-self
|
|
||||||
* build: Enable -Wformat-security
|
|
||||||
* build: Enable -Wmaybe-uninitialized
|
|
||||||
* treewide: Drop redundant declarations
|
|
||||||
* build: Enable -Wredundant-declarations
|
|
||||||
* ServerContextService: Drop GObject boilerplate
|
|
||||||
* build: Enable '-Wformat-nonliteral'
|
|
||||||
* eekboad-context-service: Drop signal class handler
|
|
||||||
* eekboard-context-service: Drop docstrings for inexistent functions
|
|
||||||
* eekboard-context-service: Drop the GObject boilerplate
|
|
||||||
* eekboard-context-service: Drop private struct
|
|
||||||
* server-context-service: Consistenty name self argument 'self'
|
|
||||||
* server-context-service: swap signal arguments
|
|
||||||
* server-context-service: Don't show keyboard when disabled (Closes: #222)
|
|
||||||
|
|
||||||
[ Nazarii Kretovych ]
|
|
||||||
* Add Ukrainian keyboard layout.
|
|
||||||
|
|
||||||
[ Benjamin Schaaf ]
|
|
||||||
* Fix spelling mistakes in doc/hacking.md
|
|
||||||
* Expand the development documentation in the readme
|
|
||||||
* Expand key press detection to the edges of the view's bounding box
|
|
||||||
* Sort layouts by type before sorting by name
|
|
||||||
* Fix leak in level_keyboard_new
|
|
||||||
* Fix leak endlessly adding a resource path to the default theme
|
|
||||||
* Add settings option to popover
|
|
||||||
|
|
||||||
[ Al ]
|
|
||||||
* proposal for belgian layout (copy of fr)
|
|
||||||
* alphabetical order for src/resources.rs tests/meson.build
|
|
||||||
|
|
||||||
[ Arnaud Ferraris ]
|
|
||||||
* eek-gtk-keyboard: use virtual resolution to check arrangement kind
|
|
||||||
* server-context-service: optimize height calculation
|
|
||||||
* keyboards: add wide French layout
|
|
||||||
* keyboards: add wide Belgian layout
|
|
||||||
* keyboards: add wide terminal layout
|
|
||||||
|
|
||||||
[ Fabio Tomat ]
|
|
||||||
* Revert "Add friulian keyboard"
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Mon, 19 Oct 2020 14:07:01 +0000
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
[ 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
|
|
||||||
|
|
||||||
[ Sebastian Krzyszkowiak ]
|
|
||||||
* Revert "Merge branch 'btantau-master-patch-76686' into 'master'"
|
|
||||||
* Terminal layout: another approach
|
|
||||||
|
|
||||||
[ Luís Fernando Stürmer da Rosa ]
|
|
||||||
* Brazilian Portuguese Keyboard Layout.
|
|
||||||
|
|
||||||
-- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> Wed, 05 Aug 2020 16:16:08 +0200
|
|
||||||
|
|
||||||
squeekboard (1.9.2) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ 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
|
|
||||||
|
|
||||||
[ 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
|
|
||||||
|
|
||||||
[ Vlad ]
|
|
||||||
* Fresh Russian layout
|
|
||||||
|
|
||||||
[ Jordi Masip ]
|
|
||||||
* Removed unused dependency 'libcroco'
|
|
||||||
|
|
||||||
[ Florian Klink ]
|
|
||||||
* sm.puri.Squeekboard.desktop: make path to Exec= absolute
|
|
||||||
|
|
||||||
[ Ole Guldberg ]
|
|
||||||
* Danish keyboard layout
|
|
||||||
* Danish keyboard layout
|
|
||||||
* add test for danish layout
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Mon, 01 Jun 2020 09:39:12 +0000
|
|
||||||
|
|
||||||
squeekboard (1.9.1) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ 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/
|
|
||||||
|
|
||||||
[ &t ]
|
|
||||||
* Fix minor comment typos
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* cargo: Bump package versions before release
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Sun, 08 Mar 2020 10:04:29 +0000
|
|
||||||
|
|
||||||
squeekboard (1.9.0) amber-phone; urgency=medium
|
squeekboard (1.9.0) amber-phone; urgency=medium
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
[ Dorota Czaplejewicz ]
|
||||||
|
|||||||
3
debian/check_release.py
vendored
3
debian/check_release.py
vendored
@ -5,7 +5,6 @@ Feed it the first changelog line, and then all available tags.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import re, sys
|
import re, sys
|
||||||
version = re.findall("\\((.*)\\)", input())[0]
|
tag = "v" + re.findall("\\((.*)\\)", input())[0]
|
||||||
tag = 'v' + re.findall("([0-9]+\\.[0-9]+\\.[0-9]+).*", version)[0]
|
|
||||||
if tag not in map(str.strip, sys.stdin.readlines()):
|
if tag not in map(str.strip, sys.stdin.readlines()):
|
||||||
raise Exception("Changelog's current version doesn't have a tag. Push the tag!")
|
raise Exception("Changelog's current version doesn't have a tag. Push the tag!")
|
||||||
|
|||||||
6
debian/control
vendored
6
debian/control
vendored
@ -11,7 +11,7 @@ Build-Depends:
|
|||||||
libglib2.0-dev,
|
libglib2.0-dev,
|
||||||
libgnome-desktop-3-dev,
|
libgnome-desktop-3-dev,
|
||||||
libgtk-3-dev,
|
libgtk-3-dev,
|
||||||
libfeedback-dev,
|
libcroco3-dev,
|
||||||
librust-bitflags-1-dev (>= 1.0),
|
librust-bitflags-1-dev (>= 1.0),
|
||||||
librust-clap-2+default-dev (>= 2.32),
|
librust-clap-2+default-dev (>= 2.32),
|
||||||
librust-gio+v2-44-dev,
|
librust-gio+v2-44-dev,
|
||||||
@ -25,8 +25,6 @@ Build-Depends:
|
|||||||
librust-serde-yaml-0.8-dev (>= 0.8),
|
librust-serde-yaml-0.8-dev (>= 0.8),
|
||||||
librust-xkbcommon-0.4+wayland-dev (>= 0.4),
|
librust-xkbcommon-0.4+wayland-dev (>= 0.4),
|
||||||
libwayland-dev (>= 1.16),
|
libwayland-dev (>= 1.16),
|
||||||
lsb-release,
|
|
||||||
python3,
|
|
||||||
rustc,
|
rustc,
|
||||||
wayland-protocols (>= 1.14),
|
wayland-protocols (>= 1.14),
|
||||||
Standards-Version: 4.1.3
|
Standards-Version: 4.1.3
|
||||||
@ -39,8 +37,6 @@ Depends:
|
|||||||
gnome-themes-extra-data,
|
gnome-themes-extra-data,
|
||||||
${shlibs:Depends},
|
${shlibs:Depends},
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
Breaks:
|
|
||||||
librem5-base (<< 24),
|
|
||||||
Description: On-screen keyboard for Wayland
|
Description: On-screen keyboard for Wayland
|
||||||
Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
|
Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
|
||||||
|
|
||||||
|
|||||||
34
debian/rules
vendored
34
debian/rules
vendored
@ -2,42 +2,14 @@
|
|||||||
|
|
||||||
export CARGO_HOME = $(CURDIR)/debian/cargo
|
export CARGO_HOME = $(CURDIR)/debian/cargo
|
||||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
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))
|
|
||||||
legacy = true
|
|
||||||
else
|
|
||||||
legacy = false
|
|
||||||
endif
|
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@ --builddirectory=_build --buildsystem=meson
|
dh $@ --builddirectory=_build --buildsystem=meson
|
||||||
|
|
||||||
# The Debian version of linked-hash-map doesn't provide any hash,
|
# The Debian version of linked-hash-map doesn't provide any hash,
|
||||||
# causing Cargo to refuse to build with a crates.io copy
|
# causing Cargo to refuse to build with a crates.io copy
|
||||||
override_dh_auto_configure:
|
build-arch:
|
||||||
[ ! -f Cargo.lock ] || rm Cargo.lock
|
rm Cargo.lock
|
||||||
dh_auto_configure -- -Dlegacy=$(legacy)
|
dh $@ --builddirectory=_build --buildsystem=meson
|
||||||
|
|
||||||
override_dh_autoreconf:
|
override_dh_autoreconf:
|
||||||
|
|||||||
@ -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.
|
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.
|
This project aims to give users the power to make the software work for them by blurring the lines between users and developers.
|
||||||
|
|
||||||
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:
|
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:
|
||||||
|
|
||||||
- to use the software,
|
- to use the software,
|
||||||
- to modify its resources,
|
- to modify its resources,
|
||||||
- to change its behavior,
|
- to change its behaviour,
|
||||||
- to contribute upstream.
|
- 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:
|
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 usable,
|
- being quick and useable,
|
||||||
- allowing local overrides of resources and config,
|
- allowing local overrides of resources and config,
|
||||||
- storing resources and config as editable, standard files,
|
- storing resources and config as editable, standard files,
|
||||||
- having complete, up to date documentation of interfaces,
|
- 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 code that is [simple and obvious](https://www.python.org/dev/peps/pep-0020/),
|
||||||
- having an easy process of testing and accepting contributions.
|
- 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 benefiting the user compared to those benefiting 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 benefitting the user compared to those benefitting regular contributors.
|
||||||
|
|
||||||
Sending patches
|
Sending patches
|
||||||
---------------
|
---------------
|
||||||
@ -43,7 +43,7 @@ By submitting a change to this project, you agree to license it under the [GPL l
|
|||||||
Development environment
|
Development environment
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
*Squeekboard* is regularly built and tested on [the development environment](https://developer.puri.sm/Librem5/Development_Environment.html).
|
*Squeekboard* is regularly built and tested on [the develpment environment](https://developer.puri.sm/Librem5/Development_Environment.html).
|
||||||
|
|
||||||
Recent Fedora releases are likely to be tested as well.
|
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:
|
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 ([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))
|
- skipping brackets `{}` after every `if()`, `else`, and similar
|
||||||
|
|
||||||
Bad example:
|
Bad example:
|
||||||
|
|
||||||
@ -162,7 +162,7 @@ Maintenance
|
|||||||
|
|
||||||
Squeekboard uses Rust & Cargo for some of its dependencies.
|
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 positional 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 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:
|
||||||
|
|
||||||
```
|
```
|
||||||
cd build_dir
|
cd build_dir
|
||||||
@ -175,14 +175,10 @@ All Cargo dependencies must be selected in the version available in PureOS, and
|
|||||||
|
|
||||||
Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.
|
Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.
|
||||||
|
|
||||||
`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It must correspond to the default dependency configuration: without flags to use older or newer versions of dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
|
`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
|
||||||
|
|
||||||
```
|
```
|
||||||
cd build_dir
|
cd build_dir
|
||||||
ninja ./Cargo.toml
|
|
||||||
sh /source_path/cargo.sh update
|
sh /source_path/cargo.sh update
|
||||||
ninja test
|
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.
|
|
||||||
|
|||||||
@ -6,7 +6,6 @@ Contents
|
|||||||
|
|
||||||
* [Tutorial](tutorial.md)
|
* [Tutorial](tutorial.md)
|
||||||
* [Contributing](hacking.md)
|
* [Contributing](hacking.md)
|
||||||
* [Switching views](views.md)
|
|
||||||
|
|
||||||
Introduction
|
Introduction
|
||||||
------------
|
------------
|
||||||
@ -22,8 +21,6 @@ Layouts are created using a text-based format, based on YAML.
|
|||||||
|
|
||||||
TODO: Provide a description of the format.
|
TODO: Provide a description of the format.
|
||||||
|
|
||||||
Squeekboard layouts are separated into *views* and use a *room metaphor* to [switch views](views.md).
|
|
||||||
|
|
||||||
Contributions
|
Contributions
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|||||||
594
doc/latching.svg
594
doc/latching.svg
@ -1,594 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
width="177.92439mm"
|
|
||||||
height="88.144363mm"
|
|
||||||
viewBox="0 0 177.92439 88.144364"
|
|
||||||
version="1.1"
|
|
||||||
id="svg8"
|
|
||||||
sodipodi:docname="latching.svg"
|
|
||||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
|
||||||
<defs
|
|
||||||
id="defs2">
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Mend"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Mend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.4,0,0,-0.4,-4,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1098" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow2Sstart"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow2Sstart"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(0.3,0,0,0.3,-0.69,0)"
|
|
||||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
|
||||||
id="path1119" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow2Mstart"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow2Mstart"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="scale(0.6)"
|
|
||||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
|
||||||
id="path1113" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-5" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect848" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect848-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-9" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect848-8" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect916" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-4" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect951" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect986" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect1061" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-5"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#00ad12;fill-opacity:1;fill-rule:evenodd;stroke:#00ad12;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-7" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect1549" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-8"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#101010;fill-opacity:1;fill-rule:evenodd;stroke:#101010;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-8" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-3" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect1845" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-38" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect1960" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-3-9" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect2304" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-3-4" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect2304-7" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#6c6c6c;fill-opacity:1;fill-rule:evenodd;stroke:#6c6c6c;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2-6"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#00ad12;fill-opacity:1;fill-rule:evenodd;stroke:#00ad12;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89-8" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-21" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect2574" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2-6-1"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#00ad12;fill-opacity:1;fill-rule:evenodd;stroke:#00ad12;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89-8-0" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2-6-6"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#00ad12;fill-opacity:1;fill-rule:evenodd;stroke:#00ad12;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89-8-2" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10-1-8" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect3021" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-8-3"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#101010;fill-opacity:1;fill-rule:evenodd;stroke:#101010;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-8-5" />
|
|
||||||
</marker>
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="base"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1.0"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="1.3358025"
|
|
||||||
inkscape:cx="212.63846"
|
|
||||||
inkscape:cy="105.21093"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
inkscape:document-rotation="0"
|
|
||||||
showgrid="false"
|
|
||||||
fit-margin-top="4"
|
|
||||||
fit-margin-left="4"
|
|
||||||
fit-margin-right="4"
|
|
||||||
fit-margin-bottom="4"
|
|
||||||
lock-margins="true"
|
|
||||||
inkscape:window-width="1298"
|
|
||||||
inkscape:window-height="708"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="0"
|
|
||||||
inkscape:window-maximized="1" />
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
<dc:title />
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(-72.097892,-53.326191)">
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#101010;stroke-width:0.264999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend-8-3)"
|
|
||||||
d="m 134.9616,86.141869 c 17.5759,-11.622767 35.93283,0 35.93283,0"
|
|
||||||
id="path1087-1-6" />
|
|
||||||
<g
|
|
||||||
id="g2948">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065-6"
|
|
||||||
cx="129.67093"
|
|
||||||
cy="92.793152"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(46.071199,-1.2662626)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>A</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#f8f8f8;fill-opacity:1;stroke:#000000;stroke-width:0.555679;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="rect2066"
|
|
||||||
width="1.4562259"
|
|
||||||
height="10.90563"
|
|
||||||
x="81.767418"
|
|
||||||
y="75.519585"
|
|
||||||
ry="0.9693895" />
|
|
||||||
<g
|
|
||||||
id="g905"
|
|
||||||
transform="translate(0,-0.85044703)">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065"
|
|
||||||
cx="83.154755"
|
|
||||||
cy="93.6436"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none">a</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-3-7"
|
|
||||||
transform="translate(92.82116,-0.85044861)">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065-6-7"
|
|
||||||
cx="83.557831"
|
|
||||||
cy="93.6436"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0-5"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10-1);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>Ą</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-1"
|
|
||||||
transform="translate(68.838914,-17.67039)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#e2e2e2;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.2686286,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan> ̨̂ ̈</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#101010;stroke-width:0.264999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend-8)"
|
|
||||||
d="m 88.446425,85.89509 c 17.575895,-11.622767 35.932835,0 35.932835,0"
|
|
||||||
id="path1087-1" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="99.186691"
|
|
||||||
y="66.221436"
|
|
||||||
id="text1035-89"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1033-6"
|
|
||||||
x="99.186691"
|
|
||||||
y="66.221436"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">locking</tspan></text>
|
|
||||||
<g
|
|
||||||
id="g905-1-4"
|
|
||||||
transform="translate(22.423434,-17.67039)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#e2e2e2;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8-3"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7-3"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2-3);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>⇧</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5, 0.5;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 83.251484,76.550079 c -0.31498,0 -0.944941,-0.314981 -0.944941,0 0,0.31498 0.770221,0.262079 0.944941,0 0.212555,-0.318834 0.08197,-0.862973 -0.188988,-1.133929 -0.132651,-0.13265 -1.931144,0.354037 -2.078869,0.944941 -0.108038,0.432149 0.877467,-0.188989 1.322916,-0.188989 0.339244,0 0.626121,0.262042 0.944941,0.377977 0.374434,0.136158 0.777569,0.199796 1.133928,0.377976 0.113894,0.05695 -0.0037,0.439732 0.944941,0.755952 0.544156,0.181385 1.78847,0.275251 2.267857,0.377976 0.448438,0.09609 0.881944,0.251984 1.322917,0.377977 0.063,0.188988 0.388199,0.566964 0.188988,0.566964 -0.195153,0 -0.745291,-0.93961 0,-0.566964 0.281726,0.140863 0.485859,0.404908 0.755952,0.566964 1.460327,0.876196 3.039871,1.714659 4.346726,2.834821 0.966187,0.828161 1.495207,2.006597 2.645833,2.645834 2.876101,1.597834 5.000414,0.287454 7.370534,1.133929 0.4783,0.170821 0.85136,0.567325 1.32292,0.755952 1.8557,0.74228 0.94424,0.230907 2.26785,0.377976 1.47287,0.16365 2.67387,1.06159 4.15774,0.566965 1.22233,-0.407443 3.2674,-1.377519 4.15774,-2.267858 0.39842,-0.398422 0.42845,-1.053404 0.75595,-1.511905 0.50136,-0.70189 1.27041,-1.107171 1.7009,-1.889881 2.28615,-4.156632 0.41931,-1.931216 3.2128,-4.724702 0.18898,-0.188988 0.33491,-0.434362 0.56696,-0.566964 0.864,-0.493714 5.11938,-0.281812 6.04762,-0.188989 0.34449,0.03445 3.71968,0.978261 3.96875,1.133929 0.35339,0.220868 1.41179,1.650838 1.88988,1.889881 0.80324,0.40162 2.22057,0.354332 3.02381,0.755952 1.24832,0.624162 -0.45041,0.669376 -0.18899,1.322917 0.1193,0.298244 0.64418,0.0762 0.94494,0.188988 0.28702,0.107634 1.48279,1.113549 1.5119,1.133929 2.56034,1.792236 -0.96522,-0.855663 2.26786,1.133928 1.61516,0.993946 2.82802,2.547938 4.53572,3.401785 2.03418,1.017093 4.38487,-0.122885 6.42559,-0.377975 1.6791,-0.209886 3.23813,0.06137 4.91369,-0.566965 0.50424,-0.18909 1.82709,-1.701063 2.26786,-2.078869 0.45926,-0.393653 1.0853,-0.707329 1.5119,-1.133928 0.81561,-0.815609 1.44764,-1.826091 2.45685,-2.456845 0.28768,-0.179799 0.65726,-0.198178 0.94494,-0.377977 0.28791,-0.179945 0.60349,-0.774216 0.94494,-0.94494 0.23232,-0.116159 0.51479,-0.09252 0.75595,-0.188988 0.21089,-0.08436 0.33983,-0.377976 0.56697,-0.377976 0.14086,0 0.23711,0.188988 0.37797,0.188988 0.0891,0 0.126,-0.125992 0.18899,-0.188988 0.18899,-0.063 0.36976,-0.217161 0.56696,-0.188988 0.77174,0.110248 1.92711,0.94494 3.02381,0.94494 0.16785,0 0.94189,-0.862638 1.13393,-0.94494 0.19546,-0.08377 1.57981,-0.364523 1.7009,-0.377977 0.72233,-0.08026 2.11645,0.340388 2.64583,-0.188988"
|
|
||||||
id="path2010" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:125%;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="73.802078"
|
|
||||||
y="72.354546"
|
|
||||||
id="text2091"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2089"
|
|
||||||
x="73.802078"
|
|
||||||
y="72.354546"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">SAVED</tspan></text>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:125%;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="164.55956"
|
|
||||||
y="72.354546"
|
|
||||||
id="text2091-8"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2089-8"
|
|
||||||
x="164.55956"
|
|
||||||
y="72.354546"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">CURRENT</tspan><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="164.55956"
|
|
||||||
y="79.410095"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
id="tspan3432" /></text>
|
|
||||||
<g
|
|
||||||
id="g2259"
|
|
||||||
transform="matrix(1.0856157,0,0,0.94777147,-19.677062,6.4360598)">
|
|
||||||
<path
|
|
||||||
id="rect2111-9"
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 179.53502,72.72924 h 5.84717 l -1.37074,1.931346 h -3.04292 z"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<path
|
|
||||||
id="rect2111-9-0"
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 179.4049,80.846668 h 5.84717 l -1.23711,-1.931347 h -3.17655 z"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<g
|
|
||||||
id="g2247"
|
|
||||||
transform="translate(-0.04032786,-0.04319387)">
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,75.343053 2.96688,-0.19452"
|
|
||||||
id="path2145"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,76.112065 2.96688,-0.19452"
|
|
||||||
id="path2145-3"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,76.881078 2.96688,-0.19452"
|
|
||||||
id="path2145-0"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,77.65009 2.96688,-0.19452"
|
|
||||||
id="path2145-2"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,78.419102 2.96688,-0.19452"
|
|
||||||
id="path2145-4"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-0"
|
|
||||||
transform="translate(157.32586,-0.83970203)" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="145.70187"
|
|
||||||
y="66.221436"
|
|
||||||
id="text1035-89-2"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1033-6-9"
|
|
||||||
x="145.70187"
|
|
||||||
y="66.221436"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">locking</tspan></text>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 26 KiB |
@ -1,631 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
width="169.9455mm"
|
|
||||||
height="98.072433mm"
|
|
||||||
viewBox="0 0 169.94549 98.072434"
|
|
||||||
version="1.1"
|
|
||||||
id="svg8"
|
|
||||||
sodipodi:docname="latching_return.svg"
|
|
||||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
|
||||||
<defs
|
|
||||||
id="defs2">
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10-1" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-5"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-7" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-38" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-3-9" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-3-4" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2-6"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89-8" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-21" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2-6-1"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89-8-0" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-2-6-6"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-89-8-2" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10-1-8" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-12" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10-7" />
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="base"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1.0"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="0.94455498"
|
|
||||||
inkscape:cx="314.8465"
|
|
||||||
inkscape:cy="213.42055"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
inkscape:document-rotation="0"
|
|
||||||
showgrid="false"
|
|
||||||
fit-margin-top="4"
|
|
||||||
fit-margin-left="4"
|
|
||||||
fit-margin-right="4"
|
|
||||||
fit-margin-bottom="4"
|
|
||||||
lock-margins="true"
|
|
||||||
inkscape:window-width="1298"
|
|
||||||
inkscape:window-height="708"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="0"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
showguides="false" />
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
<dc:title></dc:title>
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(-70.551731,-46.47634)">
|
|
||||||
<g
|
|
||||||
id="g3858"
|
|
||||||
transform="translate(1.354821,1.4005714)">
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="204.75821"
|
|
||||||
y="130.07979"
|
|
||||||
id="text2293-4"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291-1"
|
|
||||||
x="204.75821"
|
|
||||||
y="130.07979"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">✄</tspan></text>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.5861px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="194.54915"
|
|
||||||
y="128.70164"
|
|
||||||
id="text2293-0-5-8"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291-6-7-5"
|
|
||||||
x="194.54915"
|
|
||||||
y="128.70164"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.5861px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">cuts</tspan></text>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833, 0.529167;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 210.34971,123.9389 c 0.0233,0.14006 0.07,0.27818 0.07,0.42017 0,0.0738 -0.07,0.13627 -0.07,0.21009 0,0.11902 0.0582,0.23171 0.07,0.35014 0.049,0.49035 0.0857,0.98109 0.14006,1.4706 0.018,0.1624 -0.0269,0.32902 0,0.4902 0.0435,0.26077 0.11166,0.3369 0,0.56023 -0.0209,0.0418 0.033,0.10705 0,0.14006 -0.0369,0.0369 -0.10315,0.0331 -0.14006,0.07"
|
|
||||||
id="path3816-9" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833, 0.529167;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 209.9819,128.43627 c -0.12445,0.48957 -0.1295,0.98859 -0.0743,1.48553 0.0118,0.10583 0.01,0.21643 0.0248,0.32186 -0.002,0.0627 0.0396,0.11405 0.0495,0.17332 0.0144,0.0866 -0.0193,0.077 0,0.17331 0.0124,0.0621 0.20619,0.18971 0.24759,0.22283"
|
|
||||||
id="path3820-7" />
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Lend-2-6-1)"
|
|
||||||
d="m 180.7405,85.345284 c 21.77006,-11.52723 44.50758,0 44.50758,0"
|
|
||||||
id="path1087-3-0-8" />
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#f8f8f8;fill-opacity:1;stroke:#000000;stroke-width:0.555679;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="rect2066"
|
|
||||||
width="1.4562259"
|
|
||||||
height="10.90563"
|
|
||||||
x="81.767418"
|
|
||||||
y="75.519585"
|
|
||||||
ry="0.9693895" />
|
|
||||||
<g
|
|
||||||
id="g905-3-7"
|
|
||||||
transform="translate(92.629263,-0.8504468)">
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0-5"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10-1);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>Ą</tspan></tspan></text>
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-4-9"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.266167"
|
|
||||||
y="86.745537"
|
|
||||||
ry="1.937705" />
|
|
||||||
</g>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:0.4em;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="174.86499"
|
|
||||||
y="130.79413"
|
|
||||||
id="text1035-8"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="174.86499"
|
|
||||||
y="130.79413"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
id="tspan2277">locking</tspan><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="174.86499"
|
|
||||||
y="135.11462"
|
|
||||||
id="tspan1606" /></text>
|
|
||||||
<g
|
|
||||||
id="g905-1-6"
|
|
||||||
transform="translate(90.668095,26.90725)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8-0"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7-4"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2-38);fill:#f8f8f8;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.2686286,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan
|
|
||||||
style="fill:#f8f8f8;fill-opacity:1"> ̨̂ ̈</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5, 0.5;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 83.251484,76.550079 c -0.31498,0 -0.944941,-0.314981 -0.944941,0 0,0.31498 0.770221,0.262079 0.944941,0 0.212555,-0.318834 0.08197,-0.862973 -0.188988,-1.133929 -0.132651,-0.13265 -1.931144,0.354037 -2.078869,0.944941 -0.108038,0.432149 0.877467,-0.188989 1.322916,-0.188989 0.339244,0 0.626121,0.262042 0.944941,0.377977 0.374434,0.136158 0.777569,0.199796 1.133928,0.377976 0.113894,0.05695 -0.0037,0.439732 0.944941,0.755952 0.544156,0.181385 1.78847,0.275251 2.267857,0.377976 0.448438,0.09609 0.881944,0.251984 1.322917,0.377977 0.063,0.188988 0.388199,0.566964 0.188988,0.566964 -0.195153,0 -0.745291,-0.93961 0,-0.566964 0.281726,0.140863 0.485859,0.404908 0.755952,0.566964 1.460327,0.876196 3.039871,1.714659 4.346726,2.834821 0.966187,0.828161 1.495207,2.006597 2.645833,2.645834 2.876101,1.597834 5.000414,0.287454 7.370534,1.133929 0.4783,0.170821 0.85136,0.567325 1.32292,0.755952 1.8557,0.74228 0.94424,0.230907 2.26785,0.377976 1.47287,0.16365 2.67387,1.06159 4.15774,0.566965 1.22233,-0.407443 3.2674,-1.377519 4.15774,-2.267858 0.39842,-0.398422 0.42845,-1.053404 0.75595,-1.511905 0.50136,-0.70189 1.27041,-1.107171 1.7009,-1.889881 2.28615,-4.156632 0.41931,-1.931216 3.2128,-4.724702 0.18898,-0.188988 0.33491,-0.434362 0.56696,-0.566964 0.864,-0.493714 5.11938,-0.281812 6.04762,-0.188989 0.34449,0.03445 3.71968,0.978261 3.96875,1.133929 0.35339,0.220868 1.41179,1.650838 1.88988,1.889881 0.80324,0.40162 2.22057,0.354332 3.02381,0.755952 1.24832,0.624162 -0.45041,0.669376 -0.18899,1.322917 0.1193,0.298244 0.64418,0.0762 0.94494,0.188988 0.28702,0.107634 1.48279,1.113549 1.5119,1.133929 2.56034,1.792236 -0.96522,-0.855663 2.26786,1.133928 1.61516,0.993946 2.82802,2.547938 4.53572,3.401785 2.03418,1.017093 4.38487,-0.122885 6.42559,-0.377975 1.6791,-0.209886 3.23813,0.06137 4.91369,-0.566965 0.50424,-0.18909 1.82709,-1.701063 2.26786,-2.078869 0.45926,-0.393653 1.0853,-0.707329 1.5119,-1.133928 0.81561,-0.815609 1.44764,-1.826091 2.45685,-2.456845 0.28768,-0.179799 0.65726,-0.198178 0.94494,-0.377977 0.28791,-0.179945 0.60349,-0.774216 0.94494,-0.94494 0.23232,-0.116159 0.51479,-0.09252 0.75595,-0.188988 0.21089,-0.08436 0.33983,-0.377976 0.56697,-0.377976 0.14086,0 0.23711,0.188988 0.37797,0.188988 0.0891,0 0.126,-0.125992 0.18899,-0.188988 0.18899,-0.063 0.36976,-0.217161 0.56696,-0.188988 0.77174,0.110248 1.92711,0.94494 3.02381,0.94494 0.16785,0 0.94189,-0.862638 1.13393,-0.94494 0.19546,-0.08377 1.57981,-0.364523 1.7009,-0.377977 0.72233,-0.08026 2.11645,0.340388 2.64583,-0.188988"
|
|
||||||
id="path2010" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:125%;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="74.331245"
|
|
||||||
y="71.825378"
|
|
||||||
id="text2091"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2089"
|
|
||||||
x="74.331245"
|
|
||||||
y="71.825378"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">SAVED</tspan></text>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:125%;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="164.23172"
|
|
||||||
y="70.186089"
|
|
||||||
id="text2091-8"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2089-8"
|
|
||||||
x="164.23172"
|
|
||||||
y="70.186089"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">CURRENT</tspan><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="164.23172"
|
|
||||||
y="77.241638"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
id="tspan3432" /></text>
|
|
||||||
<g
|
|
||||||
id="g2259"
|
|
||||||
transform="matrix(1.0856157,0,0,0.94777147,-20.206229,4.319393)">
|
|
||||||
<path
|
|
||||||
id="rect2111-9"
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 179.53502,72.72924 h 5.84717 l -1.37074,1.931346 h -3.04292 z"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<path
|
|
||||||
id="rect2111-9-0"
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 179.4049,80.846668 h 5.84717 l -1.23711,-1.931347 h -3.17655 z"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<g
|
|
||||||
id="g2247"
|
|
||||||
transform="translate(-0.04032786,-0.04319387)">
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,75.343053 2.96688,-0.19452"
|
|
||||||
id="path2145"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,76.112065 2.96688,-0.19452"
|
|
||||||
id="path2145-3"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,76.881078 2.96688,-0.19452"
|
|
||||||
id="path2145-0"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,77.65009 2.96688,-0.19452"
|
|
||||||
id="path2145-2"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,78.419102 2.96688,-0.19452"
|
|
||||||
id="path2145-4"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Lend-5)"
|
|
||||||
d="m 173.01207,99.691217 c 0,0 -8.37295,13.367043 -0.26038,13.813423 9.36786,0.51544 7.89797,-9.16673 6.50059,-13.41252"
|
|
||||||
id="path2269"
|
|
||||||
sodipodi:nodetypes="csc" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="176.93353"
|
|
||||||
y="138.21815"
|
|
||||||
id="text2293"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291"
|
|
||||||
x="176.93353"
|
|
||||||
y="138.21815"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">✄</tspan></text>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Lend-2-6)"
|
|
||||||
d="m 181.46685,99.71436 c 21.61425,11.51564 44.18902,0 44.18902,0"
|
|
||||||
id="path1087-3-0" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="195.7271"
|
|
||||||
y="122.96945"
|
|
||||||
id="text1035-89-7"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1033-6-5"
|
|
||||||
x="195.7271"
|
|
||||||
y="122.96945"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">set_view</tspan></text>
|
|
||||||
<g
|
|
||||||
id="g905-1-4-4"
|
|
||||||
transform="translate(120.23594,18.477932)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#e2e2e2;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8-3-8"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7-3-1"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2-3-4);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>⇧</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:0.36em;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="196.99921"
|
|
||||||
y="61.359337"
|
|
||||||
id="text1035-89-4"><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan3987"
|
|
||||||
x="196.99921"
|
|
||||||
y="61.359337">locking</tspan><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="196.99921"
|
|
||||||
y="65.362335"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
id="tspan3985">pops: false</tspan></text>
|
|
||||||
<g
|
|
||||||
id="g905-1-4-9"
|
|
||||||
transform="translate(120.23594,-18.828317)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#e2e2e2;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8-3-2"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7-3-2"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2-3-9);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>⇧</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-0"
|
|
||||||
transform="translate(147.8008,-0.83970203)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-5"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="77.863091"
|
|
||||||
y="86.745537"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-1"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-21);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>ą</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Lend-2-6-6)"
|
|
||||||
d="m 170.49256,99.691217 c -49.40563,31.667983 -82.046134,0 -82.046134,0"
|
|
||||||
id="path1087-3-0-5"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<g
|
|
||||||
id="g905-3-7-6"
|
|
||||||
transform="translate(45.925334,26.134402)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-4-9-8"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.266167"
|
|
||||||
y="86.745537"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0-5-2"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10-1-8);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>Ą</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:0.4em;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="129.60217"
|
|
||||||
y="131.30838"
|
|
||||||
id="text1035-8-4"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="129.60217"
|
|
||||||
y="131.30838"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
id="tspan2277-2">text</tspan><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="129.60217"
|
|
||||||
y="135.62888"
|
|
||||||
id="tspan1606-4" /></text>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="123.67847"
|
|
||||||
y="136.8163"
|
|
||||||
id="text2293-0"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291-6"
|
|
||||||
x="123.67847"
|
|
||||||
y="136.8163"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">returns</tspan></text>
|
|
||||||
<g
|
|
||||||
id="g905"
|
|
||||||
transform="translate(1.1299757e-7,-0.85044747)">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065"
|
|
||||||
cx="83.154755"
|
|
||||||
cy="93.6436"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-12);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none">a</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g2948">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065-6"
|
|
||||||
cx="129.67093"
|
|
||||||
cy="92.793152"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10-7);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(46.071199,-1.2662626)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>A</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g2259-3"
|
|
||||||
transform="matrix(0.61171471,0,0,0.53404326,8.8050741,94.418409)">
|
|
||||||
<path
|
|
||||||
id="rect2111-9-1"
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 179.53502,72.72924 h 5.84717 l -1.37074,1.931346 h -3.04292 z"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<path
|
|
||||||
id="rect2111-9-0-7"
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 179.4049,80.846668 h 5.84717 l -1.23711,-1.931347 h -3.17655 z"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<g
|
|
||||||
id="g2247-5"
|
|
||||||
transform="translate(-0.04032786,-0.04319387)">
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,75.343053 2.96688,-0.19452"
|
|
||||||
id="path2145-9"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,76.112065 2.96688,-0.19452"
|
|
||||||
id="path2145-3-6"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,76.881078 2.96688,-0.19452"
|
|
||||||
id="path2145-0-2"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,77.65009 2.96688,-0.19452"
|
|
||||||
id="path2145-2-1"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.363778;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 181.02302,78.419102 2.96688,-0.19452"
|
|
||||||
id="path2145-4-7"
|
|
||||||
sodipodi:nodetypes="cc" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.06, 0.53;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 119.51485,135.86385 c -0.50656,0.62998 -2.26796,0.26701 -2.85105,0.85011 -0.52314,0.52314 2.02401,2.4426 3.96141,3.16913 2.94083,1.1028 4.79827,0.22 7.72476,-0.19807 0.3268,-0.0467 0.66473,0.0543 0.99035,0 1.72749,-0.28792 3.39512,-0.79539 5.14984,-0.99036 1.10207,-0.12245 0.49735,0.0622 1.58457,0.19807 0.91825,0.11479 1.8542,0.0832 2.77299,0.19807 0.86919,0.10865 1.70964,-0.19807 2.57492,-0.19807"
|
|
||||||
id="path3796" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.5861px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="166.72447"
|
|
||||||
y="136.84001"
|
|
||||||
id="text2293-0-5"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291-6-7"
|
|
||||||
x="166.72447"
|
|
||||||
y="136.84001"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.5861px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">cuts</tspan></text>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833, 0.529166;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 182.52503,132.07727 c 0.0233,0.14006 0.07,0.27818 0.07,0.42017 0,0.0738 -0.07,0.13627 -0.07,0.21009 0,0.11902 0.0582,0.23171 0.07,0.35014 0.049,0.49035 0.0857,0.98109 0.14006,1.4706 0.018,0.1624 -0.0269,0.32902 0,0.4902 0.0435,0.26077 0.11166,0.3369 0,0.56023 -0.0209,0.0418 0.033,0.10705 0,0.14006 -0.0369,0.0369 -0.10315,0.0331 -0.14006,0.07"
|
|
||||||
id="path3816" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833, 0.529166;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 182.15722,136.57464 c -0.12445,0.48957 -0.1295,0.98859 -0.0743,1.48553 0.0118,0.10583 0.01,0.21643 0.0248,0.32186 -0.002,0.0627 0.0396,0.11405 0.0495,0.17332 0.0144,0.0866 -0.0193,0.077 0,0.17331 0.0124,0.0621 0.20619,0.18971 0.24759,0.22283"
|
|
||||||
id="path3820" />
|
|
||||||
<g
|
|
||||||
id="g3858-9"
|
|
||||||
transform="translate(1.354821,-73.436839)">
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="204.75821"
|
|
||||||
y="130.07979"
|
|
||||||
id="text2293-4-6"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291-1-4"
|
|
||||||
x="204.75821"
|
|
||||||
y="130.07979"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">✄</tspan></text>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.5861px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="194.54915"
|
|
||||||
y="128.70164"
|
|
||||||
id="text2293-0-5-8-3"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan2291-6-7-5-3"
|
|
||||||
x="194.54915"
|
|
||||||
y="128.70164"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.5861px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">cuts</tspan></text>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833, 0.529167;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 210.34971,123.9389 c 0.0233,0.14006 0.07,0.27818 0.07,0.42017 0,0.0738 -0.07,0.13627 -0.07,0.21009 0,0.11902 0.0582,0.23171 0.07,0.35014 0.049,0.49035 0.0857,0.98109 0.14006,1.4706 0.018,0.1624 -0.0269,0.32902 0,0.4902 0.0435,0.26077 0.11166,0.3369 0,0.56023 -0.0209,0.0418 0.033,0.10705 0,0.14006 -0.0369,0.0369 -0.10315,0.0331 -0.14006,0.07"
|
|
||||||
id="path3816-9-3" />
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.05833, 0.529167;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
d="m 209.9819,128.43627 c -0.12445,0.48957 -0.1295,0.98859 -0.0743,1.48553 0.0118,0.10583 0.01,0.21643 0.0248,0.32186 -0.002,0.0627 0.0396,0.11405 0.0495,0.17332 0.0144,0.0866 -0.0193,0.077 0,0.17331 0.0124,0.0621 0.20619,0.18971 0.24759,0.22283"
|
|
||||||
id="path3820-7-8" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 39 KiB |
@ -1,386 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
width="70.905495mm"
|
|
||||||
height="78.260262mm"
|
|
||||||
viewBox="0 0 70.905494 78.260262"
|
|
||||||
version="1.1"
|
|
||||||
id="svg8"
|
|
||||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
|
|
||||||
sodipodi:docname="switching.svg">
|
|
||||||
<defs
|
|
||||||
id="defs2">
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Mend"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Mend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.4,0,0,-0.4,-4,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1098" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow2Sstart"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow2Sstart"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(0.3,0,0,0.3,-0.69,0)"
|
|
||||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
|
||||||
id="path1119" />
|
|
||||||
</marker>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow2Mstart"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow2Mstart"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="scale(0.6)"
|
|
||||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
|
||||||
id="path1113" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-5" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect848" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect848-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-9" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect848-8" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect916" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-4" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect951" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-10-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect986" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect1061" />
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1Lend-5"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto"
|
|
||||||
inkscape:stockid="Arrow1Lend"
|
|
||||||
inkscape:isstock="true">
|
|
||||||
<path
|
|
||||||
transform="matrix(-0.8,0,0,-0.8,-10,0)"
|
|
||||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
|
||||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
|
||||||
id="path1092-7" />
|
|
||||||
</marker>
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect835-2-1" />
|
|
||||||
<rect
|
|
||||||
x="80.886902"
|
|
||||||
y="89.202377"
|
|
||||||
width="18.898809"
|
|
||||||
height="20.410713"
|
|
||||||
id="rect1549" />
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="base"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1.0"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="0.98994949"
|
|
||||||
inkscape:cx="136.49044"
|
|
||||||
inkscape:cy="110.83537"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
inkscape:document-rotation="0"
|
|
||||||
showgrid="false"
|
|
||||||
fit-margin-top="4"
|
|
||||||
fit-margin-left="4"
|
|
||||||
fit-margin-right="4"
|
|
||||||
fit-margin-bottom="4"
|
|
||||||
lock-margins="true"
|
|
||||||
inkscape:window-width="1298"
|
|
||||||
inkscape:window-height="708"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="0"
|
|
||||||
inkscape:window-maximized="1" />
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
<dc:title></dc:title>
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(-70.899889,-58.974186)">
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
|
|
||||||
d="m 88.446426,85.895089 c 17.575894,-11.622767 35.932844,0 35.932844,0"
|
|
||||||
id="path1087" />
|
|
||||||
<g
|
|
||||||
id="g905"
|
|
||||||
transform="translate(0,-0.85044703)">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065"
|
|
||||||
cx="83.03434"
|
|
||||||
cy="93.834679"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.16231537,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke:none">a</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-3"
|
|
||||||
transform="translate(46.113101,-0.85044703)">
|
|
||||||
<circle
|
|
||||||
style="color:#000000;overflow:visible;fill:#ffffff;stroke:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|
||||||
id="path1065-3"
|
|
||||||
cx="83.557831"
|
|
||||||
cy="93.366959"
|
|
||||||
r="7.8844509" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>A</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-7"
|
|
||||||
transform="translate(-0.94494048,73.232887)">
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-6"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-4);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>ą</tspan></tspan></text>
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-3"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="77.863091"
|
|
||||||
y="86.745537"
|
|
||||||
ry="1.937705" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g905-3-7"
|
|
||||||
transform="translate(49.136911,68.319196)">
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-0-5"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-10-1);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>Ą</tspan></tspan></text>
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-4-9"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.266167"
|
|
||||||
y="86.745537"
|
|
||||||
ry="1.937705" />
|
|
||||||
</g>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="90.548096"
|
|
||||||
y="65.654472"
|
|
||||||
id="text1035"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1033"
|
|
||||||
x="90.548096"
|
|
||||||
y="65.654472"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">set_view: upper</tspan></text>
|
|
||||||
<g
|
|
||||||
id="g905-1"
|
|
||||||
transform="translate(22.423437,-17.670388)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#e2e2e2;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2);fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan>⇧</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
<path
|
|
||||||
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend-5)"
|
|
||||||
d="m 124.74085,99.691217 c -17.5759,11.622773 -35.932849,0 -35.932849,0"
|
|
||||||
id="path1087-4" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:0.4em;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
||||||
x="91.116165"
|
|
||||||
y="123.76147"
|
|
||||||
id="text1035-8"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1033-5"
|
|
||||||
x="91.116165"
|
|
||||||
y="123.76147"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px">locking</tspan><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1604"
|
|
||||||
x="91.116165"
|
|
||||||
y="128.08197">lock_view: upper</tspan><tspan
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777px;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px"
|
|
||||||
sodipodi:role="line"
|
|
||||||
x="91.116165"
|
|
||||||
y="132.40247"
|
|
||||||
id="tspan1606">unlock_view: lower</tspan></text>
|
|
||||||
<g
|
|
||||||
id="g905-1-9"
|
|
||||||
transform="translate(22.423437,17.64464)">
|
|
||||||
<rect
|
|
||||||
style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="rect900-8-7"
|
|
||||||
width="10.583333"
|
|
||||||
height="13.79613"
|
|
||||||
x="78.878532"
|
|
||||||
y="85.920006"
|
|
||||||
ry="1.937705" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
id="text833-7-5"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.9375px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect835-2-1);fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
|
|
||||||
transform="translate(-0.04189825,-0.41581583)"><tspan
|
|
||||||
x="80.886719"
|
|
||||||
y="96.225952"><tspan
|
|
||||||
style="fill:#ffffff;fill-opacity:1">⇧</tspan></tspan></text>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 16 KiB |
@ -1,92 +1,55 @@
|
|||||||
A guide to creating layouts
|
Kareema's guide to creating layouts
|
||||||
===========================
|
===================================
|
||||||
|
|
||||||
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).
|
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.
|
||||||
|
|
||||||
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.
|
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.
|
||||||
|
|
||||||
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/)
|
**Get one of the existing keyboard layouts**
|
||||||
|
|
||||||
## Creating a new layout
|
* 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 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:
|
* 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).
|
* 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
|
* Clone your fork locally with `git clone` and use the uri of your forked repo there
|
||||||
|
|
||||||
### Edit your keyboard and get it merged
|
**Workflow to edit your keyboard and get it merged**
|
||||||
|
|
||||||
* It may be useful to check out the [generic guide how the workflow to contribute works](https://developer.puri.sm/Librem5/Contact/Contributing.html)
|
* A generic guide how the workflow to contribute works, can be found at https://developer.puri.sm/Librem5/Contact/Contributing.html
|
||||||
* Create a branch: Name it “keyboard-layout-mylanguage” or whatever
|
* Create a branch: Name it “keyboard-layout-mylanguage” or whatever
|
||||||
* Checkout your branch, edit your keyboard layout and commit your changes
|
* 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)
|
* 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
|
* Create a merge request for the branch to get your changes merged to the official squeekboard git repository
|
||||||
|
|
||||||
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.
|
**Compile squeekboard**
|
||||||
|
|
||||||
## Compiling and running 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)
|
||||||
|
|
||||||
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.
|
**Running squeekboard**
|
||||||
|
|
||||||
### Compile 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)
|
||||||
|
|
||||||
* 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)
|
* 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:
|
* 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`
|
`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: )
|
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
|
||||||
|
|
||||||
|
|||||||
64
doc/views.md
64
doc/views.md
@ -1,64 +0,0 @@
|
|||||||
Switching views
|
|
||||||
=========
|
|
||||||
|
|
||||||
Squeekboard layout files are separated into *views*.
|
|
||||||
|
|
||||||
What are views?
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
A view is the button arrangement which you see on Squeekboard's panel. The view always spans the entire panel area, so it's not possible to see two views at the same time, even if the layout contains multiple views.
|
|
||||||
|
|
||||||
Views are useful because they allow to have many more buttons than would fit on the panel at the same time. That works because views can be switched.
|
|
||||||
|
|
||||||
Views are different from layouts: they can be switched without affecting the active language, and without touching the globe button. Layouts cannot share views, so switching layouts *always* switches views.
|
|
||||||
|
|
||||||
Switching views
|
|
||||||
------------------
|
|
||||||
|
|
||||||
The model selected for switching views is less similar to "levels" known from physical keyboards, but closer to "rooms", which may resemble a game map.
|
|
||||||
|
|
||||||
Buttons don't have states. It's more of a model where each view is a room, and buttons are doors. Switching means moving to the next room, and buttons highlight according to which view/room they lead to or from.
|
|
||||||
|
|
||||||
There are two basic kinds of switching buttons: one way (`set_view`), and two way (`locking`). `locking` is the more sophisticated one. When placed inside `lock_view`, it is drawn highlighted, and goes to `unlock view`. When placed inside any other view, it behaves like `set_view`.
|
|
||||||
|
|
||||||
 This diagram shows which buttons can switch between two views. Views are shown as circles, and buttons as rounded rectangles.
|
|
||||||
The two buttons are separate, and visible only in the view *from which the switch starts*. Note that the `locking` button is shown highlighted. That's because it's in `upper` view, which matches its `lock_view`.
|
|
||||||
|
|
||||||
Latching
|
|
||||||
----------
|
|
||||||
|
|
||||||
`locking` buttons provide a second mode of operation: latching. It's useful when the target view is needed only for a single button press, like entering a single accent or a single capital letter in Latin scripts.
|
|
||||||
|
|
||||||
When a latching button is pressed, the keyboard remembers to come back to the current (source) view, and then the view is switched. If another `locking` button is pressed, the source view stays in memory. If a text button is pressed, the view from memory is shown again, and forgotten.
|
|
||||||
|
|
||||||
 In this diagram, the dashed line connects the view the typist is seeing to the view remembered for unlatching.
|
|
||||||
|
|
||||||
There are two ways to erase the memory without going back to the remembered view. Pressing the button again will permanently switch to the current view, and `set_view` will permanently switch to its target.
|
|
||||||
|
|
||||||
In the room metaphor, it's as if tying a thread inside the room before going through the door to the next one. And another `locking` door while holding the thread. Once the Minotaur is slain (text button pressed), the hero follows the thread back to the starting room.
|
|
||||||
|
|
||||||
The typist hero cuts the thread in two circumstances: when staying longer in the current room (press button again), or when moving through a `set_view` door.
|
|
||||||
|
|
||||||
 This diagram shows the possible ways to stop latching. One is by pressing a text button, which takes back to the original view. Another is pressing a locking button which appears highlighted (note that it can be any button, what matters is its `lock_view`). Finally, switching to another view using a button that doesn't keep the latch on forgets latching.
|
|
||||||
|
|
||||||
The layout author should pay attention that `set_view`'s lack of latching does not come as a surprise to typists.
|
|
||||||
|
|
||||||
|
|
||||||
Differences from keyboard levels
|
|
||||||
---------------------------------------
|
|
||||||
|
|
||||||
Views are **not** like keyboard levels.
|
|
||||||
|
|
||||||
On a physical keyboard, the number of buttons can not change when switching levels. In Squeekboard, they can have any arrangement of buttons you could imagine.
|
|
||||||
|
|
||||||
When switching levels on a keyboard, for example by pressing Shift, the key press not only affects the meaning of other keys, but also tells the application that it's pressed down. In Squeekboard, pressing buttons to change layouts *does not* do anything but switch the layout. Pressing the switching button especially *does not* tell the application that it was pressed. (This is the reason Shift and AltGr modifiers are not implemented in Squeekboard.)
|
|
||||||
|
|
||||||
Why not use the "views" model?
|
|
||||||
-------------------------------------
|
|
||||||
|
|
||||||
Squeekboard's goal is to support as many scripts as possible, and the author of the initial design doesn't know a whole lot. There are two problems with using the levels metaphor:
|
|
||||||
|
|
||||||
Firstly, the levels model assumes that there is a "base" and an "active" level. This does not work well with scripts that have different but equivalent modes of writing. An example is the Kana layout with Katakana and Hiragana, which are both "base".
|
|
||||||
Both systems could have been combined, but the view switching designer doesn't have enough experience with different scripts to do that. Some scripts may have different non-hierarchical ways to switch character groups (Balinese?), which could make combining hierarchy with free-form switching even harder.
|
|
||||||
|
|
||||||
Secondly, when dealing with languages with a hierarchy, we end up with extra work to eliminate nonsensical combinations. With "symbols" and "uppercase" levels, what does it mean to have both engaged? Eliminating that means extra work. Either validating layouts, so that it's not possible to engage "uppercase" from "symbols", or duplicating, so that "uppercase+symbols" is the same as just "symbols". With "accents" in the mix, this could become a challenge to design well.
|
|
||||||
@ -38,6 +38,8 @@ struct _EekElementClass
|
|||||||
GObjectClass parent_class;
|
GObjectClass parent_class;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
GType eek_element_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
void eek_element_set_name (EekElement *element,
|
void eek_element_set_name (EekElement *element,
|
||||||
const gchar *name);
|
const gchar *name);
|
||||||
|
|
||||||
|
|||||||
@ -25,6 +25,10 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBCANBERRA
|
||||||
|
#include <canberra-gtk.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -37,24 +41,17 @@
|
|||||||
#include "src/layout.h"
|
#include "src/layout.h"
|
||||||
#include "src/submission.h"
|
#include "src/submission.h"
|
||||||
|
|
||||||
#define LIBFEEDBACK_USE_UNSTABLE_API
|
|
||||||
#include <libfeedback.h>
|
|
||||||
|
|
||||||
#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"
|
|
||||||
|
|
||||||
typedef struct _EekGtkKeyboardPrivate
|
typedef struct _EekGtkKeyboardPrivate
|
||||||
{
|
{
|
||||||
EekRenderer *renderer; // owned, nullable
|
EekRenderer *renderer; // owned, nullable
|
||||||
struct render_geometry render_geometry; // mutable
|
LayoutHolder *eekboard_context; // unowned reference
|
||||||
|
|
||||||
EekboardContextService *eekboard_context; // unowned reference
|
|
||||||
struct submission *submission; // unowned reference
|
struct submission *submission; // unowned reference
|
||||||
|
|
||||||
struct squeek_layout_state *layout; // unowned
|
struct squeek_layout_state *layout; // unowned
|
||||||
LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
|
LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
|
||||||
|
|
||||||
GdkEventSequence *sequence; // unowned reference
|
GdkEventSequence *sequence; // unowned reference
|
||||||
LfbEvent *event;
|
|
||||||
} EekGtkKeyboardPrivate;
|
} EekGtkKeyboardPrivate;
|
||||||
|
|
||||||
G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
|
G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
|
||||||
@ -74,23 +71,12 @@ eek_gtk_keyboard_real_realize (GtkWidget *self)
|
|||||||
GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
|
GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void set_allocation_size(EekGtkKeyboard *gtk_keyboard,
|
|
||||||
struct squeek_layout *layout, gdouble width, gdouble height)
|
|
||||||
{
|
|
||||||
// This is where size-dependent surfaces would be released
|
|
||||||
EekGtkKeyboardPrivate *priv =
|
|
||||||
eek_gtk_keyboard_get_instance_private (gtk_keyboard);
|
|
||||||
priv->render_geometry = eek_render_geometry_from_allocation_size(
|
|
||||||
layout, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
eek_gtk_keyboard_real_draw (GtkWidget *self,
|
eek_gtk_keyboard_real_draw (GtkWidget *self,
|
||||||
cairo_t *cr)
|
cairo_t *cr)
|
||||||
{
|
{
|
||||||
EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD (self);
|
|
||||||
EekGtkKeyboardPrivate *priv =
|
EekGtkKeyboardPrivate *priv =
|
||||||
eek_gtk_keyboard_get_instance_private (keyboard);
|
eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
||||||
GtkAllocation allocation;
|
GtkAllocation allocation;
|
||||||
gtk_widget_get_allocation (self, &allocation);
|
gtk_widget_get_allocation (self, &allocation);
|
||||||
|
|
||||||
@ -105,21 +91,22 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
|
|||||||
priv->keyboard,
|
priv->keyboard,
|
||||||
pcontext);
|
pcontext);
|
||||||
|
|
||||||
set_allocation_size (keyboard, priv->keyboard->layout,
|
eek_renderer_set_allocation_size (priv->renderer,
|
||||||
allocation.width, allocation.height);
|
priv->keyboard->layout,
|
||||||
|
allocation.width,
|
||||||
|
allocation.height);
|
||||||
eek_renderer_set_scale_factor (priv->renderer,
|
eek_renderer_set_scale_factor (priv->renderer,
|
||||||
gtk_widget_get_scale_factor (self));
|
gtk_widget_get_scale_factor (self));
|
||||||
}
|
}
|
||||||
|
|
||||||
eek_renderer_render_keyboard (priv->renderer, priv->render_geometry,
|
eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, priv->keyboard);
|
||||||
priv->submission, cr, priv->keyboard);
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Units of virtual pixels size
|
// Units of pixel size
|
||||||
static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
|
static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
|
||||||
(void)height;
|
(void)height;
|
||||||
if (width < 540) {
|
if (width < 1080) {
|
||||||
return ARRANGEMENT_KIND_BASE;
|
return ARRANGEMENT_KIND_BASE;
|
||||||
}
|
}
|
||||||
return ARRANGEMENT_KIND_WIDE;
|
return ARRANGEMENT_KIND_WIDE;
|
||||||
@ -129,41 +116,30 @@ static void
|
|||||||
eek_gtk_keyboard_real_size_allocate (GtkWidget *self,
|
eek_gtk_keyboard_real_size_allocate (GtkWidget *self,
|
||||||
GtkAllocation *allocation)
|
GtkAllocation *allocation)
|
||||||
{
|
{
|
||||||
EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD (self);
|
|
||||||
EekGtkKeyboardPrivate *priv =
|
EekGtkKeyboardPrivate *priv =
|
||||||
eek_gtk_keyboard_get_instance_private (keyboard);
|
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
|
// check if the change would switch types
|
||||||
enum squeek_arrangement_kind new_type = get_type(
|
enum squeek_arrangement_kind new_type = get_type(
|
||||||
(uint32_t)(allocation->width - allocation->x),
|
(uint32_t)(allocation->width - allocation->x) * scale,
|
||||||
(uint32_t)(allocation->height - allocation->y));
|
(uint32_t)(allocation->height - allocation->y) * scale);
|
||||||
if (priv->layout->arrangement != new_type) {
|
if (priv->layout->arrangement != new_type) {
|
||||||
priv->layout->arrangement = new_type;
|
struct squeek_layout_state layout = *priv->layout;
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
layout.arrangement = new_type;
|
||||||
eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
|
|
||||||
|
eek_layout_holder_use_layout(priv->eekboard_context, &layout);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->renderer) {
|
if (priv->renderer)
|
||||||
set_allocation_size (keyboard, priv->keyboard->layout,
|
eek_renderer_set_allocation_size (priv->renderer,
|
||||||
allocation->width, allocation->height);
|
priv->keyboard->layout,
|
||||||
}
|
allocation->width,
|
||||||
|
allocation->height);
|
||||||
|
|
||||||
GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->
|
GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->
|
||||||
size_allocate (self, allocation);
|
size_allocate (self, allocation);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
on_event_triggered (LfbEvent *event,
|
|
||||||
GAsyncResult *res,
|
|
||||||
gpointer unused)
|
|
||||||
{
|
|
||||||
g_autoptr (GError) err = NULL;
|
|
||||||
|
|
||||||
if (!lfb_event_trigger_feedback_finish (event, res, &err)) {
|
|
||||||
g_warning ("Failed to trigger feedback for '%s': %s",
|
|
||||||
lfb_event_get_event (event), err->message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void depress(EekGtkKeyboard *self,
|
static void depress(EekGtkKeyboard *self,
|
||||||
gdouble x, gdouble y, guint32 time)
|
gdouble x, gdouble y, guint32 time)
|
||||||
{
|
{
|
||||||
@ -173,7 +149,7 @@ static void depress(EekGtkKeyboard *self,
|
|||||||
}
|
}
|
||||||
squeek_layout_depress(priv->keyboard->layout,
|
squeek_layout_depress(priv->keyboard->layout,
|
||||||
priv->submission,
|
priv->submission,
|
||||||
x, y, priv->render_geometry.widget_to_layout, time, self);
|
x, y, eek_renderer_get_transformation(priv->renderer), time, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void drag(EekGtkKeyboard *self,
|
static void drag(EekGtkKeyboard *self,
|
||||||
@ -183,9 +159,9 @@ static void drag(EekGtkKeyboard *self,
|
|||||||
if (!priv->keyboard) {
|
if (!priv->keyboard) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
|
squeek_layout_drag(eek_layout_holder_get_keyboard(priv->eekboard_context)->layout,
|
||||||
priv->submission,
|
priv->submission,
|
||||||
x, y, priv->render_geometry.widget_to_layout, time,
|
x, y, eek_renderer_get_transformation(priv->renderer), time,
|
||||||
priv->eekboard_context, self);
|
priv->eekboard_context, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -195,8 +171,9 @@ static void release(EekGtkKeyboard *self, guint32 time)
|
|||||||
if (!priv->keyboard) {
|
if (!priv->keyboard) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
|
squeek_layout_release(eek_layout_holder_get_keyboard(priv->eekboard_context)->layout,
|
||||||
priv->submission, priv->render_geometry.widget_to_layout, time,
|
priv->submission,
|
||||||
|
eek_renderer_get_transformation(priv->renderer), time,
|
||||||
priv->eekboard_context, self);
|
priv->eekboard_context, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -327,11 +304,6 @@ eek_gtk_keyboard_dispose (GObject *object)
|
|||||||
priv->keyboard = NULL;
|
priv->keyboard = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->event) {
|
|
||||||
g_clear_object (&priv->event);
|
|
||||||
lfb_uninit ();
|
|
||||||
}
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
|
G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -363,18 +335,7 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
|
|||||||
static void
|
static void
|
||||||
eek_gtk_keyboard_init (EekGtkKeyboard *self)
|
eek_gtk_keyboard_init (EekGtkKeyboard *self)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
(void)self;
|
||||||
g_autoptr(GError) err = NULL;
|
|
||||||
|
|
||||||
if (lfb_init(SQUEEKBOARD_APP_ID, &err)) {
|
|
||||||
priv->event = lfb_event_new ("button-pressed");
|
|
||||||
} 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
|
static void
|
||||||
@ -383,7 +344,7 @@ on_notify_keyboard (GObject *object,
|
|||||||
EekGtkKeyboard *self) {
|
EekGtkKeyboard *self) {
|
||||||
(void)spec;
|
(void)spec;
|
||||||
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
|
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
|
||||||
priv->keyboard = eekboard_context_service_get_keyboard(EEKBOARD_CONTEXT_SERVICE(object));
|
priv->keyboard = eek_layout_holder_get_keyboard(LAYOUT_HOLDER(object));
|
||||||
if (priv->renderer) {
|
if (priv->renderer) {
|
||||||
eek_renderer_free(priv->renderer);
|
eek_renderer_free(priv->renderer);
|
||||||
}
|
}
|
||||||
@ -396,7 +357,7 @@ on_notify_keyboard (GObject *object,
|
|||||||
* Returns: a #GtkWidget
|
* Returns: a #GtkWidget
|
||||||
*/
|
*/
|
||||||
GtkWidget *
|
GtkWidget *
|
||||||
eek_gtk_keyboard_new (EekboardContextService *eekservice,
|
eek_gtk_keyboard_new (LayoutHolder *eekservice,
|
||||||
struct submission *submission,
|
struct submission *submission,
|
||||||
struct squeek_layout_state *layout)
|
struct squeek_layout_state *layout)
|
||||||
{
|
{
|
||||||
@ -406,24 +367,6 @@ eek_gtk_keyboard_new (EekboardContextService *eekservice,
|
|||||||
priv->submission = submission;
|
priv->submission = submission;
|
||||||
priv->layout = layout;
|
priv->layout = layout;
|
||||||
priv->renderer = NULL;
|
priv->renderer = NULL;
|
||||||
// This should really be done on initialization.
|
|
||||||
// Before the widget is allocated,
|
|
||||||
// we don't really know what geometry it takes.
|
|
||||||
// When it's off the screen, we also kinda don't.
|
|
||||||
struct render_geometry initial_geometry = {
|
|
||||||
// Set to 100 just to make sure if there's any attempt to use it,
|
|
||||||
// it actually gives plausible results instead of blowing up,
|
|
||||||
// e.g. on zero division.
|
|
||||||
.allocation_width = 100,
|
|
||||||
.allocation_height = 100,
|
|
||||||
.widget_to_layout = {
|
|
||||||
.origin_x = 0,
|
|
||||||
.origin_y = 0,
|
|
||||||
.scale = 1,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
priv->render_geometry = initial_geometry;
|
|
||||||
|
|
||||||
g_signal_connect (eekservice,
|
g_signal_connect (eekservice,
|
||||||
"notify::keyboard",
|
"notify::keyboard",
|
||||||
G_CALLBACK(on_notify_keyboard),
|
G_CALLBACK(on_notify_keyboard),
|
||||||
@ -438,24 +381,3 @@ eek_gtk_keyboard_new (EekboardContextService *eekservice,
|
|||||||
return GTK_WIDGET(box);*/
|
return GTK_WIDGET(box);*/
|
||||||
return GTK_WIDGET(ret);
|
return GTK_WIDGET(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* eek_gtk_keyboard_emit_feedback:
|
|
||||||
*
|
|
||||||
* Emit button press haptic feedback via libfeedack.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
|
|
||||||
{
|
|
||||||
EekGtkKeyboardPrivate *priv;
|
|
||||||
|
|
||||||
g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
|
|
||||||
|
|
||||||
priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
|
||||||
if (priv->event) {
|
|
||||||
lfb_event_trigger_feedback_async (priv->event,
|
|
||||||
NULL,
|
|
||||||
(GAsyncReadyCallback)on_event_triggered,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -28,7 +28,6 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#include "eek/eek-renderer.h"
|
|
||||||
#include "eek/eek-types.h"
|
#include "eek/eek-types.h"
|
||||||
|
|
||||||
struct submission;
|
struct submission;
|
||||||
@ -48,8 +47,8 @@ struct _EekGtkKeyboardClass
|
|||||||
gpointer pdummy[24];
|
gpointer pdummy[24];
|
||||||
};
|
};
|
||||||
|
|
||||||
GtkWidget *eek_gtk_keyboard_new (EekboardContextService *eekservice, struct submission *submission, struct squeek_layout_state *layout);
|
GType eek_gtk_keyboard_get_type (void) G_GNUC_CONST;
|
||||||
void eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self);
|
GtkWidget *eek_gtk_keyboard_new (LayoutHolder *eekservice, struct submission *submission, struct squeek_layout_state *layout);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
#endif /* EEK_GTK_KEYBOARD_H */
|
#endif /* EEK_GTK_KEYBOARD_H */
|
||||||
|
|||||||
@ -21,7 +21,6 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#define _XOPEN_SOURCE 500
|
#define _XOPEN_SOURCE 500
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
@ -31,61 +30,9 @@
|
|||||||
|
|
||||||
#include "eek-keyboard.h"
|
#include "eek-keyboard.h"
|
||||||
|
|
||||||
/// 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");
|
|
||||||
}
|
|
||||||
|
|
||||||
struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
|
|
||||||
XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
|
|
||||||
|
|
||||||
if (!keymap) {
|
|
||||||
g_error("Bad keymap:\n%s", keymap_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
xkb_context_unref(context);
|
|
||||||
|
|
||||||
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) {
|
|
||||||
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...
|
|
||||||
}
|
|
||||||
int keymap_fd = shm_open(path, O_RDWR | O_CREAT | O_EXCL, 0600);
|
|
||||||
if (keymap_fd < 0) {
|
|
||||||
g_error("Failed to set up keymap fd");
|
|
||||||
}
|
|
||||||
|
|
||||||
shm_unlink(path);
|
|
||||||
if (ftruncate(keymap_fd, (off_t)keymap_len)) {
|
|
||||||
g_error("Failed to increase keymap fd size");
|
|
||||||
}
|
|
||||||
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, 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) {
|
void level_keyboard_free(LevelKeyboard *self) {
|
||||||
|
xkb_keymap_unref(self->keymap);
|
||||||
|
close(self->keymap_fd);
|
||||||
squeek_layout_free(self->layout);
|
squeek_layout_free(self->layout);
|
||||||
g_free(self);
|
g_free(self);
|
||||||
}
|
}
|
||||||
@ -94,9 +41,53 @@ LevelKeyboard*
|
|||||||
level_keyboard_new (struct squeek_layout *layout)
|
level_keyboard_new (struct squeek_layout *layout)
|
||||||
{
|
{
|
||||||
LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
|
LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
|
||||||
|
|
||||||
if (!keyboard) {
|
if (!keyboard) {
|
||||||
g_error("Failed to create a keyboard");
|
g_error("Failed to create a keyboard");
|
||||||
}
|
}
|
||||||
keyboard->layout = layout;
|
keyboard->layout = layout;
|
||||||
|
|
||||||
|
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)
|
||||||
|
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;
|
||||||
|
|
||||||
|
g_autofree char *path = strdup("/eek_keymap-XXXXXX");
|
||||||
|
char *r = &path[strlen(path) - 6];
|
||||||
|
getrandom(r, 6, GRND_NONBLOCK);
|
||||||
|
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...
|
||||||
|
}
|
||||||
|
int keymap_fd = shm_open(path, O_RDWR | O_CREAT | O_EXCL, 0600);
|
||||||
|
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)) {
|
||||||
|
g_error("Failed to increase keymap fd size");
|
||||||
|
}
|
||||||
|
char *ptr = mmap(NULL, keyboard->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);
|
||||||
return keyboard;
|
return keyboard;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
* Copyright (C) 2010-2011 Red Hat, Inc.
|
* Copyright (C) 2010-2011 Red Hat, Inc.
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public License
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
* as published by the Free Software Foundation; either version 2 of
|
* as published by the Free Software Foundation; either version 2 of
|
||||||
* the License, or (at your option) any later version.
|
* the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This library is distributed in the hope that it will be useful, but
|
* This library is distributed in the hope that it will be useful, but
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* Lesser General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
@ -32,20 +32,19 @@
|
|||||||
|
|
||||||
G_BEGIN_DECLS
|
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
|
/// Keyboard state holder
|
||||||
struct _LevelKeyboard {
|
struct _LevelKeyboard {
|
||||||
struct squeek_layout *layout; // owned
|
struct squeek_layout *layout; // owned
|
||||||
// FIXME: This no longer needs to exist, keymap was folded into layout.
|
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
|
||||||
};
|
};
|
||||||
typedef struct _LevelKeyboard LevelKeyboard;
|
typedef struct _LevelKeyboard LevelKeyboard;
|
||||||
|
|
||||||
gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
|
gchar * eek_keyboard_get_keymap
|
||||||
|
(LevelKeyboard *keyboard);
|
||||||
|
|
||||||
LevelKeyboard*
|
LevelKeyboard*
|
||||||
level_keyboard_new (struct squeek_layout *layout);
|
level_keyboard_new (struct squeek_layout *layout);
|
||||||
|
|||||||
@ -18,6 +18,8 @@
|
|||||||
* 02110-1301 USA
|
* 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||||
@ -31,6 +33,10 @@
|
|||||||
static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
|
static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
|
||||||
const gchar *label, EekBounds bounds);
|
const gchar *label, EekBounds bounds);
|
||||||
|
|
||||||
|
void eek_render_button (EekRenderer *self,
|
||||||
|
cairo_t *cr, const struct squeek_button *button,
|
||||||
|
gboolean pressed, gboolean locked);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
render_outline (cairo_t *cr,
|
render_outline (cairo_t *cr,
|
||||||
GtkStyleContext *ctx,
|
GtkStyleContext *ctx,
|
||||||
@ -54,21 +60,21 @@ render_outline (cairo_t *cr,
|
|||||||
position.x, position.y, position.width, position.height);
|
position.x, position.y, position.width, position.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Rust interface
|
static void render_button_in_context(gint scale_factor,
|
||||||
void eek_render_button_in_context(uint32_t scale_factor,
|
|
||||||
cairo_t *cr,
|
cairo_t *cr,
|
||||||
GtkStyleContext *ctx,
|
GtkStyleContext *ctx,
|
||||||
EekBounds bounds,
|
const struct squeek_button *button) {
|
||||||
const char *icon_name,
|
|
||||||
const gchar *label) {
|
|
||||||
/* blank background */
|
/* blank background */
|
||||||
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
|
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
|
||||||
cairo_paint (cr);
|
cairo_paint (cr);
|
||||||
|
|
||||||
|
EekBounds bounds = squeek_button_get_bounds(button);
|
||||||
render_outline (cr, ctx, bounds);
|
render_outline (cr, ctx, bounds);
|
||||||
cairo_paint (cr);
|
cairo_paint (cr);
|
||||||
|
|
||||||
/* render icon (if any) */
|
/* render icon (if any) */
|
||||||
|
const char *icon_name = squeek_button_get_icon_name(button);
|
||||||
|
|
||||||
if (icon_name) {
|
if (icon_name) {
|
||||||
cairo_surface_t *icon_surface =
|
cairo_surface_t *icon_surface =
|
||||||
eek_renderer_get_icon_surface (icon_name, 16, scale_factor);
|
eek_renderer_get_icon_surface (icon_name, 16, scale_factor);
|
||||||
@ -98,27 +104,25 @@ void eek_render_button_in_context(uint32_t scale_factor,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const gchar *label = squeek_button_get_label(button);
|
||||||
if (label) {
|
if (label) {
|
||||||
render_button_label (cr, ctx, label, bounds);
|
render_button_label (cr, ctx, label, squeek_button_get_bounds(button));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Prepare context for drawing the button.
|
void
|
||||||
/// The context MUST be released using the corresponing "put" procedure
|
eek_render_button (EekRenderer *self,
|
||||||
/// before drawing the next button.
|
cairo_t *cr,
|
||||||
/// Interface for Rust.
|
const struct squeek_button *button,
|
||||||
GtkStyleContext *
|
gboolean pressed,
|
||||||
eek_get_style_context_for_button (EekRenderer *self,
|
gboolean locked)
|
||||||
const char *name,
|
|
||||||
const char *outline_name,
|
|
||||||
const char *locked_class,
|
|
||||||
uint64_t pressed)
|
|
||||||
{
|
{
|
||||||
GtkStyleContext *ctx = self->button_context;
|
GtkStyleContext *ctx = self->button_context;
|
||||||
/* Set the name of the button on the widget path, using the name obtained
|
/* Set the name of the button on the widget path, using the name obtained
|
||||||
from the button's symbol. */
|
from the button's symbol. */
|
||||||
g_autoptr (GtkWidgetPath) path = NULL;
|
g_autoptr (GtkWidgetPath) path = NULL;
|
||||||
path = gtk_widget_path_copy (gtk_style_context_get_path (ctx));
|
path = gtk_widget_path_copy (gtk_style_context_get_path (ctx));
|
||||||
|
const char *name = squeek_button_get_name(button);
|
||||||
gtk_widget_path_iter_set_name (path, -1, name);
|
gtk_widget_path_iter_set_name (path, -1, name);
|
||||||
|
|
||||||
/* Update the style context with the updated widget path. */
|
/* Update the style context with the updated widget path. */
|
||||||
@ -127,22 +131,19 @@ eek_get_style_context_for_button (EekRenderer *self,
|
|||||||
(pressed) or normal. */
|
(pressed) or normal. */
|
||||||
gtk_style_context_set_state(ctx,
|
gtk_style_context_set_state(ctx,
|
||||||
pressed ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL);
|
pressed ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL);
|
||||||
if (locked_class) {
|
const char *outline_name = squeek_button_get_outline_name(button);
|
||||||
gtk_style_context_add_class(ctx, locked_class);
|
if (locked) {
|
||||||
|
gtk_style_context_add_class(ctx, "locked");
|
||||||
}
|
}
|
||||||
gtk_style_context_add_class(ctx, outline_name);
|
gtk_style_context_add_class(ctx, outline_name);
|
||||||
return ctx;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Interface for Rust.
|
render_button_in_context(self->scale_factor, cr, ctx, button);
|
||||||
void eek_put_style_context_for_button(GtkStyleContext *ctx,
|
|
||||||
const char *outline_name,
|
|
||||||
const char *locked_class) {
|
|
||||||
// Save and restore functions don't work if gtk_render_* was used in between
|
// Save and restore functions don't work if gtk_render_* was used in between
|
||||||
gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
|
gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
|
||||||
gtk_style_context_remove_class(ctx, outline_name);
|
gtk_style_context_remove_class(ctx, outline_name);
|
||||||
if (locked_class) {
|
if (locked) {
|
||||||
gtk_style_context_remove_class(ctx, locked_class);
|
gtk_style_context_remove_class(ctx, "locked");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -193,23 +194,22 @@ render_button_label (cairo_t *cr,
|
|||||||
// FIXME: Pass just the active modifiers instead of entire submission
|
// FIXME: Pass just the active modifiers instead of entire submission
|
||||||
void
|
void
|
||||||
eek_renderer_render_keyboard (EekRenderer *self,
|
eek_renderer_render_keyboard (EekRenderer *self,
|
||||||
struct render_geometry geometry,
|
|
||||||
struct submission *submission,
|
struct submission *submission,
|
||||||
cairo_t *cr,
|
cairo_t *cr,
|
||||||
LevelKeyboard *keyboard)
|
LevelKeyboard *keyboard)
|
||||||
{
|
{
|
||||||
g_return_if_fail (geometry.allocation_width > 0.0);
|
g_return_if_fail (self->allocation_width > 0.0);
|
||||||
g_return_if_fail (geometry.allocation_height > 0.0);
|
g_return_if_fail (self->allocation_height > 0.0);
|
||||||
|
|
||||||
/* Paint the background covering the entire widget area */
|
/* Paint the background covering the entire widget area */
|
||||||
gtk_render_background (self->view_context,
|
gtk_render_background (self->view_context,
|
||||||
cr,
|
cr,
|
||||||
0, 0,
|
0, 0,
|
||||||
geometry.allocation_width, geometry.allocation_height);
|
self->allocation_width, self->allocation_height);
|
||||||
|
|
||||||
cairo_save(cr);
|
cairo_save(cr);
|
||||||
cairo_translate (cr, geometry.widget_to_layout.origin_x, geometry.widget_to_layout.origin_y);
|
cairo_translate (cr, self->widget_to_layout.origin_x, self->widget_to_layout.origin_y);
|
||||||
cairo_scale (cr, geometry.widget_to_layout.scale, geometry.widget_to_layout.scale);
|
cairo_scale (cr, self->widget_to_layout.scale, self->widget_to_layout.scale);
|
||||||
|
|
||||||
squeek_draw_layout_base_view(keyboard->layout, self, cr);
|
squeek_draw_layout_base_view(keyboard->layout, self, cr);
|
||||||
squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
|
squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
|
||||||
@ -241,7 +241,7 @@ static GType new_type(char *name) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static GType view_type(void) {
|
static GType view_type() {
|
||||||
static GType type = 0;
|
static GType type = 0;
|
||||||
if (!type) {
|
if (!type) {
|
||||||
type = new_type("sq_view");
|
type = new_type("sq_view");
|
||||||
@ -249,7 +249,7 @@ static GType view_type(void) {
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GType button_type(void) {
|
static GType button_type() {
|
||||||
static GType type = 0;
|
static GType type = 0;
|
||||||
if (!type) {
|
if (!type) {
|
||||||
type = new_type("sq_button");
|
type = new_type("sq_button");
|
||||||
@ -261,8 +261,14 @@ static void
|
|||||||
renderer_init (EekRenderer *self)
|
renderer_init (EekRenderer *self)
|
||||||
{
|
{
|
||||||
self->pcontext = NULL;
|
self->pcontext = NULL;
|
||||||
|
self->allocation_width = 0.0;
|
||||||
|
self->allocation_height = 0.0;
|
||||||
self->scale_factor = 1;
|
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();
|
self->css_provider = squeek_load_style();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -287,7 +293,7 @@ eek_renderer_new (LevelKeyboard *keyboard,
|
|||||||
}
|
}
|
||||||
gtk_style_context_add_provider (renderer->view_context,
|
gtk_style_context_add_provider (renderer->view_context,
|
||||||
GTK_STYLE_PROVIDER(renderer->css_provider),
|
GTK_STYLE_PROVIDER(renderer->css_provider),
|
||||||
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
|
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||||
|
|
||||||
/* Create a style context for the buttons */
|
/* Create a style context for the buttons */
|
||||||
path = gtk_widget_path_new();
|
path = gtk_widget_path_new();
|
||||||
@ -303,22 +309,26 @@ eek_renderer_new (LevelKeyboard *keyboard,
|
|||||||
gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
|
gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
|
||||||
gtk_style_context_add_provider (renderer->button_context,
|
gtk_style_context_add_provider (renderer->button_context,
|
||||||
GTK_STYLE_PROVIDER(renderer->css_provider),
|
GTK_STYLE_PROVIDER(renderer->css_provider),
|
||||||
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
|
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||||
return renderer;
|
return renderer;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct render_geometry
|
void
|
||||||
eek_render_geometry_from_allocation_size (struct squeek_layout *layout,
|
eek_renderer_set_allocation_size (EekRenderer *renderer,
|
||||||
|
struct squeek_layout *layout,
|
||||||
gdouble width,
|
gdouble width,
|
||||||
gdouble height)
|
gdouble height)
|
||||||
{
|
{
|
||||||
struct render_geometry ret = {
|
g_return_if_fail (width > 0.0 && height > 0.0);
|
||||||
.allocation_width = width,
|
|
||||||
.allocation_height = height,
|
renderer->allocation_width = width;
|
||||||
.widget_to_layout = squeek_layout_calculate_transformation(
|
renderer->allocation_height = height;
|
||||||
layout, width, height),
|
|
||||||
};
|
renderer->widget_to_layout = squeek_layout_calculate_transformation(
|
||||||
return ret;
|
layout,
|
||||||
|
renderer->allocation_width, renderer->allocation_height);
|
||||||
|
|
||||||
|
// This is where size-dependent surfaces would be released
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -327,11 +337,6 @@ eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
|
|||||||
renderer->scale_factor = scale;
|
renderer->scale_factor = scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Rust interface.
|
|
||||||
uint32_t eek_renderer_get_scale_factor(EekRenderer *renderer) {
|
|
||||||
return renderer->scale_factor;
|
|
||||||
}
|
|
||||||
|
|
||||||
cairo_surface_t *
|
cairo_surface_t *
|
||||||
eek_renderer_get_icon_surface (const gchar *icon_name,
|
eek_renderer_get_icon_surface (const gchar *icon_name,
|
||||||
gint size,
|
gint size,
|
||||||
@ -355,3 +360,8 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
|
|||||||
}
|
}
|
||||||
return surface;
|
return surface;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct transformation
|
||||||
|
eek_renderer_get_transformation (EekRenderer *renderer) {
|
||||||
|
return renderer->widget_to_layout;
|
||||||
|
}
|
||||||
|
|||||||
@ -41,23 +41,22 @@ typedef struct EekRenderer
|
|||||||
gchar *extra_style; // owned
|
gchar *extra_style; // owned
|
||||||
|
|
||||||
// Mutable state
|
// Mutable state
|
||||||
gint scale_factor; /* the outputs scale factor */
|
|
||||||
} EekRenderer;
|
|
||||||
|
|
||||||
|
|
||||||
/// Mutable part of the renderer state.
|
|
||||||
/// TODO: Possibly should include scale factor.
|
|
||||||
struct render_geometry {
|
|
||||||
/// Background extents
|
/// Background extents
|
||||||
gdouble allocation_width;
|
gdouble allocation_width;
|
||||||
gdouble allocation_height;
|
gdouble allocation_height;
|
||||||
|
gint scale_factor; /* the outputs scale factor */
|
||||||
/// Coords transformation
|
/// Coords transformation
|
||||||
struct transformation widget_to_layout;
|
struct transformation widget_to_layout;
|
||||||
};
|
} EekRenderer;
|
||||||
|
|
||||||
|
|
||||||
GType eek_renderer_get_type (void) G_GNUC_CONST;
|
GType eek_renderer_get_type (void) G_GNUC_CONST;
|
||||||
EekRenderer *eek_renderer_new (LevelKeyboard *keyboard,
|
EekRenderer *eek_renderer_new (LevelKeyboard *keyboard,
|
||||||
PangoContext *pcontext);
|
PangoContext *pcontext);
|
||||||
|
void eek_renderer_set_allocation_size
|
||||||
|
(EekRenderer *renderer, struct squeek_layout *layout,
|
||||||
|
gdouble width,
|
||||||
|
gdouble height);
|
||||||
void eek_renderer_set_scale_factor (EekRenderer *renderer,
|
void eek_renderer_set_scale_factor (EekRenderer *renderer,
|
||||||
gint scale);
|
gint scale);
|
||||||
|
|
||||||
@ -65,14 +64,13 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar *icon_name,
|
|||||||
gint size,
|
gint size,
|
||||||
gint scale);
|
gint scale);
|
||||||
|
|
||||||
void eek_renderer_render_keyboard (EekRenderer *renderer, struct render_geometry geometry, struct submission *submission,
|
void eek_renderer_render_keyboard (EekRenderer *renderer, struct submission *submission,
|
||||||
cairo_t *cr, LevelKeyboard *keyboard);
|
cairo_t *cr, LevelKeyboard *keyboard);
|
||||||
void
|
void
|
||||||
eek_renderer_free (EekRenderer *self);
|
eek_renderer_free (EekRenderer *self);
|
||||||
|
|
||||||
struct render_geometry
|
struct transformation
|
||||||
eek_render_geometry_from_allocation_size (struct squeek_layout *layout,
|
eek_renderer_get_transformation (EekRenderer *renderer);
|
||||||
gdouble width, gdouble height);
|
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
#endif /* EEK_RENDERER_H */
|
#endif /* EEK_RENDERER_H */
|
||||||
|
|||||||
@ -37,7 +37,7 @@ G_BEGIN_DECLS
|
|||||||
|
|
||||||
typedef struct _EekBounds EekBounds;
|
typedef struct _EekBounds EekBounds;
|
||||||
|
|
||||||
typedef struct _EekboardContextService EekboardContextService;
|
typedef struct _LayoutHolder LayoutHolder;
|
||||||
typedef struct _ServerContextService ServerContextService;
|
typedef struct _ServerContextService ServerContextService;
|
||||||
typedef struct _LevelKeyboard LevelKeyboard;
|
typedef struct _LevelKeyboard LevelKeyboard;
|
||||||
|
|
||||||
@ -90,5 +90,13 @@ struct transformation {
|
|||||||
gdouble scale;
|
gdouble scale;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct squeek_button;
|
||||||
|
struct squeek_row;
|
||||||
|
|
||||||
|
/// Represents the path to the button within a view
|
||||||
|
struct button_place {
|
||||||
|
const struct squeek_row *row;
|
||||||
|
const struct squeek_button *button;
|
||||||
|
};
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
#endif /* EEK_TYPES_H */
|
#endif /* EEK_TYPES_H */
|
||||||
|
|||||||
@ -590,32 +590,27 @@ phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
|
|||||||
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
|
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
|
||||||
priv = phosh_layer_surface_get_instance_private (self);
|
priv = phosh_layer_surface_get_instance_private (self);
|
||||||
|
|
||||||
if (priv->height == height && priv->width == width) {
|
if (priv->height == height && priv->width == width)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
old_width = priv->width;
|
old_width = priv->width;
|
||||||
old_height = priv->height;
|
old_height = priv->height;
|
||||||
|
|
||||||
if (width != -1) {
|
if (width != -1)
|
||||||
priv->width = width;
|
priv->width = width;
|
||||||
}
|
|
||||||
|
|
||||||
if (height != -1) {
|
if (height != -1)
|
||||||
priv->height = height;
|
priv->height = height;
|
||||||
}
|
|
||||||
|
|
||||||
if (gtk_widget_get_mapped (GTK_WIDGET (self))) {
|
if (gtk_widget_get_mapped (GTK_WIDGET (self))) {
|
||||||
zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height);
|
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]);
|
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]);
|
g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH]);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -637,31 +632,25 @@ phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, g
|
|||||||
old_right = priv->margin_right;
|
old_right = priv->margin_right;
|
||||||
old_bottom = priv->margin_bottom;
|
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;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
priv->margin_top = top;
|
priv->margin_top = top;
|
||||||
priv->margin_left = left;
|
priv->margin_left = left;
|
||||||
priv->margin_right = right;
|
priv->margin_right = right;
|
||||||
priv->margin_bottom = bottom;
|
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);
|
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]);
|
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]);
|
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]);
|
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]);
|
g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_RIGHT]);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -680,15 +669,13 @@ phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)
|
|||||||
|
|
||||||
old_zone = priv->exclusive_zone;
|
old_zone = priv->exclusive_zone;
|
||||||
|
|
||||||
if (old_zone == zone) {
|
if (old_zone == zone)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
priv->exclusive_zone = zone;
|
priv->exclusive_zone = zone;
|
||||||
|
|
||||||
if (priv->layer_surface) {
|
if (priv->layer_surface)
|
||||||
zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, zone);
|
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]);
|
g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]);
|
||||||
}
|
}
|
||||||
@ -706,14 +693,13 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
|
|||||||
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
|
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
|
||||||
priv = phosh_layer_surface_get_instance_private (self);
|
priv = phosh_layer_surface_get_instance_private (self);
|
||||||
|
|
||||||
if (priv->kbd_interactivity == interactivity) {
|
if (priv->kbd_interactivity == interactivity)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
priv->kbd_interactivity = interactivity;
|
priv->kbd_interactivity = interactivity;
|
||||||
|
|
||||||
if (priv->layer_surface) {
|
if (priv->layer_surface)
|
||||||
zwlr_layer_surface_v1_set_keyboard_interactivity (priv->layer_surface, interactivity);
|
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]);
|
g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY]);
|
||||||
}
|
}
|
||||||
@ -731,7 +717,6 @@ phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self)
|
|||||||
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
|
g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
|
||||||
priv = phosh_layer_surface_get_instance_private (self);
|
priv = phosh_layer_surface_get_instance_private (self);
|
||||||
|
|
||||||
if (priv->wl_surface) {
|
if (priv->wl_surface)
|
||||||
wl_surface_commit (priv->wl_surface);
|
wl_surface_commit (priv->wl_surface);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,39 +35,17 @@ enum {
|
|||||||
PROP_LAST
|
PROP_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
#define LAYOUT_HOLDER_GET_PRIVATE(obj) \
|
||||||
DESTROYED,
|
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_LAYOUT_HOLDER, LayoutHolderPrivate))
|
||||||
LAST_SIGNAL
|
|
||||||
};
|
|
||||||
|
|
||||||
static guint signals[LAST_SIGNAL] = { 0, };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EekboardContextService:
|
|
||||||
*
|
|
||||||
* Handles layout state, gsettings, and virtual-keyboard.
|
|
||||||
*
|
|
||||||
* TODO: Restrict to managing keyboard layouts, and maybe button repeats,
|
|
||||||
* and the virtual keyboard protocol.
|
|
||||||
*
|
|
||||||
* The #EekboardContextService structure contains only private data
|
|
||||||
* and should only be accessed using the provided API.
|
|
||||||
*/
|
|
||||||
struct _EekboardContextService {
|
|
||||||
GObject parent;
|
|
||||||
struct squeek_layout_state *layout; // Unowned
|
|
||||||
|
|
||||||
|
struct _LayoutHolderPrivate {
|
||||||
LevelKeyboard *keyboard; // currently used keyboard
|
LevelKeyboard *keyboard; // currently used keyboard
|
||||||
GSettings *settings; // Owned reference
|
|
||||||
|
|
||||||
// Maybe TODO: it's used only for fetching layout type.
|
|
||||||
// Maybe let UI push the type to this structure?
|
|
||||||
ServerContextService *ui; // unowned reference
|
|
||||||
/// Needed for keymap changes after keyboard updates
|
/// Needed for keymap changes after keyboard updates
|
||||||
struct submission *submission; // unowned
|
struct submission *submission; // unowned
|
||||||
};
|
};
|
||||||
|
|
||||||
G_DEFINE_TYPE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
|
G_DEFINE_TYPE_WITH_PRIVATE (LayoutHolder, layout_holder, G_TYPE_OBJECT);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eekboard_context_service_set_property (GObject *object,
|
eekboard_context_service_set_property (GObject *object,
|
||||||
@ -84,16 +62,16 @@ eekboard_context_service_set_property (GObject *object,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eekboard_context_service_get_property (GObject *object,
|
layout_holder_get_property (GObject *object,
|
||||||
guint prop_id,
|
guint prop_id,
|
||||||
GValue *value,
|
GValue *value,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
|
LayoutHolder *context = LAYOUT_HOLDER(object);
|
||||||
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
case PROP_KEYBOARD:
|
case PROP_KEYBOARD:
|
||||||
g_value_set_object (value, context->keyboard);
|
g_value_set_object (value, context->priv->keyboard);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
@ -101,13 +79,6 @@ eekboard_context_service_get_property (GObject *object,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
eekboard_context_service_dispose (GObject *object)
|
|
||||||
{
|
|
||||||
G_OBJECT_CLASS (eekboard_context_service_parent_class)->
|
|
||||||
dispose (object);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
settings_get_layout(GSettings *settings, char **type, char **layout)
|
settings_get_layout(GSettings *settings, char **type, char **layout)
|
||||||
{
|
{
|
||||||
@ -127,31 +98,40 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state, uint32_t timestamp) {
|
eek_layout_holder_use_layout(LayoutHolder *context, struct squeek_layout_state *state) {
|
||||||
gchar *layout_name = state->layout_name;
|
*context->layout = *state;
|
||||||
gchar *overlay_name = state->overlay_name;
|
gchar *layout_name = state->overlay_name;
|
||||||
|
|
||||||
// try to get the best keyboard layout
|
|
||||||
if (layout_name == NULL) {
|
if (layout_name == NULL) {
|
||||||
layout_name = "us";
|
layout_name = state->layout_name;
|
||||||
|
|
||||||
|
switch (state->purpose) {
|
||||||
|
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
|
||||||
|
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
|
||||||
|
layout_name = "number";
|
||||||
|
break;
|
||||||
|
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
|
||||||
|
layout_name = "terminal";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (layout_name == NULL) {
|
||||||
|
layout_name = "us";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// overlay is "Normal" for most layouts, we will only look for "terminal" in rust code.
|
|
||||||
// for now just avoid passing a null pointer
|
|
||||||
if (overlay_name == NULL) {
|
|
||||||
overlay_name = ""; // fallback to Normal
|
|
||||||
}
|
|
||||||
|
|
||||||
// generic part follows
|
// generic part follows
|
||||||
struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement, state->purpose, overlay_name);
|
struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
|
||||||
LevelKeyboard *keyboard = level_keyboard_new(layout);
|
LevelKeyboard *keyboard = level_keyboard_new(layout);
|
||||||
// set as current
|
// set as current
|
||||||
LevelKeyboard *previous_keyboard = context->keyboard;
|
LevelKeyboard *previous_keyboard = context->priv->keyboard;
|
||||||
context->keyboard = keyboard;
|
context->priv->keyboard = keyboard;
|
||||||
// Update the keymap if necessary.
|
// Update the keymap if necessary.
|
||||||
// TODO: Update submission on change event
|
// TODO: Update submission on change event
|
||||||
if (context->submission) {
|
if (context->priv->submission) {
|
||||||
submission_use_layout(context->submission, keyboard->layout, timestamp);
|
submission_set_keyboard(context->priv->submission, keyboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update UI
|
// Update UI
|
||||||
@ -163,74 +143,22 @@ eekboard_context_service_use_layout(EekboardContextService *context, struct sque
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void eekboard_context_service_update_settings_layout(EekboardContextService *context) {
|
static void
|
||||||
g_autofree gchar *keyboard_layout = NULL;
|
layout_holder_init (LayoutHolder *self) {
|
||||||
g_autofree gchar *keyboard_type = NULL;
|
self->priv = LAYOUT_HOLDER_GET_PRIVATE(self);
|
||||||
settings_get_layout(context->settings,
|
|
||||||
&keyboard_type, &keyboard_layout);
|
|
||||||
|
|
||||||
if (g_strcmp0(context->layout->layout_name, keyboard_layout) != 0 || context->layout->overlay_name) {
|
|
||||||
g_free(context->layout->overlay_name);
|
|
||||||
context->layout->overlay_name = NULL;
|
|
||||||
if (keyboard_layout) {
|
|
||||||
g_free(context->layout->layout_name);
|
|
||||||
context->layout->layout_name = g_strdup(keyboard_layout);
|
|
||||||
}
|
|
||||||
// This must actually update the UI.
|
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
settings_handle_layout_changed(GSettings *s,
|
|
||||||
gpointer keys, gint n_keys,
|
|
||||||
gpointer user_data) {
|
|
||||||
(void)s;
|
|
||||||
(void)keys;
|
|
||||||
(void)n_keys;
|
|
||||||
EekboardContextService *context = user_data;
|
|
||||||
eekboard_context_service_update_settings_layout(context);
|
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eekboard_context_service_constructed (GObject *object)
|
layout_holder_class_init (LayoutHolderClass *klass)
|
||||||
{
|
|
||||||
(void)object;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eekboard_context_service_class_init (EekboardContextServiceClass *klass)
|
|
||||||
{
|
{
|
||||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||||
GParamSpec *pspec;
|
GParamSpec *pspec;
|
||||||
|
|
||||||
gobject_class->constructed = eekboard_context_service_constructed;
|
|
||||||
gobject_class->set_property = eekboard_context_service_set_property;
|
gobject_class->set_property = eekboard_context_service_set_property;
|
||||||
gobject_class->get_property = eekboard_context_service_get_property;
|
gobject_class->get_property = layout_holder_get_property;
|
||||||
gobject_class->dispose = eekboard_context_service_dispose;
|
|
||||||
/**
|
|
||||||
* EekboardContextService::destroyed:
|
|
||||||
* @context: an #EekboardContextService
|
|
||||||
*
|
|
||||||
* Emitted when @context is destroyed.
|
|
||||||
*/
|
|
||||||
signals[DESTROYED] =
|
|
||||||
g_signal_new (I_("destroyed"),
|
|
||||||
G_TYPE_FROM_CLASS(gobject_class),
|
|
||||||
G_SIGNAL_RUN_LAST,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
g_cclosure_marshal_VOID__VOID,
|
|
||||||
G_TYPE_NONE,
|
|
||||||
0);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EekboardContextService:keyboard:
|
* An #LevelKeyboard currently active in this context.
|
||||||
*
|
|
||||||
* An #EekKeyboard currently active in this context.
|
|
||||||
*/
|
*/
|
||||||
pspec = g_param_spec_pointer("keyboard",
|
pspec = g_param_spec_pointer("keyboard",
|
||||||
"Keyboard",
|
"Keyboard",
|
||||||
@ -241,106 +169,115 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
|
|||||||
pspec);
|
pspec);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
eekboard_context_service_init (EekboardContextService *self)
|
|
||||||
{
|
|
||||||
const char *schema_name = "org.gnome.desktop.input-sources";
|
|
||||||
GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
|
|
||||||
g_autoptr(GSettingsSchema) schema = NULL;
|
|
||||||
|
|
||||||
if (!ssrc) {
|
|
||||||
g_warning("No gsettings schemas installed. Layout switching unavailable.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
schema = g_settings_schema_source_lookup(ssrc, schema_name, TRUE);
|
|
||||||
if (schema) {
|
|
||||||
// Not referencing the found schema directly,
|
|
||||||
// because it's not clear how...
|
|
||||||
self->settings = g_settings_new (schema_name);
|
|
||||||
gulong conn_id = g_signal_connect(self->settings, "change-event",
|
|
||||||
G_CALLBACK(settings_handle_layout_changed),
|
|
||||||
self);
|
|
||||||
if (conn_id == 0) {
|
|
||||||
g_warning ("Could not connect to gsettings updates, "
|
|
||||||
"automatic layout changing unavailable");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
g_warning("Gsettings schema %s is not installed on the system. "
|
|
||||||
"Layout switching unavailable", schema_name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eekboard_context_service_destroy:
|
|
||||||
* @context: an #EekboardContextService
|
|
||||||
*
|
|
||||||
* Destroy @context.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
eekboard_context_service_destroy (EekboardContextService *context)
|
|
||||||
{
|
|
||||||
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
|
||||||
g_signal_emit (context, signals[DESTROYED], 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* eekboard_context_service_get_keyboard:
|
|
||||||
* @context: an #EekboardContextService
|
|
||||||
*
|
|
||||||
* Get keyboard currently active in @context.
|
* Get keyboard currently active in @context.
|
||||||
* Returns: (transfer none): an #EekKeyboard
|
* Returns: (transfer none): a LevelKeyboard
|
||||||
*/
|
*/
|
||||||
LevelKeyboard *
|
LevelKeyboard *
|
||||||
eekboard_context_service_get_keyboard (EekboardContextService *context)
|
eek_layout_holder_get_keyboard (LayoutHolder *context)
|
||||||
{
|
{
|
||||||
return context->keyboard;
|
return context->priv->keyboard;
|
||||||
}
|
}
|
||||||
|
|
||||||
void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
|
void eekboard_context_service_set_hint_purpose(LayoutHolder *context,
|
||||||
uint32_t hint, uint32_t purpose)
|
uint32_t hint, uint32_t purpose)
|
||||||
{
|
{
|
||||||
if (context->layout->hint != hint || context->layout->purpose != purpose) {
|
if (context->layout->hint != hint || context->layout->purpose != purpose) {
|
||||||
context->layout->hint = hint;
|
context->layout->hint = hint;
|
||||||
context->layout->purpose = purpose;
|
context->layout->purpose = purpose;
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
eek_layout_holder_use_layout(context, context->layout);
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
|
eekboard_context_service_set_overlay(LayoutHolder *context, const char* name) {
|
||||||
if (g_strcmp0(context->layout->overlay_name, name)) {
|
if (g_strcmp0(context->layout->overlay_name, name)) {
|
||||||
g_free(context->layout->overlay_name);
|
g_free(context->layout->overlay_name);
|
||||||
context->layout->overlay_name = g_strdup(name);
|
context->layout->overlay_name = g_strdup(name);
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
eek_layout_holder_use_layout(context, context->layout);
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const char*
|
const char*
|
||||||
eekboard_context_service_get_overlay(EekboardContextService *context) {
|
eekboard_context_service_get_overlay(LayoutHolder *context) {
|
||||||
return context->layout->overlay_name;
|
return context->layout->overlay_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
|
LayoutHolder *eek_layout_holder_new(struct squeek_layout_state *state)
|
||||||
{
|
{
|
||||||
EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
|
LayoutHolder *context = g_object_new (EEKBOARD_TYPE_LAYOUT_HOLDER, NULL);
|
||||||
context->layout = state;
|
context->layout = state;
|
||||||
eekboard_context_service_update_settings_layout(context);
|
eek_layout_holder_use_layout(context, context->layout);
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
||||||
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
|
void eek_layout_holder_set_submission(LayoutHolder *context, struct submission *submission) {
|
||||||
context->submission = submission;
|
context->priv->submission = submission;
|
||||||
if (context->submission) {
|
if (context->priv->submission) {
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
submission_set_keyboard(context->priv->submission, context->priv->keyboard);
|
||||||
submission_use_layout(context->submission, context->keyboard->layout, time);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
|
static void settings_update_layout(struct gsettings_tracker *self) {
|
||||||
context->ui = ui;
|
// The layout in the param must be the same layout as held by context.
|
||||||
|
g_autofree gchar *keyboard_layout = NULL;
|
||||||
|
g_autofree gchar *keyboard_type = NULL;
|
||||||
|
settings_get_layout(self->gsettings,
|
||||||
|
&keyboard_type, &keyboard_layout);
|
||||||
|
|
||||||
|
if (g_strcmp0(self->layout->layout_name, keyboard_layout) != 0 || self->layout->overlay_name) {
|
||||||
|
g_free(self->layout->overlay_name);
|
||||||
|
self->layout->overlay_name = NULL;
|
||||||
|
if (keyboard_layout) {
|
||||||
|
g_free(self->layout->layout_name);
|
||||||
|
self->layout->layout_name = g_strdup(keyboard_layout);
|
||||||
|
}
|
||||||
|
// This must actually update the UI.
|
||||||
|
eek_layout_holder_use_layout(self->context, self->layout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
handle_layout_changed(GSettings *s,
|
||||||
|
gpointer keys, gint n_keys,
|
||||||
|
gpointer user_data) {
|
||||||
|
(void)s;
|
||||||
|
(void)keys;
|
||||||
|
(void)n_keys;
|
||||||
|
struct gsettings_tracker *self = user_data;
|
||||||
|
settings_update_layout(self);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
void eek_gsettings_tracker_init(struct gsettings_tracker *tracker, LayoutHolder *context, struct squeek_layout_state *layout)
|
||||||
|
{
|
||||||
|
tracker->layout = layout;
|
||||||
|
tracker->context = context;
|
||||||
|
|
||||||
|
const char *schema_name = "org.gnome.desktop.input-sources";
|
||||||
|
GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
|
||||||
|
if (ssrc) {
|
||||||
|
GSettingsSchema *schema = g_settings_schema_source_lookup(ssrc,
|
||||||
|
schema_name,
|
||||||
|
TRUE);
|
||||||
|
if (schema) {
|
||||||
|
// Not referencing the found schema directly,
|
||||||
|
// because it's not clear how...
|
||||||
|
tracker->gsettings = g_settings_new (schema_name);
|
||||||
|
gulong conn_id = g_signal_connect(tracker->gsettings, "change-event",
|
||||||
|
G_CALLBACK(handle_layout_changed),
|
||||||
|
tracker);
|
||||||
|
if (conn_id == 0) {
|
||||||
|
g_warning ("Could not connect to gsettings updates, "
|
||||||
|
"automatic layout changing unavailable");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
g_warning("Gsettings schema %s is not installed on the system. "
|
||||||
|
"Layout switching unavailable", schema_name);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
g_warning("No gsettings schemas installed. Layout switching unavailable.");
|
||||||
|
}
|
||||||
|
|
||||||
|
settings_update_layout(tracker);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,26 +30,60 @@
|
|||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define EEKBOARD_CONTEXT_SERVICE_PATH "/org/fedorahosted/Eekboard/Context_%d"
|
#define EEKBOARD_TYPE_LAYOUT_HOLDER (layout_holder_get_type())
|
||||||
#define EEKBOARD_CONTEXT_SERVICE_INTERFACE "org.fedorahosted.Eekboard.Context"
|
#define LAYOUT_HOLDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_LAYOUT_HOLDER, LayoutHolder))
|
||||||
|
#define EEKBOARD_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServiceClass))
|
||||||
|
#define EEKBOARD_IS_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE))
|
||||||
|
#define EEKBOARD_IS_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CONTEXT_SERVICE))
|
||||||
|
#define EEKBOARD_CONTEXT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServiceClass))
|
||||||
|
|
||||||
#define EEKBOARD_TYPE_CONTEXT_SERVICE (eekboard_context_service_get_type())
|
|
||||||
|
|
||||||
G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD, CONTEXT_SERVICE, GObject)
|
typedef struct _LayoutHolderClass LayoutHolderClass;
|
||||||
|
typedef struct _LayoutHolderPrivate LayoutHolderPrivate;
|
||||||
|
|
||||||
EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
|
/**
|
||||||
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
|
* Handles layout state, and virtual-keyboard.
|
||||||
void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
|
*
|
||||||
void eekboard_context_service_destroy (EekboardContextService *context);
|
* TODO: Restrict to managing keyboard layouts, and maybe button repeats,
|
||||||
LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
|
* and the virtual keyboard protocol.
|
||||||
|
*/
|
||||||
|
struct _LayoutHolder {
|
||||||
|
GObject parent;
|
||||||
|
LayoutHolderPrivate *priv;
|
||||||
|
struct squeek_layout_state *layout; // Unowned
|
||||||
|
};
|
||||||
|
|
||||||
void eekboard_context_service_set_keymap(EekboardContextService *context,
|
struct _LayoutHolderClass {
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< private >*/
|
||||||
|
/* padding */
|
||||||
|
gpointer pdummy[24];
|
||||||
|
};
|
||||||
|
|
||||||
|
GType layout_holder_get_type(void) G_GNUC_CONST;
|
||||||
|
|
||||||
|
/// Handles gsettings os-level keyboard layout switches.
|
||||||
|
struct gsettings_tracker {
|
||||||
|
GSettings *gsettings; // Owned reference
|
||||||
|
LayoutHolder *context; // Unowned
|
||||||
|
struct squeek_layout_state *layout; // Unowned
|
||||||
|
};
|
||||||
|
|
||||||
|
void eek_gsettings_tracker_init(struct gsettings_tracker* tracker, LayoutHolder *context, struct squeek_layout_state *layout);
|
||||||
|
|
||||||
|
LayoutHolder *eek_layout_holder_new(struct squeek_layout_state *state);
|
||||||
|
void eek_layout_holder_set_submission(LayoutHolder *context, struct submission *submission);
|
||||||
|
LevelKeyboard *eek_layout_holder_get_keyboard(LayoutHolder *context);
|
||||||
|
|
||||||
|
void eekboard_context_service_set_keymap(LayoutHolder *context,
|
||||||
const LevelKeyboard *keyboard);
|
const LevelKeyboard *keyboard);
|
||||||
|
|
||||||
void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
|
void eekboard_context_service_set_hint_purpose(LayoutHolder *context,
|
||||||
uint32_t hint,
|
uint32_t hint,
|
||||||
uint32_t purpose);
|
uint32_t purpose);
|
||||||
void
|
void
|
||||||
eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *layout, uint32_t timestamp);
|
eek_layout_holder_use_layout(LayoutHolder *context, struct squeek_layout_state *layout);
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
#endif /* EEKBOARD_CONTEXT_SERVICE_H */
|
#endif /* EEKBOARD_CONTEXT_SERVICE_H */
|
||||||
|
|||||||
@ -5,7 +5,6 @@ use std::env;
|
|||||||
|
|
||||||
fn main() -> () {
|
fn main() -> () {
|
||||||
check_builtin_layout(
|
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),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
53
meson.build
53
meson.build
@ -1,7 +1,7 @@
|
|||||||
project(
|
project(
|
||||||
'squeekboard',
|
'squeekboard',
|
||||||
'c', 'rust',
|
'c', 'rust',
|
||||||
version: '1.14.0',
|
version: '1.8.0',
|
||||||
license: 'GPLv3',
|
license: 'GPLv3',
|
||||||
meson_version: '>=0.51.0',
|
meson_version: '>=0.51.0',
|
||||||
default_options: [
|
default_options: [
|
||||||
@ -19,17 +19,6 @@ add_project_arguments(
|
|||||||
'-Werror=missing-field-initializers',
|
'-Werror=missing-field-initializers',
|
||||||
'-Werror=incompatible-pointer-types',
|
'-Werror=incompatible-pointer-types',
|
||||||
'-Werror=int-conversion',
|
'-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',
|
|
||||||
],
|
],
|
||||||
language: 'c'
|
language: 'c'
|
||||||
)
|
)
|
||||||
@ -41,16 +30,6 @@ conf_data = configuration_data()
|
|||||||
if get_option('buildtype').startswith('debug')
|
if get_option('buildtype').startswith('debug')
|
||||||
add_project_arguments('-DDEBUG=1', language : 'c')
|
add_project_arguments('-DDEBUG=1', language : 'c')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('strict')
|
|
||||||
add_project_arguments(
|
|
||||||
[
|
|
||||||
'-Werror',
|
|
||||||
],
|
|
||||||
language: 'c'
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if get_option('buildtype') != 'plain'
|
if get_option('buildtype') != 'plain'
|
||||||
add_project_arguments('-fstack-protector-strong', language: 'c')
|
add_project_arguments('-fstack-protector-strong', language: 'c')
|
||||||
endif
|
endif
|
||||||
@ -63,7 +42,6 @@ endif
|
|||||||
prefix = get_option('prefix')
|
prefix = get_option('prefix')
|
||||||
bindir = join_paths(prefix, get_option('bindir'))
|
bindir = join_paths(prefix, get_option('bindir'))
|
||||||
datadir = join_paths(prefix, get_option('datadir'))
|
datadir = join_paths(prefix, get_option('datadir'))
|
||||||
desktopdir = join_paths(datadir, 'applications')
|
|
||||||
pkgdatadir = join_paths(datadir, meson.project_name())
|
pkgdatadir = join_paths(datadir, meson.project_name())
|
||||||
if get_option('depdatadir') == ''
|
if get_option('depdatadir') == ''
|
||||||
depdatadir = datadir
|
depdatadir = datadir
|
||||||
@ -82,36 +60,9 @@ summary = [
|
|||||||
]
|
]
|
||||||
message('\n'.join(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())
|
|
||||||
cargo_toml_base = configure_file(
|
|
||||||
input: 'Cargo.toml.in',
|
|
||||||
output: 'Cargo.toml.base',
|
|
||||||
configuration: path_data,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
cargo_deps = files('Cargo.deps')
|
|
||||||
|
|
||||||
if get_option('legacy') == true
|
|
||||||
cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5,rustc_less_1_36']
|
|
||||||
cargo_deps = files('Cargo.deps.legacy')
|
|
||||||
endif
|
|
||||||
|
|
||||||
cat = find_program('cat')
|
|
||||||
cargo_toml = custom_target(
|
|
||||||
'Cargo.toml',
|
|
||||||
output: 'Cargo.toml',
|
|
||||||
command: [cat, cargo_toml_base, cargo_deps],
|
|
||||||
capture: true,
|
|
||||||
)
|
|
||||||
|
|
||||||
dep_cargo = find_program('cargo')
|
dep_cargo = find_program('cargo')
|
||||||
cargo_script = find_program('cargo.sh')
|
cargo_script = find_program('cargo.sh')
|
||||||
cargo_build = find_program('cargo_build.py')
|
cargo_build = find_program('cargo_build.sh')
|
||||||
|
|
||||||
subdir('data')
|
subdir('data')
|
||||||
subdir('protocols')
|
subdir('protocols')
|
||||||
|
|||||||
@ -6,11 +6,3 @@ option('depdatadir',
|
|||||||
option('tests',
|
option('tests',
|
||||||
type: 'boolean', value: true,
|
type: 'boolean', value: true,
|
||||||
description: 'Whether to compile unit tests')
|
description: 'Whether to compile unit 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')
|
|
||||||
|
|||||||
@ -294,8 +294,8 @@
|
|||||||
|
|
||||||
The serial number reflects the last state of the zwp_input_method_v2
|
The serial number reflects the last state of the zwp_input_method_v2
|
||||||
object known to the client. The value of the serial argument must be
|
object known to the client. The value of the serial argument must be
|
||||||
equal to the number of done events already issued on that object.
|
equal to the number of commit requests already issued on that object.
|
||||||
When the compositor receives a commit request with a serial different than
|
When the compositor receives a done event with a serial different than
|
||||||
the number of past commit requests, it must proceed as normal, except
|
the number of past commit requests, it must proceed as normal, except
|
||||||
it should not change the current state of the zwp_input_method_v2
|
it should not change the current state of the zwp_input_method_v2
|
||||||
object.
|
object.
|
||||||
|
|||||||
@ -10,14 +10,13 @@ pub struct KeySym(pub String);
|
|||||||
type View = String;
|
type View = String;
|
||||||
|
|
||||||
/// Use to send modified keypresses
|
/// Use to send modified keypresses
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
||||||
pub enum Modifier {
|
pub enum Modifier {
|
||||||
/// Control and Alt are the only modifiers
|
/// Control and Alt are the only modifiers
|
||||||
/// which doesn't interfere with levels,
|
/// which doesn't interfere with levels,
|
||||||
/// so it's simple to implement as levels are deprecated in squeekboard.
|
/// so it's simple to implement as levels are deprecated in squeekboard.
|
||||||
Control,
|
Control,
|
||||||
Alt,
|
Alt,
|
||||||
Mod4,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Action to perform on the keypress and, in reverse, on keyrelease
|
/// Action to perform on the keypress and, in reverse, on keyrelease
|
||||||
@ -30,11 +29,6 @@ pub enum Action {
|
|||||||
lock: View,
|
lock: View,
|
||||||
/// When unlocked by pressing it or emitting a key
|
/// When unlocked by pressing it or emitting a key
|
||||||
unlock: View,
|
unlock: View,
|
||||||
/// Whether key has a latched state
|
|
||||||
/// that pops when another key is pressed.
|
|
||||||
latches: bool,
|
|
||||||
/// Should take on *locked* appearance whenever latch comes back to those views.
|
|
||||||
looks_locked_from: Vec<View>,
|
|
||||||
},
|
},
|
||||||
/// Hold this modifier for as long as the button is pressed
|
/// Hold this modifier for as long as the button is pressed
|
||||||
ApplyModifier(Modifier),
|
ApplyModifier(Modifier),
|
||||||
@ -54,24 +48,14 @@ pub enum Action {
|
|||||||
impl Action {
|
impl Action {
|
||||||
pub fn is_locked(&self, view_name: &str) -> bool {
|
pub fn is_locked(&self, view_name: &str) -> bool {
|
||||||
match self {
|
match self {
|
||||||
Action::LockView { lock, unlock: _, latches: _, looks_locked_from: _ } => lock == view_name,
|
Action::LockView { lock, unlock: _ } => lock == view_name,
|
||||||
_ => false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn has_locked_appearance_from(&self, locked_view_name: &str) -> bool {
|
|
||||||
match self {
|
|
||||||
Action::LockView { lock: _, unlock: _, latches: _, looks_locked_from } => {
|
|
||||||
looks_locked_from.iter()
|
|
||||||
.find(|view| locked_view_name == view.as_str())
|
|
||||||
.is_some()
|
|
||||||
},
|
|
||||||
_ => false,
|
_ => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn is_active(&self, view_name: &str) -> bool {
|
pub fn is_active(&self, view_name: &str) -> bool {
|
||||||
match self {
|
match self {
|
||||||
Action::SetView(view) => view == view_name,
|
Action::SetView(view) => view == view_name,
|
||||||
Action::LockView { lock, unlock: _, latches: _, looks_locked_from: _ } => lock == view_name,
|
Action::LockView { lock, unlock: _ } => lock == view_name,
|
||||||
_ => false,
|
_ => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,30 +1,32 @@
|
|||||||
/* Copyright (C) 2020-2021 Purism SPC
|
/**! The parsing of the data files for layouts */
|
||||||
* SPDX-License-Identifier: GPL-3.0+
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*! Parsing of the data files containing layouts */
|
// TODO: find a nice way to make sure non-positive sizes don't break layouts
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::collections::{ HashMap, HashSet };
|
use std::collections::{ HashMap, HashSet };
|
||||||
|
use std::env;
|
||||||
use std::ffi::CString;
|
use std::ffi::CString;
|
||||||
|
use std::fmt;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
use std::io;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use xkbcommon::xkb;
|
use xkbcommon::xkb;
|
||||||
|
|
||||||
use super::{ Error, LoadError };
|
|
||||||
|
|
||||||
use ::action;
|
use ::action;
|
||||||
use ::keyboard::{
|
use ::keyboard::{
|
||||||
KeyState, PressType,
|
KeyState, PressType,
|
||||||
generate_keymaps, generate_keycodes, KeyCode, FormattingError
|
generate_keymap, generate_keycodes, FormattingError
|
||||||
};
|
};
|
||||||
use ::layout;
|
use ::layout;
|
||||||
|
use ::layout::ArrangementKind;
|
||||||
use ::logging;
|
use ::logging;
|
||||||
use ::util::hash_map_map;
|
|
||||||
use ::resources;
|
use ::resources;
|
||||||
|
use ::util::c::as_str;
|
||||||
|
use ::util::hash_map_map;
|
||||||
|
use ::xdg;
|
||||||
|
|
||||||
// traits, derives
|
// traits, derives
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
@ -32,7 +34,183 @@ use std::io::BufReader;
|
|||||||
use std::iter::FromIterator;
|
use std::iter::FromIterator;
|
||||||
use ::logging::Warn;
|
use ::logging::Warn;
|
||||||
|
|
||||||
// TODO: find a nice way to make sure non-positive sizes don't break layouts
|
/// Gathers stuff defined in C or called by C
|
||||||
|
pub mod c {
|
||||||
|
use super::*;
|
||||||
|
use std::os::raw::c_char;
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C"
|
||||||
|
fn squeek_load_layout(
|
||||||
|
name: *const c_char,
|
||||||
|
type_: u32,
|
||||||
|
) -> *mut ::layout::Layout {
|
||||||
|
let type_ = match type_ {
|
||||||
|
0 => ArrangementKind::Base,
|
||||||
|
1 => ArrangementKind::Wide,
|
||||||
|
_ => panic!("Bad enum value"),
|
||||||
|
};
|
||||||
|
let name = as_str(&name)
|
||||||
|
.expect("Bad layout name")
|
||||||
|
.expect("Empty layout name");
|
||||||
|
|
||||||
|
let (kind, layout) = load_layout_data_with_fallback(&name, type_);
|
||||||
|
let layout = ::layout::Layout::new(layout, kind);
|
||||||
|
Box::into_raw(Box::new(layout))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const FALLBACK_LAYOUT_NAME: &str = "us";
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum LoadError {
|
||||||
|
BadData(Error),
|
||||||
|
MissingResource,
|
||||||
|
BadResource(serde_yaml::Error),
|
||||||
|
BadKeyMap(FormattingError),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for LoadError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
use self::LoadError::*;
|
||||||
|
match self {
|
||||||
|
BadData(e) => write!(f, "Bad data: {}", e),
|
||||||
|
MissingResource => write!(f, "Missing resource"),
|
||||||
|
BadResource(e) => write!(f, "Bad resource: {}", e),
|
||||||
|
BadKeyMap(e) => write!(f, "Bad key map: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
enum DataSource {
|
||||||
|
File(PathBuf),
|
||||||
|
Resource(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for DataSource {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
DataSource::File(path) => write!(f, "Path: {:?}", path.display()),
|
||||||
|
DataSource::Resource(name) => write!(f, "Resource: {}", name),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 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
|
||||||
|
fn list_layout_sources(
|
||||||
|
name: &str,
|
||||||
|
kind: ArrangementKind,
|
||||||
|
keyboards_path: Option<PathBuf>,
|
||||||
|
) -> 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")
|
||||||
|
)
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
ret.push((
|
||||||
|
kind.clone(),
|
||||||
|
DataSource::Resource(name.into())
|
||||||
|
));
|
||||||
|
};
|
||||||
|
|
||||||
|
match &kind {
|
||||||
|
ArrangementKind::Base => {},
|
||||||
|
kind => add_by_name(
|
||||||
|
&name_with_arrangement(name.into(), &kind),
|
||||||
|
&kind,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
|
||||||
|
add_by_name(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);
|
||||||
|
}
|
||||||
|
ret
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load_layout_data(source: DataSource)
|
||||||
|
-> Result<::layout::LayoutData, LoadError>
|
||||||
|
{
|
||||||
|
let handler = logging::Print {};
|
||||||
|
match source {
|
||||||
|
DataSource::File(path) => {
|
||||||
|
Layout::from_file(path.clone())
|
||||||
|
.map_err(LoadError::BadData)
|
||||||
|
.and_then(|layout|
|
||||||
|
layout.build(handler).0.map_err(LoadError::BadKeyMap)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
DataSource::Resource(name) => {
|
||||||
|
Layout::from_resource(&name)
|
||||||
|
.and_then(|layout|
|
||||||
|
layout.build(handler).0.map_err(LoadError::BadKeyMap)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load_layout_data_with_fallback(
|
||||||
|
name: &str,
|
||||||
|
kind: ArrangementKind,
|
||||||
|
) -> (ArrangementKind, ::layout::LayoutData) {
|
||||||
|
let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.or_else(|| xdg::data_path("squeekboard/keyboards"));
|
||||||
|
|
||||||
|
for (kind, source) in list_layout_sources(name, kind, path) {
|
||||||
|
let layout = load_layout_data(source.clone());
|
||||||
|
match layout {
|
||||||
|
Err(e) => match (e, source) {
|
||||||
|
(
|
||||||
|
LoadError::BadData(Error::Missing(e)),
|
||||||
|
DataSource::File(file)
|
||||||
|
) => log_print!(
|
||||||
|
logging::Level::Debug,
|
||||||
|
"Tried file {:?}, but it's missing: {}",
|
||||||
|
file, e
|
||||||
|
),
|
||||||
|
(e, source) => log_print!(
|
||||||
|
logging::Level::Warning,
|
||||||
|
"Failed to load layout from {}: {}, skipping",
|
||||||
|
source, e
|
||||||
|
),
|
||||||
|
},
|
||||||
|
Ok(layout) => {
|
||||||
|
log_print!(logging::Level::Info, "Loaded layout {}", source);
|
||||||
|
return (kind, layout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
panic!("No useful layout found!");
|
||||||
|
}
|
||||||
|
|
||||||
/// The root element describing an entire keyboard
|
/// The root element describing an entire keyboard
|
||||||
#[derive(Debug, Deserialize, PartialEq)]
|
#[derive(Debug, Deserialize, PartialEq)]
|
||||||
@ -88,13 +266,7 @@ struct ButtonMeta {
|
|||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
enum Action {
|
enum Action {
|
||||||
#[serde(rename="locking")]
|
#[serde(rename="locking")]
|
||||||
Locking {
|
Locking { lock_view: String, unlock_view: String },
|
||||||
lock_view: String,
|
|
||||||
unlock_view: String,
|
|
||||||
pops: Option<bool>,
|
|
||||||
#[serde(default)]
|
|
||||||
looks_locked_from: Vec<String>,
|
|
||||||
},
|
|
||||||
#[serde(rename="set_view")]
|
#[serde(rename="set_view")]
|
||||||
SetView(String),
|
SetView(String),
|
||||||
#[serde(rename="show_prefs")]
|
#[serde(rename="show_prefs")]
|
||||||
@ -125,6 +297,37 @@ struct Outline {
|
|||||||
height: f64,
|
height: f64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Errors encountered loading the layout into yaml
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum Error {
|
||||||
|
Yaml(serde_yaml::Error),
|
||||||
|
Io(io::Error),
|
||||||
|
/// The file was missing.
|
||||||
|
/// It's distinct from Io in order to make it matchable
|
||||||
|
/// without calling io::Error::kind()
|
||||||
|
Missing(io::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Error {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
Error::Yaml(e) => write!(f, "YAML: {}", e),
|
||||||
|
Error::Io(e) => write!(f, "IO: {}", e),
|
||||||
|
Error::Missing(e) => write!(f, "Missing: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<io::Error> for Error {
|
||||||
|
fn from(e: io::Error) -> Self {
|
||||||
|
let kind = e.kind();
|
||||||
|
match kind {
|
||||||
|
io::ErrorKind::NotFound => Error::Missing(e),
|
||||||
|
_ => Error::Io(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn add_offsets<'a, I: 'a, T, F: 'a>(iterator: I, get_size: F)
|
pub fn add_offsets<'a, I: 'a, T, F: 'a>(iterator: I, get_size: F)
|
||||||
-> impl Iterator<Item=(f64, T)> + 'a
|
-> impl Iterator<Item=(f64, T)> + 'a
|
||||||
where I: Iterator<Item=T>,
|
where I: Iterator<Item=T>,
|
||||||
@ -179,45 +382,56 @@ impl Layout {
|
|||||||
)
|
)
|
||||||
)}).collect();
|
)}).collect();
|
||||||
|
|
||||||
let symbolmap: HashMap<String, KeyCode> = generate_keycodes(
|
let keymap: HashMap<String, u32> = generate_keycodes(
|
||||||
extract_symbol_names(&button_actions)
|
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 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::<String, KeyState>::from_iter(
|
let button_states = HashMap::<String, KeyState>::from_iter(
|
||||||
button_actions.into_iter().map(|(name, action)| {
|
button_states
|
||||||
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,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
})
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let keymaps = match generate_keymaps(symbolmap) {
|
// TODO: generate from symbols
|
||||||
|
let keymap_str = match generate_keymap(&button_states) {
|
||||||
Err(e) => { return (Err(e), warning_handler) },
|
Err(e) => { return (Err(e), warning_handler) },
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
};
|
};
|
||||||
@ -245,14 +459,14 @@ impl Layout {
|
|||||||
&mut warning_handler,
|
&mut warning_handler,
|
||||||
))
|
))
|
||||||
});
|
});
|
||||||
layout::Row::new(
|
layout::Row {
|
||||||
add_offsets(
|
buttons: add_offsets(
|
||||||
buttons,
|
buttons,
|
||||||
|button| button.size.width,
|
|button| button.size.width,
|
||||||
).collect()
|
).collect()
|
||||||
)
|
}
|
||||||
});
|
});
|
||||||
let rows = add_offsets(rows, |row| row.get_size().height)
|
let rows = add_offsets(rows, |row| row.get_height())
|
||||||
.collect();
|
.collect();
|
||||||
(
|
(
|
||||||
name.clone(),
|
name.clone(),
|
||||||
@ -270,8 +484,8 @@ impl Layout {
|
|||||||
name,
|
name,
|
||||||
(
|
(
|
||||||
layout::c::Point {
|
layout::c::Point {
|
||||||
x: (total_size.width - view.get_size().width) / 2.0,
|
x: (total_size.width - view.get_width()) / 2.0,
|
||||||
y: (total_size.height - view.get_size().height) / 2.0,
|
y: (total_size.height - view.get_height()) / 2.0,
|
||||||
},
|
},
|
||||||
view,
|
view,
|
||||||
),
|
),
|
||||||
@ -281,10 +495,10 @@ impl Layout {
|
|||||||
(
|
(
|
||||||
Ok(::layout::LayoutData {
|
Ok(::layout::LayoutData {
|
||||||
views: views,
|
views: views,
|
||||||
keymaps: keymaps.into_iter().map(|keymap_str|
|
keymap_str: {
|
||||||
CString::new(keymap_str)
|
CString::new(keymap_str)
|
||||||
.expect("Invalid keymap string generated")
|
.expect("Invalid keymap string generated")
|
||||||
).collect(),
|
},
|
||||||
// FIXME: use a dedicated field
|
// FIXME: use a dedicated field
|
||||||
margins: layout::Margins {
|
margins: layout::Margins {
|
||||||
top: self.margins.top,
|
top: self.margins.top,
|
||||||
@ -317,7 +531,7 @@ fn create_action<H: logging::Handler>(
|
|||||||
Text(String),
|
Text(String),
|
||||||
Keysym(String),
|
Keysym(String),
|
||||||
Modifier(Modifier),
|
Modifier(Modifier),
|
||||||
}
|
};
|
||||||
|
|
||||||
let submission = match (
|
let submission = match (
|
||||||
&symbol_meta.action,
|
&symbol_meta.action,
|
||||||
@ -374,9 +588,7 @@ fn create_action<H: logging::Handler>(
|
|||||||
)
|
)
|
||||||
),
|
),
|
||||||
SubmitData::Action(Action::Locking {
|
SubmitData::Action(Action::Locking {
|
||||||
lock_view, unlock_view,
|
lock_view, unlock_view
|
||||||
pops,
|
|
||||||
looks_locked_from,
|
|
||||||
}) => ::action::Action::LockView {
|
}) => ::action::Action::LockView {
|
||||||
lock: filter_view_name(
|
lock: filter_view_name(
|
||||||
name,
|
name,
|
||||||
@ -390,8 +602,6 @@ fn create_action<H: logging::Handler>(
|
|||||||
&view_names,
|
&view_names,
|
||||||
warning_handler,
|
warning_handler,
|
||||||
),
|
),
|
||||||
latches: pops.unwrap_or(true),
|
|
||||||
looks_locked_from,
|
|
||||||
},
|
},
|
||||||
SubmitData::Action(
|
SubmitData::Action(
|
||||||
Action::ShowPrefs
|
Action::ShowPrefs
|
||||||
@ -436,9 +646,6 @@ fn create_action<H: logging::Handler>(
|
|||||||
Modifier::Alt => action::Action::ApplyModifier(
|
Modifier::Alt => action::Action::ApplyModifier(
|
||||||
action::Modifier::Alt,
|
action::Modifier::Alt,
|
||||||
),
|
),
|
||||||
Modifier::Mod4 => action::Action::ApplyModifier(
|
|
||||||
action::Modifier::Mod4,
|
|
||||||
),
|
|
||||||
unsupported_modifier => {
|
unsupported_modifier => {
|
||||||
warning_handler.handle(
|
warning_handler.handle(
|
||||||
logging::Level::Bug,
|
logging::Level::Bug,
|
||||||
@ -527,53 +734,17 @@ fn create_button<H: logging::Handler>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn extract_symbol_names<'a>(actions: &'a [(&str, action::Action)])
|
|
||||||
-> impl Iterator<Item=String> + '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)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
use std::env;
|
use std::error::Error as ErrorTrait;
|
||||||
|
|
||||||
use ::logging::ProblemPanic;
|
use ::logging::ProblemPanic;
|
||||||
|
|
||||||
fn path_from_root(file: &'static str) -> PathBuf {
|
|
||||||
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]
|
#[test]
|
||||||
fn test_parse_path() {
|
fn test_parse_path() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Layout::from_file(path_from_root("tests/layout.yaml")).unwrap(),
|
Layout::from_file(PathBuf::from("tests/layout.yaml")).unwrap(),
|
||||||
Layout {
|
Layout {
|
||||||
margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
|
margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
|
||||||
views: hashmap!(
|
views: hashmap!(
|
||||||
@ -600,14 +771,13 @@ mod tests {
|
|||||||
/// Check if the default protection works
|
/// Check if the default protection works
|
||||||
#[test]
|
#[test]
|
||||||
fn test_empty_views() {
|
fn test_empty_views() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout2.yaml"));
|
let out = Layout::from_file(PathBuf::from("tests/layout2.yaml"));
|
||||||
match out {
|
match out {
|
||||||
Ok(_) => assert!(false, "Data mistakenly accepted"),
|
Ok(_) => assert!(false, "Data mistakenly accepted"),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let mut handled = false;
|
let mut handled = false;
|
||||||
if let Error::Yaml(ye) = &e {
|
if let Error::Yaml(ye) = &e {
|
||||||
handled = ye.to_string()
|
handled = ye.description() == "missing field `views`";
|
||||||
.starts_with("missing field `views`");
|
|
||||||
};
|
};
|
||||||
if !handled {
|
if !handled {
|
||||||
println!("Unexpected error {:?}", e);
|
println!("Unexpected error {:?}", e);
|
||||||
@ -619,13 +789,13 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_extra_field() {
|
fn test_extra_field() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout3.yaml"));
|
let out = Layout::from_file(PathBuf::from("tests/layout3.yaml"));
|
||||||
match out {
|
match out {
|
||||||
Ok(_) => assert!(false, "Data mistakenly accepted"),
|
Ok(_) => assert!(false, "Data mistakenly accepted"),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let mut handled = false;
|
let mut handled = false;
|
||||||
if let Error::Yaml(ye) = &e {
|
if let Error::Yaml(ye) = &e {
|
||||||
handled = ye.to_string()
|
handled = ye.description()
|
||||||
.starts_with("unknown field `bad_field`");
|
.starts_with("unknown field `bad_field`");
|
||||||
};
|
};
|
||||||
if !handled {
|
if !handled {
|
||||||
@ -638,14 +808,14 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_layout_punctuation() {
|
fn test_layout_punctuation() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_key1.yaml"))
|
let out = Layout::from_file(PathBuf::from("tests/layout_key1.yaml"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.build(ProblemPanic).0
|
.build(ProblemPanic).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
out.views["base"].1
|
out.views["base"].1
|
||||||
.get_rows()[0].1
|
.get_rows()[0].1
|
||||||
.get_buttons()[0].1
|
.buttons[0].1
|
||||||
.label,
|
.label,
|
||||||
::layout::Label::Text(CString::new("test").unwrap())
|
::layout::Label::Text(CString::new("test").unwrap())
|
||||||
);
|
);
|
||||||
@ -653,14 +823,14 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_layout_unicode() {
|
fn test_layout_unicode() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_key2.yaml"))
|
let out = Layout::from_file(PathBuf::from("tests/layout_key2.yaml"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.build(ProblemPanic).0
|
.build(ProblemPanic).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
out.views["base"].1
|
out.views["base"].1
|
||||||
.get_rows()[0].1
|
.get_rows()[0].1
|
||||||
.get_buttons()[0].1
|
.buttons[0].1
|
||||||
.label,
|
.label,
|
||||||
::layout::Label::Text(CString::new("test").unwrap())
|
::layout::Label::Text(CString::new("test").unwrap())
|
||||||
);
|
);
|
||||||
@ -669,37 +839,45 @@ mod tests {
|
|||||||
/// Test multiple codepoints
|
/// Test multiple codepoints
|
||||||
#[test]
|
#[test]
|
||||||
fn test_layout_unicode_multi() {
|
fn test_layout_unicode_multi() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_key3.yaml"))
|
let out = Layout::from_file(PathBuf::from("tests/layout_key3.yaml"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.build(ProblemPanic).0
|
.build(ProblemPanic).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
out.views["base"].1
|
out.views["base"].1
|
||||||
.get_rows()[0].1
|
.get_rows()[0].1
|
||||||
.get_buttons()[0].1
|
.buttons[0].1
|
||||||
.state.borrow()
|
.state.borrow()
|
||||||
.keycodes.len(),
|
.keycodes.len(),
|
||||||
2
|
2
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Test if erase yields a useable keycode
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_layout_erase() {
|
fn parsing_fallback() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_erase.yaml"))
|
assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
|
||||||
.unwrap()
|
.map(|layout| layout.build(ProblemPanic).0.unwrap())
|
||||||
.build(ProblemPanic).0
|
.is_ok()
|
||||||
.unwrap();
|
|
||||||
assert_eq!(
|
|
||||||
out.views["base"].1
|
|
||||||
.get_rows()[0].1
|
|
||||||
.get_buttons()[0].1
|
|
||||||
.state.borrow()
|
|
||||||
.keycodes.len(),
|
|
||||||
1
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// First fallback should be to builtin, not to FALLBACK_LAYOUT_NAME
|
||||||
|
#[test]
|
||||||
|
fn fallbacks_order() {
|
||||||
|
let sources = list_layout_sources("nb", ArrangementKind::Base, None);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
sources,
|
||||||
|
vec!(
|
||||||
|
(ArrangementKind::Base, DataSource::Resource("nb".into())),
|
||||||
|
(
|
||||||
|
ArrangementKind::Base,
|
||||||
|
DataSource::Resource(FALLBACK_LAYOUT_NAME.into())
|
||||||
|
),
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn unicode_keysym() {
|
fn unicode_keysym() {
|
||||||
let keysym = xkb::keysym_from_name(
|
let keysym = xkb::keysym_from_name(
|
||||||
@ -738,7 +916,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_layout_margins() {
|
fn test_layout_margins() {
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_margins.yaml"))
|
let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.build(ProblemPanic).0
|
.build(ProblemPanic).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@ -752,35 +930,4 @@ 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<_>>(),
|
|
||||||
vec!["a", "c"],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_extract_symbols_erase() {
|
|
||||||
let actions = [(
|
|
||||||
"Erase",
|
|
||||||
action::Action::Erase,
|
|
||||||
)];
|
|
||||||
assert_eq!(
|
|
||||||
extract_symbol_names(&actions[..]).collect::<Vec<_>>(),
|
|
||||||
vec!["BackSpace"],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,424 +0,0 @@
|
|||||||
/* Copyright (C) 2020-2021 Purism SPC
|
|
||||||
* SPDX-License-Identifier: GPL-3.0+
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*! Loading layout files */
|
|
||||||
|
|
||||||
use std::env;
|
|
||||||
use std::fmt;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::convert::TryFrom;
|
|
||||||
|
|
||||||
use super::{ Error, LoadError };
|
|
||||||
use super::parsing;
|
|
||||||
|
|
||||||
use ::layout::ArrangementKind;
|
|
||||||
use ::logging;
|
|
||||||
use ::util::c::as_str;
|
|
||||||
use ::xdg;
|
|
||||||
use ::imservice::ContentPurpose;
|
|
||||||
|
|
||||||
// traits, derives
|
|
||||||
use ::logging::Warn;
|
|
||||||
|
|
||||||
|
|
||||||
/// Gathers stuff defined in C or called by C
|
|
||||||
pub mod c {
|
|
||||||
use super::*;
|
|
||||||
use std::os::raw::c_char;
|
|
||||||
|
|
||||||
#[no_mangle]
|
|
||||||
pub extern "C"
|
|
||||||
fn squeek_load_layout(
|
|
||||||
name: *const c_char, // name of the keyboard
|
|
||||||
type_: u32, // type like Wide
|
|
||||||
variant: u32, // purpose variant like numeric, terminal...
|
|
||||||
overlay: *const c_char, // the overlay (looking for "terminal")
|
|
||||||
) -> *mut ::layout::Layout {
|
|
||||||
let type_ = match type_ {
|
|
||||||
0 => ArrangementKind::Base,
|
|
||||||
1 => ArrangementKind::Wide,
|
|
||||||
_ => panic!("Bad enum value"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let name = as_str(&name)
|
|
||||||
.expect("Bad layout name")
|
|
||||||
.expect("Empty layout name");
|
|
||||||
|
|
||||||
let variant = ContentPurpose::try_from(variant)
|
|
||||||
.or_print(
|
|
||||||
logging::Problem::Warning,
|
|
||||||
"Received invalid purpose value",
|
|
||||||
)
|
|
||||||
.unwrap_or(ContentPurpose::Normal);
|
|
||||||
|
|
||||||
let overlay_str = as_str(&overlay)
|
|
||||||
.expect("Bad overlay name")
|
|
||||||
.expect("Empty overlay name");
|
|
||||||
let overlay_str = match overlay_str {
|
|
||||||
"" => None,
|
|
||||||
other => Some(other),
|
|
||||||
};
|
|
||||||
|
|
||||||
let (kind, layout) = load_layout_data_with_fallback(&name, type_, variant, overlay_str);
|
|
||||||
let layout = ::layout::Layout::new(layout, kind);
|
|
||||||
Box::into_raw(Box::new(layout))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const FALLBACK_LAYOUT_NAME: &str = "us";
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
|
||||||
enum DataSource {
|
|
||||||
File(PathBuf),
|
|
||||||
Resource(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for DataSource {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
DataSource::File(path) => write!(f, "Path: {:?}", path.display()),
|
|
||||||
DataSource::Resource(name) => write!(f, "Resource: {}", name),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* All functions in this family carry around ArrangementKind,
|
|
||||||
* because it's not guaranteed to be preserved,
|
|
||||||
* and the resulting layout needs to know which version was loaded.
|
|
||||||
* See `squeek_layout_get_kind`.
|
|
||||||
* Possible TODO: since this is used only in styling,
|
|
||||||
* and makes the below code nastier than needed, maybe it should go.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/// Returns ordered names treating `name` as the base name,
|
|
||||||
/// ignoring any `+` inside.
|
|
||||||
fn _get_arrangement_names(name: &str, arrangement: ArrangementKind)
|
|
||||||
-> Vec<(ArrangementKind, String)>
|
|
||||||
{
|
|
||||||
let name_with_arrangement = match arrangement {
|
|
||||||
ArrangementKind::Base => name.into(),
|
|
||||||
ArrangementKind::Wide => format!("{}_wide", name),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut ret = Vec::new();
|
|
||||||
if name_with_arrangement != name {
|
|
||||||
ret.push((arrangement, name_with_arrangement));
|
|
||||||
}
|
|
||||||
ret.push((ArrangementKind::Base, name.into()));
|
|
||||||
ret
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns names accounting for any `+` in the `name`,
|
|
||||||
/// including the fallback to the default layout.
|
|
||||||
fn get_preferred_names(name: &str, kind: ArrangementKind)
|
|
||||||
-> Vec<(ArrangementKind, String)>
|
|
||||||
{
|
|
||||||
let mut ret = _get_arrangement_names(name, kind);
|
|
||||||
|
|
||||||
let base_name_preferences = {
|
|
||||||
let mut parts = name.splitn(2, '+');
|
|
||||||
match parts.next() {
|
|
||||||
Some(base) => {
|
|
||||||
// The name is already equal to base, so nothing to add
|
|
||||||
if base == name {
|
|
||||||
vec![]
|
|
||||||
} else {
|
|
||||||
_get_arrangement_names(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);
|
|
||||||
vec![]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
ret.extend(base_name_preferences.into_iter());
|
|
||||||
let fallback_names = _get_arrangement_names(FALLBACK_LAYOUT_NAME, kind);
|
|
||||||
ret.extend(fallback_names.into_iter());
|
|
||||||
ret
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Includes the subdirectory before the forward slash.
|
|
||||||
type LayoutPath = String;
|
|
||||||
|
|
||||||
// This is only used inside iter_fallbacks_with_meta.
|
|
||||||
// Placed at the top scope
|
|
||||||
// because `use LayoutPurpose::*;`
|
|
||||||
// complains about "not in scope" otherwise.
|
|
||||||
// This seems to be a Rust 2015 edition problem.
|
|
||||||
/// Helper for determining where to look up the layout.
|
|
||||||
enum LayoutPurpose<'a> {
|
|
||||||
Default,
|
|
||||||
Special(&'a str),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns the directory string
|
|
||||||
/// where the layout should be looked up, including the slash.
|
|
||||||
fn get_directory_string(
|
|
||||||
content_purpose: ContentPurpose,
|
|
||||||
overlay: Option<&str>) -> String
|
|
||||||
{
|
|
||||||
use self::LayoutPurpose::*;
|
|
||||||
|
|
||||||
let layout_purpose = match overlay {
|
|
||||||
None => match content_purpose {
|
|
||||||
ContentPurpose::Number => Special("number"),
|
|
||||||
ContentPurpose::Digits => Special("number"),
|
|
||||||
ContentPurpose::Phone => Special("number"),
|
|
||||||
ContentPurpose::Terminal => Special("terminal"),
|
|
||||||
_ => Default,
|
|
||||||
},
|
|
||||||
Some(overlay) => Special(overlay),
|
|
||||||
};
|
|
||||||
|
|
||||||
// For intuitiveness,
|
|
||||||
// default purpose layouts are stored in the root directory,
|
|
||||||
// as they correspond to typical text
|
|
||||||
// and are seen the most often.
|
|
||||||
match layout_purpose {
|
|
||||||
Default => "".into(),
|
|
||||||
Special(purpose) => format!("{}/", purpose),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns an iterator over all fallback paths.
|
|
||||||
fn to_layout_paths(
|
|
||||||
name_fallbacks: Vec<(ArrangementKind, String)>,
|
|
||||||
content_purpose: ContentPurpose,
|
|
||||||
overlay: Option<&str>,
|
|
||||||
) -> impl Iterator<Item=(ArrangementKind, LayoutPath)> {
|
|
||||||
let prepend_directory = get_directory_string(content_purpose, overlay);
|
|
||||||
|
|
||||||
name_fallbacks.into_iter()
|
|
||||||
.map(move |(arrangement, name)|
|
|
||||||
(arrangement, format!("{}{}", prepend_directory, name))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
type LayoutSource = (ArrangementKind, DataSource);
|
|
||||||
|
|
||||||
fn to_layout_sources(
|
|
||||||
layout_paths: impl Iterator<Item=(ArrangementKind, LayoutPath)>,
|
|
||||||
filesystem_path: Option<PathBuf>,
|
|
||||||
) -> impl Iterator<Item=LayoutSource> {
|
|
||||||
layout_paths.flat_map(move |(arrangement, layout_path)| {
|
|
||||||
let mut sources = Vec::new();
|
|
||||||
if let Some(path) = &filesystem_path {
|
|
||||||
sources.push((
|
|
||||||
arrangement,
|
|
||||||
DataSource::File(
|
|
||||||
path.join(&layout_path)
|
|
||||||
.with_extension("yaml")
|
|
||||||
)
|
|
||||||
));
|
|
||||||
};
|
|
||||||
sources.push((arrangement, DataSource::Resource(layout_path.clone())));
|
|
||||||
sources.into_iter()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns possible sources, with first as the most preferred one.
|
|
||||||
/// Trying order: native lang of the right kind, native base,
|
|
||||||
/// fallback lang of the right kind, fallback base
|
|
||||||
fn iter_layout_sources(
|
|
||||||
name: &str,
|
|
||||||
arrangement: ArrangementKind,
|
|
||||||
purpose: ContentPurpose,
|
|
||||||
ui_overlay: Option<&str>,
|
|
||||||
layout_storage: Option<PathBuf>,
|
|
||||||
) -> impl Iterator<Item=LayoutSource> {
|
|
||||||
let names = get_preferred_names(name, arrangement);
|
|
||||||
let paths = to_layout_paths(names, purpose, ui_overlay);
|
|
||||||
to_layout_sources(paths, layout_storage)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn load_layout_data(source: DataSource)
|
|
||||||
-> Result<::layout::LayoutData, LoadError>
|
|
||||||
{
|
|
||||||
let handler = logging::Print {};
|
|
||||||
match source {
|
|
||||||
DataSource::File(path) => {
|
|
||||||
parsing::Layout::from_file(path.clone())
|
|
||||||
.map_err(LoadError::BadData)
|
|
||||||
.and_then(|layout|
|
|
||||||
layout.build(handler).0.map_err(LoadError::BadKeyMap)
|
|
||||||
)
|
|
||||||
},
|
|
||||||
DataSource::Resource(name) => {
|
|
||||||
parsing::Layout::from_resource(&name)
|
|
||||||
.and_then(|layout|
|
|
||||||
layout.build(handler).0.map_err(LoadError::BadKeyMap)
|
|
||||||
)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn load_layout_data_with_fallback(
|
|
||||||
name: &str,
|
|
||||||
kind: ArrangementKind,
|
|
||||||
purpose: ContentPurpose,
|
|
||||||
overlay: Option<&str>,
|
|
||||||
) -> (ArrangementKind, ::layout::LayoutData) {
|
|
||||||
|
|
||||||
// Build the path to the right keyboard layout subdirectory
|
|
||||||
let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
|
|
||||||
.map(PathBuf::from)
|
|
||||||
.or_else(|| xdg::data_path("squeekboard/keyboards"));
|
|
||||||
|
|
||||||
for (kind, source) in iter_layout_sources(&name, kind, purpose, overlay, path) {
|
|
||||||
let layout = load_layout_data(source.clone());
|
|
||||||
match layout {
|
|
||||||
Err(e) => match (e, source) {
|
|
||||||
(
|
|
||||||
LoadError::BadData(Error::Missing(e)),
|
|
||||||
DataSource::File(file)
|
|
||||||
) => log_print!(
|
|
||||||
logging::Level::Debug,
|
|
||||||
"Tried file {:?}, but it's missing: {}",
|
|
||||||
file, e
|
|
||||||
),
|
|
||||||
(e, source) => log_print!(
|
|
||||||
logging::Level::Warning,
|
|
||||||
"Failed to load layout from {}: {}, skipping",
|
|
||||||
source, e
|
|
||||||
),
|
|
||||||
},
|
|
||||||
Ok(layout) => {
|
|
||||||
log_print!(logging::Level::Info, "Loaded layout {}", source);
|
|
||||||
return (kind, layout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
panic!("No useful layout found!");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
use ::logging::ProblemPanic;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn parsing_fallback() {
|
|
||||||
assert!(parsing::Layout::from_resource(FALLBACK_LAYOUT_NAME)
|
|
||||||
.map(|layout| layout.build(ProblemPanic).0.unwrap())
|
|
||||||
.is_ok()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// First fallback should be to builtin, not to FALLBACK_LAYOUT_NAME
|
|
||||||
#[test]
|
|
||||||
fn test_fallback_basic_builtin() {
|
|
||||||
let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Normal, None, None);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
sources.collect::<Vec<_>>(),
|
|
||||||
vec!(
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("nb".into())),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::Resource(FALLBACK_LAYOUT_NAME.into())
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Prefer loading from file system before builtin.
|
|
||||||
#[test]
|
|
||||||
fn test_preferences_order_path() {
|
|
||||||
let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Normal, None, Some(".".into()));
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
sources.collect::<Vec<_>>(),
|
|
||||||
vec!(
|
|
||||||
(ArrangementKind::Base, DataSource::File("./nb.yaml".into())),
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("nb".into())),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::File("./us.yaml".into())
|
|
||||||
),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::Resource("us".into())
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// If layout contains a "+", it should reach for what's in front of it too.
|
|
||||||
#[test]
|
|
||||||
fn test_preferences_order_base() {
|
|
||||||
let sources = iter_layout_sources("nb+aliens", ArrangementKind::Base, ContentPurpose::Normal, None, None);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
sources.collect::<Vec<_>>(),
|
|
||||||
vec!(
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("nb+aliens".into())),
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("nb".into())),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::Resource(FALLBACK_LAYOUT_NAME.into())
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_preferences_order_arrangement() {
|
|
||||||
let sources = iter_layout_sources("nb", ArrangementKind::Wide, ContentPurpose::Normal, None, None);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
sources.collect::<Vec<_>>(),
|
|
||||||
vec!(
|
|
||||||
(ArrangementKind::Wide, DataSource::Resource("nb_wide".into())),
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("nb".into())),
|
|
||||||
(
|
|
||||||
ArrangementKind::Wide,
|
|
||||||
DataSource::Resource("us_wide".into())
|
|
||||||
),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::Resource("us".into())
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_preferences_order_overlay() {
|
|
||||||
let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Normal, Some("terminal"), None);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
sources.collect::<Vec<_>>(),
|
|
||||||
vec!(
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("terminal/nb".into())),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::Resource("terminal/us".into())
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_preferences_order_hint() {
|
|
||||||
let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Terminal, None, None);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
sources.collect::<Vec<_>>(),
|
|
||||||
vec!(
|
|
||||||
(ArrangementKind::Base, DataSource::Resource("terminal/nb".into())),
|
|
||||||
(
|
|
||||||
ArrangementKind::Base,
|
|
||||||
DataSource::Resource("terminal/us".into())
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
/* Copyright (C) 2020-2021 Purism SPC
|
|
||||||
* SPDX-License-Identifier: GPL-3.0+
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*! Combined module for dealing with layout files */
|
|
||||||
|
|
||||||
mod loading;
|
|
||||||
pub mod parsing;
|
|
||||||
|
|
||||||
use std::io;
|
|
||||||
use std::fmt;
|
|
||||||
|
|
||||||
use ::keyboard::FormattingError;
|
|
||||||
|
|
||||||
/// Errors encountered loading the layout into yaml
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum Error {
|
|
||||||
Yaml(serde_yaml::Error),
|
|
||||||
Io(io::Error),
|
|
||||||
/// The file was missing.
|
|
||||||
/// It's distinct from Io in order to make it matchable
|
|
||||||
/// without calling io::Error::kind()
|
|
||||||
Missing(io::Error),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for Error {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
Error::Yaml(e) => write!(f, "YAML: {}", e),
|
|
||||||
Error::Io(e) => write!(f, "IO: {}", e),
|
|
||||||
Error::Missing(e) => write!(f, "Missing: {}", e),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<io::Error> for Error {
|
|
||||||
fn from(e: io::Error) -> Self {
|
|
||||||
let kind = e.kind();
|
|
||||||
match kind {
|
|
||||||
io::ErrorKind::NotFound => Error::Missing(e),
|
|
||||||
_ => Error::Io(e),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum LoadError {
|
|
||||||
BadData(Error),
|
|
||||||
MissingResource,
|
|
||||||
BadResource(serde_yaml::Error),
|
|
||||||
BadKeyMap(FormattingError),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for LoadError {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
use self::LoadError::*;
|
|
||||||
match self {
|
|
||||||
BadData(e) => write!(f, "Bad data: {}", e),
|
|
||||||
MissingResource => write!(f, "Missing resource"),
|
|
||||||
BadResource(e) => write!(f, "Bad resource: {}", e),
|
|
||||||
BadKeyMap(e) => write!(f, "Bad key map: {}", e),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -59,7 +59,7 @@ handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
|
|||||||
|
|
||||||
if (service->context) {
|
if (service->context) {
|
||||||
if (arg_visible) {
|
if (arg_visible) {
|
||||||
server_context_service_force_show_keyboard (service->context);
|
server_context_service_show_keyboard (service->context);
|
||||||
} else {
|
} else {
|
||||||
server_context_service_hide_keyboard (service->context);
|
server_context_service_hide_keyboard (service->context);
|
||||||
}
|
}
|
||||||
|
|||||||
215
src/drawing.rs
215
src/drawing.rs
@ -3,24 +3,20 @@
|
|||||||
use cairo;
|
use cairo;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
use ::action::{ Action, Modifier };
|
use ::action::Action;
|
||||||
use ::keyboard;
|
use ::keyboard;
|
||||||
use ::layout::{ Button, Label, LatchedState, Layout };
|
use ::layout::{ Button, Layout };
|
||||||
use ::layout::c::{ Bounds, EekGtkKeyboard, Point };
|
use ::layout::c::{ EekGtkKeyboard, Point };
|
||||||
use ::submission::Submission;
|
use ::submission::Submission;
|
||||||
|
|
||||||
use glib::translate::FromGlibPtrNone;
|
use glib::translate::FromGlibPtrNone;
|
||||||
use gtk::WidgetExt;
|
use gtk::WidgetExt;
|
||||||
|
|
||||||
use std::collections::HashSet;
|
|
||||||
use std::ffi::CStr;
|
|
||||||
use std::ptr;
|
|
||||||
|
|
||||||
mod c {
|
mod c {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
use cairo_sys;
|
use cairo_sys;
|
||||||
use std::os::raw::{ c_char, c_void };
|
use std::os::raw::c_void;
|
||||||
|
|
||||||
// This is constructed only in C, no need for warnings
|
// This is constructed only in C, no need for warnings
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
@ -28,44 +24,18 @@ mod c {
|
|||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
pub struct EekRenderer(*const c_void);
|
pub struct EekRenderer(*const c_void);
|
||||||
|
|
||||||
// This is constructed only in C, no need for warnings
|
#[no_mangle]
|
||||||
/// Just don't clone this for no reason.
|
|
||||||
#[allow(dead_code)]
|
|
||||||
#[repr(transparent)]
|
|
||||||
#[derive(Clone, Copy)]
|
|
||||||
pub struct GtkStyleContext(*const c_void);
|
|
||||||
|
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
// Button and View inside CButtonPlace are safe to pass to C
|
||||||
|
// as long as they don't outlive the call
|
||||||
|
// and nothing dereferences them
|
||||||
#[allow(improper_ctypes)]
|
#[allow(improper_ctypes)]
|
||||||
pub fn eek_renderer_get_scale_factor(
|
pub fn eek_render_button(
|
||||||
renderer: EekRenderer,
|
renderer: EekRenderer,
|
||||||
) -> u32;
|
|
||||||
|
|
||||||
#[allow(improper_ctypes)]
|
|
||||||
pub fn eek_render_button_in_context(
|
|
||||||
scale_factor: u32,
|
|
||||||
cr: *mut cairo_sys::cairo_t,
|
cr: *mut cairo_sys::cairo_t,
|
||||||
ctx: GtkStyleContext,
|
button: *const Button,
|
||||||
bounds: Bounds,
|
|
||||||
icon_name: *const c_char,
|
|
||||||
label: *const c_char,
|
|
||||||
);
|
|
||||||
|
|
||||||
#[allow(improper_ctypes)]
|
|
||||||
pub fn eek_get_style_context_for_button(
|
|
||||||
renderer: EekRenderer,
|
|
||||||
name: *const c_char,
|
|
||||||
outline_name: *const c_char,
|
|
||||||
locked_class: *const c_char,
|
|
||||||
pressed: u64,
|
pressed: u64,
|
||||||
) -> GtkStyleContext;
|
locked: u64,
|
||||||
|
|
||||||
#[allow(improper_ctypes)]
|
|
||||||
pub fn eek_put_style_context_for_button(
|
|
||||||
ctx: GtkStyleContext,
|
|
||||||
outline_name: *const c_char,
|
|
||||||
locked_class: *const c_char,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,16 +55,13 @@ mod c {
|
|||||||
|
|
||||||
layout.foreach_visible_button(|offset, button| {
|
layout.foreach_visible_button(|offset, button| {
|
||||||
let state = RefCell::borrow(&button.state).clone();
|
let state = RefCell::borrow(&button.state).clone();
|
||||||
|
let active_mod = match &state.action {
|
||||||
let locked = LockedStyle::from_action(
|
Action::ApplyModifier(m) => active_modifiers.contains(m),
|
||||||
&state.action,
|
_ => false,
|
||||||
&active_modifiers,
|
};
|
||||||
layout.get_view_latched(),
|
let locked = state.action.is_active(&layout.current_view)
|
||||||
&layout.current_view,
|
| active_mod;
|
||||||
);
|
if state.pressed == keyboard::PressType::Pressed || locked {
|
||||||
if state.pressed == keyboard::PressType::Pressed
|
|
||||||
|| locked != LockedStyle::Free
|
|
||||||
{
|
|
||||||
render_button_at_position(
|
render_button_at_position(
|
||||||
renderer, &cr,
|
renderer, &cr,
|
||||||
offset,
|
offset,
|
||||||
@ -120,55 +87,20 @@ mod c {
|
|||||||
renderer, &cr,
|
renderer, &cr,
|
||||||
offset,
|
offset,
|
||||||
button.as_ref(),
|
button.as_ref(),
|
||||||
keyboard::PressType::Released,
|
keyboard::PressType::Released, false,
|
||||||
LockedStyle::Free,
|
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Debug)]
|
|
||||||
enum LockedStyle {
|
|
||||||
Free,
|
|
||||||
Latched,
|
|
||||||
Locked,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl LockedStyle {
|
|
||||||
fn from_action(
|
|
||||||
action: &Action,
|
|
||||||
mods: &HashSet<Modifier>,
|
|
||||||
latched_view: &LatchedState,
|
|
||||||
current_view: &str,
|
|
||||||
) -> LockedStyle {
|
|
||||||
let active_mod = match action {
|
|
||||||
Action::ApplyModifier(m) => mods.contains(m),
|
|
||||||
_ => false,
|
|
||||||
};
|
|
||||||
|
|
||||||
let active_view = action.is_active(current_view);
|
|
||||||
let latched_button = match latched_view {
|
|
||||||
LatchedState::Not => false,
|
|
||||||
LatchedState::FromView(view) => !action.has_locked_appearance_from(view),
|
|
||||||
};
|
|
||||||
match (active_mod, active_view, latched_button) {
|
|
||||||
// Modifiers don't latch.
|
|
||||||
(true, _, _) => LockedStyle::Locked,
|
|
||||||
(false, true, false) => LockedStyle::Locked,
|
|
||||||
(false, true, true) => LockedStyle::Latched,
|
|
||||||
_ => LockedStyle::Free,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Renders a button at a position (button's own bounds ignored)
|
/// Renders a button at a position (button's own bounds ignored)
|
||||||
fn render_button_at_position(
|
pub fn render_button_at_position(
|
||||||
renderer: c::EekRenderer,
|
renderer: c::EekRenderer,
|
||||||
cr: &cairo::Context,
|
cr: &cairo::Context,
|
||||||
position: Point,
|
position: Point,
|
||||||
button: &Button,
|
button: &Button,
|
||||||
pressed: keyboard::PressType,
|
pressed: keyboard::PressType,
|
||||||
locked: LockedStyle,
|
locked: bool,
|
||||||
) {
|
) {
|
||||||
cr.save();
|
cr.save();
|
||||||
cr.translate(position.x, position.y);
|
cr.translate(position.x, position.y);
|
||||||
@ -177,110 +109,19 @@ fn render_button_at_position(
|
|||||||
button.size.width, button.size.height
|
button.size.width, button.size.height
|
||||||
);
|
);
|
||||||
cr.clip();
|
cr.clip();
|
||||||
|
|
||||||
let scale_factor = unsafe {
|
|
||||||
c::eek_renderer_get_scale_factor(renderer)
|
|
||||||
};
|
|
||||||
let bounds = button.get_bounds();
|
|
||||||
let (label_c, icon_name_c) = match &button.label {
|
|
||||||
Label::Text(text) => (text.as_ptr(), ptr::null()),
|
|
||||||
Label::IconName(name) => {
|
|
||||||
let l = unsafe {
|
|
||||||
// CStr doesn't allocate anything, so it only points to
|
|
||||||
// the 'static str, avoiding a memory leak
|
|
||||||
CStr::from_bytes_with_nul_unchecked(b"icon\0")
|
|
||||||
};
|
|
||||||
(l.as_ptr(), name.as_ptr())
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
with_button_context(
|
|
||||||
renderer,
|
|
||||||
button,
|
|
||||||
pressed,
|
|
||||||
locked,
|
|
||||||
|ctx| unsafe {
|
|
||||||
// TODO: split into separate procedures:
|
|
||||||
// draw outline, draw label, draw icon.
|
|
||||||
c::eek_render_button_in_context(
|
|
||||||
scale_factor,
|
|
||||||
cairo::Context::to_raw_none(&cr),
|
|
||||||
*ctx,
|
|
||||||
bounds,
|
|
||||||
icon_name_c,
|
|
||||||
label_c,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
cr.restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn with_button_context<R, F: FnOnce(&c::GtkStyleContext) -> R>(
|
|
||||||
renderer: c::EekRenderer,
|
|
||||||
button: &Button,
|
|
||||||
pressed: keyboard::PressType,
|
|
||||||
locked: LockedStyle,
|
|
||||||
operation: F,
|
|
||||||
) -> R {
|
|
||||||
let outline_name_c = button.outline_name.as_ptr();
|
|
||||||
let locked_class_c = match locked {
|
|
||||||
LockedStyle::Free => ptr::null(),
|
|
||||||
LockedStyle::Locked => unsafe {
|
|
||||||
CStr::from_bytes_with_nul_unchecked(b"locked\0").as_ptr()
|
|
||||||
},
|
|
||||||
LockedStyle::Latched => unsafe {
|
|
||||||
CStr::from_bytes_with_nul_unchecked(b"latched\0").as_ptr()
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
let ctx = unsafe {
|
|
||||||
c::eek_get_style_context_for_button(
|
|
||||||
renderer,
|
|
||||||
button.name.as_ptr(),
|
|
||||||
outline_name_c,
|
|
||||||
locked_class_c,
|
|
||||||
pressed as u64,
|
|
||||||
)
|
|
||||||
};
|
|
||||||
|
|
||||||
let r = operation(&ctx);
|
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
c::eek_put_style_context_for_button(
|
c::eek_render_button(
|
||||||
ctx,
|
renderer,
|
||||||
outline_name_c,
|
cairo::Context::to_raw_none(&cr),
|
||||||
locked_class_c,
|
button as *const Button,
|
||||||
|
pressed as u64,
|
||||||
|
locked as u64,
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
cr.restore();
|
||||||
r
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn queue_redraw(keyboard: EekGtkKeyboard) {
|
pub fn queue_redraw(keyboard: EekGtkKeyboard) {
|
||||||
let widget = unsafe { gtk::Widget::from_glib_none(keyboard.0) };
|
let widget = unsafe { gtk::Widget::from_glib_none(keyboard.0) };
|
||||||
widget.queue_draw();
|
widget.queue_draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_exit_only() {
|
|
||||||
assert_eq!(
|
|
||||||
LockedStyle::from_action(
|
|
||||||
&Action::LockView {
|
|
||||||
lock: "ab".into(),
|
|
||||||
unlock: "a".into(),
|
|
||||||
latches: true,
|
|
||||||
looks_locked_from: vec!["b".into()],
|
|
||||||
},
|
|
||||||
&HashSet::new(),
|
|
||||||
&LatchedState::FromView("b".into()),
|
|
||||||
"ab",
|
|
||||||
),
|
|
||||||
LockedStyle::Locked,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -25,9 +25,8 @@ static const struct zwp_input_method_v2_listener input_method_listener = {
|
|||||||
|
|
||||||
struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
|
struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
|
||||||
struct zwp_virtual_keyboard_manager_v1 *vkmanager,
|
struct zwp_virtual_keyboard_manager_v1 *vkmanager,
|
||||||
struct vis_manager *vis_manager,
|
|
||||||
struct wl_seat *seat,
|
struct wl_seat *seat,
|
||||||
EekboardContextService *state) {
|
LayoutHolder *state) {
|
||||||
struct zwp_input_method_v2 *im = NULL;
|
struct zwp_input_method_v2 *im = NULL;
|
||||||
if (immanager) {
|
if (immanager) {
|
||||||
im = zwp_input_method_manager_v2_get_input_method(immanager, seat);
|
im = zwp_input_method_manager_v2_get_input_method(immanager, seat);
|
||||||
@ -36,7 +35,7 @@ struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
|
|||||||
if (vkmanager) {
|
if (vkmanager) {
|
||||||
vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat);
|
vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat);
|
||||||
}
|
}
|
||||||
return submission_new(im, vk, state, vis_manager);
|
return submission_new(im, vk, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Un-inlined
|
/// Un-inlined
|
||||||
|
|||||||
@ -23,7 +23,7 @@ pub mod c {
|
|||||||
|
|
||||||
use std::os::raw::{c_char, c_void};
|
use std::os::raw::{c_char, c_void};
|
||||||
|
|
||||||
pub use ::ui_manager::c::UIManager;
|
pub use ::submission::c::UIManager;
|
||||||
pub use ::submission::c::StateManager;
|
pub use ::submission::c::StateManager;
|
||||||
|
|
||||||
// The following defined in C
|
// The following defined in C
|
||||||
@ -32,15 +32,17 @@ pub mod c {
|
|||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
pub struct InputMethod(*const c_void);
|
pub struct InputMethod(*const c_void);
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
extern "C" {
|
extern "C" {
|
||||||
fn imservice_destroy_im(im: *mut c::InputMethod);
|
fn imservice_destroy_im(im: *mut c::InputMethod);
|
||||||
|
|
||||||
#[allow(improper_ctypes)] // IMService will never be dereferenced in C
|
#[allow(improper_ctypes)] // IMService will never be dereferenced in C
|
||||||
pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
|
pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
|
||||||
pub fn eek_input_method_commit_string(im: *mut InputMethod, text: *const c_char);
|
pub fn eek_input_method_commit_string(im: *mut InputMethod, text: *const c_char);
|
||||||
pub fn eek_input_method_delete_surrounding_text(im: *mut InputMethod, before: u32, after: u32);
|
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);
|
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 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
|
// The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
|
||||||
@ -149,11 +151,11 @@ pub mod c {
|
|||||||
..IMProtocolState::default()
|
..IMProtocolState::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
imservice.serial += Wrapping(1u32);
|
|
||||||
|
|
||||||
if active_changed {
|
if active_changed {
|
||||||
(imservice.active_callback)(imservice.current.active);
|
|
||||||
if imservice.current.active {
|
if imservice.current.active {
|
||||||
|
if let Some(ui) = imservice.ui_manager {
|
||||||
|
unsafe { server_context_service_show_keyboard(ui); }
|
||||||
|
}
|
||||||
unsafe {
|
unsafe {
|
||||||
eekboard_context_service_set_hint_purpose(
|
eekboard_context_service_set_hint_purpose(
|
||||||
imservice.state_manager,
|
imservice.state_manager,
|
||||||
@ -161,6 +163,10 @@ pub mod c {
|
|||||||
imservice.current.content_purpose.clone() as u32,
|
imservice.current.content_purpose.clone() as u32,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if let Some(ui) = imservice.ui_manager {
|
||||||
|
unsafe { server_context_service_hide_keyboard(ui); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -178,7 +184,9 @@ pub mod c {
|
|||||||
// the keyboard is already decommissioned
|
// the keyboard is already decommissioned
|
||||||
imservice.current.active = false;
|
imservice.current.active = false;
|
||||||
|
|
||||||
(imservice.active_callback)(imservice.current.active);
|
if let Some(ui) = imservice.ui_manager {
|
||||||
|
unsafe { server_context_service_hide_keyboard(ui); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: destroy and deallocate
|
// FIXME: destroy and deallocate
|
||||||
@ -331,7 +339,8 @@ pub struct IMService {
|
|||||||
pub im: *mut c::InputMethod,
|
pub im: *mut c::InputMethod,
|
||||||
/// Unowned reference. Be careful, it's shared with C at large
|
/// Unowned reference. Be careful, it's shared with C at large
|
||||||
state_manager: *const c::StateManager,
|
state_manager: *const c::StateManager,
|
||||||
active_callback: Box<dyn Fn(bool)>,
|
/// Unowned reference. Be careful, it's shared with C at large
|
||||||
|
pub ui_manager: Option<*const c::UIManager>,
|
||||||
|
|
||||||
pending: IMProtocolState,
|
pending: IMProtocolState,
|
||||||
current: IMProtocolState, // turn current into an idiomatic representation?
|
current: IMProtocolState, // turn current into an idiomatic representation?
|
||||||
@ -348,13 +357,12 @@ impl IMService {
|
|||||||
pub fn new(
|
pub fn new(
|
||||||
im: *mut c::InputMethod,
|
im: *mut c::InputMethod,
|
||||||
state_manager: *const c::StateManager,
|
state_manager: *const c::StateManager,
|
||||||
active_callback: Box<dyn Fn(bool)>,
|
|
||||||
) -> Box<IMService> {
|
) -> Box<IMService> {
|
||||||
// IMService will be referenced to by C,
|
// IMService will be referenced to by C,
|
||||||
// so it needs to stay in the same place in memory via Box
|
// so it needs to stay in the same place in memory via Box
|
||||||
let imservice = Box::new(IMService {
|
let imservice = Box::new(IMService {
|
||||||
im,
|
im,
|
||||||
active_callback,
|
ui_manager: None,
|
||||||
state_manager,
|
state_manager,
|
||||||
pending: IMProtocolState::default(),
|
pending: IMProtocolState::default(),
|
||||||
current: IMProtocolState::default(),
|
current: IMProtocolState::default(),
|
||||||
@ -369,7 +377,7 @@ impl IMService {
|
|||||||
}
|
}
|
||||||
imservice
|
imservice
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> {
|
pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> {
|
||||||
match self.current.active {
|
match self.current.active {
|
||||||
true => {
|
true => {
|
||||||
@ -406,6 +414,7 @@ impl IMService {
|
|||||||
unsafe {
|
unsafe {
|
||||||
c::eek_input_method_commit(self.im, self.serial.0)
|
c::eek_input_method_commit(self.im, self.serial.0)
|
||||||
}
|
}
|
||||||
|
self.serial += Wrapping(1u32);
|
||||||
Ok(())
|
Ok(())
|
||||||
},
|
},
|
||||||
false => Err(SubmitError::NotActive),
|
false => Err(SubmitError::NotActive),
|
||||||
|
|||||||
254
src/keyboard.rs
254
src/keyboard.rs
@ -5,13 +5,11 @@ use std::cell::RefCell;
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::mem;
|
|
||||||
use std::ptr;
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::string::FromUtf8Error;
|
use std::string::FromUtf8Error;
|
||||||
|
|
||||||
use ::action::Action;
|
use ::action::Action;
|
||||||
use ::util;
|
use ::logging;
|
||||||
|
|
||||||
// Traits
|
// Traits
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
@ -23,12 +21,7 @@ pub enum PressType {
|
|||||||
Pressed = 1,
|
Pressed = 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The extended, unambiguous layout-keycode
|
pub type KeyCode = u32;
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct KeyCode {
|
|
||||||
pub code: u32,
|
|
||||||
pub keymap_idx: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
bitflags!{
|
bitflags!{
|
||||||
/// Map to `virtual_keyboard.modifiers` modifiers values
|
/// Map to `virtual_keyboard.modifiers` modifiers values
|
||||||
@ -50,7 +43,7 @@ bitflags!{
|
|||||||
|
|
||||||
/// When the submitted actions of keys need to be tracked,
|
/// When the submitted actions of keys need to be tracked,
|
||||||
/// they need a stable, comparable ID
|
/// they need a stable, comparable ID
|
||||||
#[derive(Clone, PartialEq)]
|
#[derive(PartialEq)]
|
||||||
pub struct KeyStateId(*const KeyState);
|
pub struct KeyStateId(*const KeyState);
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@ -87,10 +80,10 @@ impl KeyState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Sorts an iterator by converting it to a Vector and back
|
/// Sorts an iterator by converting it to a Vector and back
|
||||||
fn sorted<'a, I: Iterator<Item=String>>(
|
fn sorted<'a, I: Iterator<Item=&'a str>>(
|
||||||
iter: I
|
iter: I
|
||||||
) -> impl Iterator<Item=String> {
|
) -> impl Iterator<Item=&'a str> {
|
||||||
let mut v: Vec<String> = iter.collect();
|
let mut v: Vec<&'a str> = iter.collect();
|
||||||
v.sort();
|
v.sort();
|
||||||
v.into_iter()
|
v.into_iter()
|
||||||
}
|
}
|
||||||
@ -98,17 +91,15 @@ fn sorted<'a, I: Iterator<Item=String>>(
|
|||||||
/// Generates a mapping where each key gets a keycode, starting from ~~8~~
|
/// Generates a mapping where each key gets a keycode, starting from ~~8~~
|
||||||
/// HACK: starting from 9, because 8 results in keycode 0,
|
/// HACK: starting from 9, because 8 results in keycode 0,
|
||||||
/// which the compositor likes to discard
|
/// which the compositor likes to discard
|
||||||
pub fn generate_keycodes<'a, C: IntoIterator<Item=String>>(
|
pub fn generate_keycodes<'a, C: IntoIterator<Item=&'a str>>(
|
||||||
key_names: C,
|
key_names: C
|
||||||
) -> HashMap<String, KeyCode> {
|
) -> HashMap<String, u32> {
|
||||||
|
let special_keysyms = ["BackSpace", "Return"].iter().map(|&s| s);
|
||||||
HashMap::from_iter(
|
HashMap::from_iter(
|
||||||
// Sort to remove a source of indeterminism in keycode assignment.
|
// sort to remove a source of indeterminism in keycode assignment
|
||||||
sorted(key_names.into_iter())
|
sorted(key_names.into_iter().chain(special_keysyms))
|
||||||
.zip(util::cycle_count(9..255))
|
.map(|name| String::from(name))
|
||||||
.map(|(name, (code, keymap_idx))| (
|
.zip(9..)
|
||||||
String::from(name),
|
|
||||||
KeyCode { code, keymap_idx },
|
|
||||||
))
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,54 +124,12 @@ impl From<io::Error> 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<String>; 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::<String, KeyCode>)
|
|
||||||
-> Result<Vec<String>, FormattingError>
|
|
||||||
{
|
|
||||||
let mut bins: Vec<SingleKeyMap> = 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.
|
/// Generates a de-facto single level keymap.
|
||||||
/// Key codes must not repeat and must remain between 9 and 255.
|
// TODO: don't rely on keys and their order,
|
||||||
fn generate_keymap(
|
// but rather on what keysyms and keycodes are in use.
|
||||||
symbolmap: &SingleKeyMap,
|
// Iterating actions makes it hard to deduplicate keysyms.
|
||||||
|
pub fn generate_keymap(
|
||||||
|
keystates: &HashMap::<String, KeyState>
|
||||||
) -> Result<String, FormattingError> {
|
) -> Result<String, FormattingError> {
|
||||||
let mut buf: Vec<u8> = Vec::new();
|
let mut buf: Vec<u8> = Vec::new();
|
||||||
writeln!(
|
writeln!(
|
||||||
@ -191,80 +140,86 @@ fn generate_keymap(
|
|||||||
minimum = 8;
|
minimum = 8;
|
||||||
maximum = 255;"
|
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();
|
|
||||||
|
|
||||||
// Xorg can only consume up to 255 keys, so this may not work in Xwayland.
|
for (name, state) in keystates.iter() {
|
||||||
// Two possible solutions:
|
match &state.action {
|
||||||
// - use levels to cram multiple characters into one key
|
Action::Submit { text: _, keys } => {
|
||||||
// - swap layouts on key presses
|
if let 0 = keys.len() {
|
||||||
for (_name, keycode) in &pairs {
|
log_print!(
|
||||||
write!(
|
logging::Level::Warning,
|
||||||
buf,
|
"Key {} has no keysyms", name,
|
||||||
"
|
);
|
||||||
<I{}> = {0};",
|
};
|
||||||
keycode,
|
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,
|
||||||
|
"
|
||||||
|
<BackSpace> = {};",
|
||||||
|
keycodes.next().expect("Erase key has no keycode"),
|
||||||
|
)?;
|
||||||
|
if let Some(_) = keycodes.next() {
|
||||||
|
log_print!(
|
||||||
|
logging::Level::Bug,
|
||||||
|
"Erase key has multiple keycodes",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => {},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
writeln!(
|
writeln!(
|
||||||
buf,
|
buf,
|
||||||
"
|
"
|
||||||
indicator 1 = \"Caps Lock\"; // Xwayland won't accept without it.
|
|
||||||
}};
|
}};
|
||||||
|
|
||||||
xkb_symbols \"squeekboard\" {{
|
xkb_symbols \"squeekboard\" {{
|
||||||
"
|
|
||||||
|
name[Group1] = \"Letters\";
|
||||||
|
name[Group2] = \"Numbers/Symbols\";
|
||||||
|
|
||||||
|
key <BackSpace> {{ [ BackSpace ] }};"
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
for (name, keycode) in pairs {
|
for (name, state) in keystates.iter() {
|
||||||
write!(
|
if let Action::Submit { text: _, keys } = &state.action {
|
||||||
buf,
|
for keysym in keys.iter() {
|
||||||
"
|
write!(
|
||||||
key <I{}> {{ [ {} ] }};",
|
buf,
|
||||||
keycode,
|
"
|
||||||
name,
|
key <{}> {{ [ {0} ] }};",
|
||||||
)?;
|
keysym.0,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
writeln!(
|
writeln!(
|
||||||
buf,
|
buf,
|
||||||
"
|
"
|
||||||
}};
|
}};
|
||||||
|
|
||||||
xkb_types \"squeekboard\" {{
|
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\" {{
|
xkb_compatibility \"squeekboard\" {{
|
||||||
// Needed for Xwayland again.
|
|
||||||
interpret Any+AnyOf(all) {{
|
|
||||||
action= SetMods(modifiers=modMapMods,clearLocks);
|
|
||||||
}};
|
|
||||||
}};
|
}};
|
||||||
}};"
|
}};"
|
||||||
)?;
|
)?;
|
||||||
@ -279,16 +234,23 @@ mod tests {
|
|||||||
|
|
||||||
use xkbcommon::xkb;
|
use xkbcommon::xkb;
|
||||||
|
|
||||||
|
use ::action::KeySym;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_keymap_single_resolve() {
|
fn test_keymap_multi() {
|
||||||
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(&key_map).unwrap();
|
|
||||||
|
|
||||||
let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
|
let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
|
||||||
|
|
||||||
|
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 = xkb::Keymap::new_from_string(
|
let keymap = xkb::Keymap::new_from_string(
|
||||||
&context,
|
&context,
|
||||||
keymap_str.clone(),
|
keymap_str.clone(),
|
||||||
@ -301,36 +263,4 @@ mod tests {
|
|||||||
assert_eq!(state.key_get_one_sym(9), xkb::KEY_a);
|
assert_eq!(state.key_get_one_sym(9), xkb::KEY_a);
|
||||||
assert_eq!(state.key_get_one_sym(10), xkb::KEY_c);
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
14
src/layout.h
14
src/layout.h
@ -26,12 +26,20 @@ struct squeek_layout_state {
|
|||||||
|
|
||||||
struct squeek_layout;
|
struct squeek_layout;
|
||||||
|
|
||||||
|
EekBounds squeek_button_get_bounds(const struct squeek_button*);
|
||||||
|
const char *squeek_button_get_label(const struct squeek_button*);
|
||||||
|
const char *squeek_button_get_icon_name(const struct squeek_button*);
|
||||||
|
const char *squeek_button_get_name(const struct squeek_button*);
|
||||||
|
const char *squeek_button_get_outline_name(const struct squeek_button*);
|
||||||
|
|
||||||
|
void squeek_button_print(const struct squeek_button* button);
|
||||||
|
|
||||||
struct transformation squeek_layout_calculate_transformation(
|
struct transformation squeek_layout_calculate_transformation(
|
||||||
const struct squeek_layout *layout,
|
const struct squeek_layout *layout,
|
||||||
double allocation_width, double allocation_size);
|
double allocation_width, double allocation_size);
|
||||||
|
|
||||||
struct squeek_layout *squeek_load_layout(const char *name, uint32_t type, uint32_t variant_type, const char *overlay_name);
|
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 *);
|
enum squeek_arrangement_kind squeek_layout_get_kind(const struct squeek_layout *);
|
||||||
void squeek_layout_free(struct squeek_layout*);
|
void squeek_layout_free(struct squeek_layout*);
|
||||||
|
|
||||||
@ -39,7 +47,7 @@ void squeek_layout_release(struct squeek_layout *layout,
|
|||||||
struct submission *submission,
|
struct submission *submission,
|
||||||
struct transformation widget_to_layout,
|
struct transformation widget_to_layout,
|
||||||
uint32_t timestamp,
|
uint32_t timestamp,
|
||||||
EekboardContextService *manager,
|
LayoutHolder *manager,
|
||||||
EekGtkKeyboard *ui_keyboard);
|
EekGtkKeyboard *ui_keyboard);
|
||||||
void squeek_layout_release_all_only(struct squeek_layout *layout,
|
void squeek_layout_release_all_only(struct squeek_layout *layout,
|
||||||
struct submission *submission,
|
struct submission *submission,
|
||||||
@ -53,7 +61,7 @@ void squeek_layout_drag(struct squeek_layout *layout,
|
|||||||
struct submission *submission,
|
struct submission *submission,
|
||||||
double x_widget, double y_widget,
|
double x_widget, double y_widget,
|
||||||
struct transformation widget_to_layout,
|
struct transformation widget_to_layout,
|
||||||
uint32_t timestamp, EekboardContextService *manager,
|
uint32_t timestamp, LayoutHolder *manager,
|
||||||
EekGtkKeyboard *ui_keyboard);
|
EekGtkKeyboard *ui_keyboard);
|
||||||
void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t *cr, struct submission *submission);
|
void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t *cr, struct submission *submission);
|
||||||
void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t *cr);
|
void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t *cr);
|
||||||
|
|||||||
820
src/layout.rs
820
src/layout.rs
File diff suppressed because it is too large
Load Diff
@ -24,6 +24,7 @@ mod c {
|
|||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
pub struct GnomeXkbInfo(*const c_void);
|
pub struct GnomeXkbInfo(*const c_void);
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
extern "C" {
|
extern "C" {
|
||||||
// from libc
|
// from libc
|
||||||
pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
|
pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
|
||||||
|
|||||||
@ -31,16 +31,22 @@ pub enum Error {
|
|||||||
|
|
||||||
impl ::std::fmt::Display for Error {
|
impl ::std::fmt::Display for Error {
|
||||||
fn fmt(&self, out: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
|
fn fmt(&self, out: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
|
||||||
out.write_str(match self {
|
use ::std::error::Error;
|
||||||
|
out.write_str(self.description())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ::std::error::Error for Error {
|
||||||
|
fn description(&self) -> &str {
|
||||||
|
match self {
|
||||||
&Error::NotWellFormed => "Language tag is not well-formed.",
|
&Error::NotWellFormed => "Language tag is not well-formed.",
|
||||||
// this is exception: here we do want exhaustive match so we don't publish version with
|
// this is exception: here we do want exhaustive match so we don't publish version with
|
||||||
// missing descriptions by mistake.
|
// missing descriptions by mistake.
|
||||||
&Error::__NonExhaustive => panic!("Placeholder error must not be instantiated!"),
|
&Error::__NonExhaustive => panic!("Placeholder error must not be instantiated!"),
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Convenience Result alias.
|
/// Convenience Result alias.
|
||||||
type Result<T> = ::std::result::Result<T, Error>;
|
type Result<T> = ::std::result::Result<T, Error>;
|
||||||
|
|
||||||
|
|||||||
@ -9,6 +9,7 @@ pub mod c {
|
|||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
pub struct Manager(*const c_void);
|
pub struct Manager(*const c_void);
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
extern "C" {
|
extern "C" {
|
||||||
pub fn eekboard_context_service_set_overlay(
|
pub fn eekboard_context_service_set_overlay(
|
||||||
manager: Manager,
|
manager: Manager,
|
||||||
|
|||||||
@ -14,8 +14,8 @@ sources = [
|
|||||||
config_h,
|
config_h,
|
||||||
'dbus.c',
|
'dbus.c',
|
||||||
'imservice.c',
|
'imservice.c',
|
||||||
'popover.c',
|
|
||||||
'server-context-service.c',
|
'server-context-service.c',
|
||||||
|
'ui_manager.c',
|
||||||
'wayland.c',
|
'wayland.c',
|
||||||
'../eek/eek.c',
|
'../eek/eek.c',
|
||||||
'../eek/eek-element.c',
|
'../eek/eek-element.c',
|
||||||
@ -37,10 +37,9 @@ cc = meson.get_compiler('c')
|
|||||||
deps = [
|
deps = [
|
||||||
# dependency('glib-2.0', version: '>=2.26.0'),
|
# dependency('glib-2.0', version: '>=2.26.0'),
|
||||||
dependency('gio-2.0', version: '>=2.26.0'),
|
dependency('gio-2.0', version: '>=2.26.0'),
|
||||||
dependency('gio-unix-2.0'),
|
|
||||||
dependency('gnome-desktop-3.0', version: '>=3.0'),
|
dependency('gnome-desktop-3.0', version: '>=3.0'),
|
||||||
dependency('gtk+-3.0', version: '>=3.0'),
|
dependency('gtk+-3.0', version: '>=3.0'),
|
||||||
dependency('libfeedback-0.0'),
|
dependency('libcroco-0.6'),
|
||||||
dependency('wayland-client', version: '>=1.14'),
|
dependency('wayland-client', version: '>=1.14'),
|
||||||
dependency('xkbcommon'),
|
dependency('xkbcommon'),
|
||||||
cc.find_library('m'),
|
cc.find_library('m'),
|
||||||
@ -57,8 +56,7 @@ rslibs = custom_target(
|
|||||||
output: ['librs.a'],
|
output: ['librs.a'],
|
||||||
install: false,
|
install: false,
|
||||||
console: true,
|
console: true,
|
||||||
command: [cargo_build] + ['@OUTPUT@', '--lib'] + cargo_build_flags,
|
command: [cargo_build] + cargo_build_flags + ['@OUTPUT@', '--lib']
|
||||||
depends: cargo_toml,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
build_rstests = custom_target(
|
build_rstests = custom_target(
|
||||||
@ -72,18 +70,17 @@ build_rstests = custom_target(
|
|||||||
output: ['src'],
|
output: ['src'],
|
||||||
install: false,
|
install: false,
|
||||||
console: true,
|
console: true,
|
||||||
command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
|
command: [cargo_script, 'test', '--no-run'],
|
||||||
depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
|
depends: rslibs, # no point building tests if the code itself fails
|
||||||
)
|
)
|
||||||
|
|
||||||
test(
|
test(
|
||||||
'rstest',
|
'rstest',
|
||||||
cargo_script,
|
cargo_script,
|
||||||
args: ['test'] + cargo_build_flags,
|
args: ['test'],
|
||||||
env: ['SOURCE_DIR=' + meson.source_root()],
|
|
||||||
# this is a whole Carg-based test suite, let it run for a while
|
# this is a whole Carg-based test suite, let it run for a while
|
||||||
timeout: 900,
|
timeout: 900,
|
||||||
depends: [build_rstests, cargo_toml],
|
depends: build_rstests,
|
||||||
)
|
)
|
||||||
|
|
||||||
libsqueekboard = static_library('libsqueekboard',
|
libsqueekboard = static_library('libsqueekboard',
|
||||||
|
|||||||
@ -9,7 +9,7 @@ struct squeek_output_handle {
|
|||||||
struct squeek_outputs *outputs;
|
struct squeek_outputs *outputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct squeek_outputs *squeek_outputs_new(void);
|
struct squeek_outputs *squeek_outputs_new();
|
||||||
void squeek_outputs_free(struct squeek_outputs*);
|
void squeek_outputs_free(struct squeek_outputs*);
|
||||||
void squeek_outputs_register(struct squeek_outputs*, struct wl_output *output);
|
void squeek_outputs_register(struct squeek_outputs*, struct wl_output *output);
|
||||||
struct squeek_output_handle squeek_outputs_get_current(struct squeek_outputs*);
|
struct squeek_output_handle squeek_outputs_get_current(struct squeek_outputs*);
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user