Compare commits
3 Commits
v1.10.0
...
squeekboar
| Author | SHA1 | Date | |
|---|---|---|---|
| 3af10285b7 | |||
| 53997abc46 | |||
| 34765be22e |
110
.gitlab-ci.yml
110
.gitlab-ci.yml
@ -1,4 +1,4 @@
|
|||||||
image: debian:bullseye
|
image: debian:buster
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
@ -11,110 +11,29 @@ 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
|
||||||
|
- apt-get -y build-dep .
|
||||||
build_docs:
|
|
||||||
<<: *tags
|
|
||||||
stage: build
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- _build
|
|
||||||
script:
|
|
||||||
- apt-get -y install python3-pip python3-sphinx
|
|
||||||
- pip3 install recommonmark
|
|
||||||
- ./doc/build.sh _build
|
|
||||||
|
|
||||||
build_meson:
|
build_meson:
|
||||||
tags:
|
<<: *tags
|
||||||
- librem5
|
|
||||||
stage: build
|
stage: build
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- _build
|
- _build
|
||||||
expire_in: 3h
|
expire_in: 3h
|
||||||
script:
|
script:
|
||||||
- apt-get -y build-dep .
|
- meson . _build/ -Ddepdatadir=/usr/share
|
||||||
- meson . _build/ -Ddepdatadir=/usr/share --werror
|
|
||||||
- ninja -C _build install
|
- ninja -C _build install
|
||||||
|
|
||||||
build_deb:
|
build_deb:
|
||||||
tags:
|
<<: *tags
|
||||||
- librem5
|
|
||||||
stage: build
|
stage: build
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- "*.deb"
|
- "*.deb"
|
||||||
script:
|
script:
|
||||||
- rm -f ../*.deb
|
|
||||||
- apt-get -y build-dep .
|
|
||||||
- apt-get -y install devscripts
|
|
||||||
- debuild -i -us -uc -b
|
|
||||||
- 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:
|
|
||||||
tags:
|
|
||||||
- librem5:arm64
|
|
||||||
stage: build
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- "*.deb"
|
|
||||||
script:
|
|
||||||
- rm -f ../*.deb
|
|
||||||
- apt-get -y build-dep .
|
|
||||||
- apt-get -y install devscripts
|
|
||||||
- debuild -i -us -uc -b
|
|
||||||
- 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
|
- apt-get -y install devscripts
|
||||||
- debuild -i -us -uc -b
|
- debuild -i -us -uc -b
|
||||||
- cp ../*.deb .
|
- cp ../*.deb .
|
||||||
@ -129,24 +48,9 @@ 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 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:
|
|
||||||
<<: *tags
|
|
||||||
stage: test
|
|
||||||
only:
|
|
||||||
refs:
|
|
||||||
- master
|
|
||||||
script:
|
|
||||||
- apt-get -y install git python3
|
|
||||||
- (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
|
|
||||||
|
|||||||
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"]
|
|
||||||
484
Cargo.lock
generated
484
Cargo.lock
generated
@ -1,484 +1,476 @@
|
|||||||
# 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.6"
|
||||||
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.2.1 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.16 (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.62 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"pkg-config 0.3.16 (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.61"
|
version = "1.0.45"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap"
|
|
||||||
version = "2.33.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"textwrap",
|
|
||||||
"unicode-width",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dtoa"
|
name = "dtoa"
|
||||||
version = "0.4.6"
|
version = "0.4.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
|
|
||||||
|
|
||||||
[[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.62 (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.62 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.16 (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.62 (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.16 (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.62 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.16 (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.62 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.16 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.16 (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.45 (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.62 (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.62 (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.16 (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.79"
|
version = "0.2.62"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "linked-hash-map"
|
name = "linked-hash-map"
|
||||||
version = "0.5.3"
|
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 = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
|
|
||||||
|
|
||||||
[[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.2.1"
|
||||||
|
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.62 (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.62 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"pkg-config",
|
"pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pkg-config"
|
name = "pkg-config"
|
||||||
version = "0.3.19"
|
version = "0.3.16"
|
||||||
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.24"
|
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 = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
|
|
||||||
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.7"
|
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 = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2 1.0.4 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"regex-syntax 0.6.12 (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.20"
|
version = "0.6.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c"
|
|
||||||
|
|
||||||
[[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",
|
"gio 0.5.1 (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)",
|
||||||
"clap",
|
"glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gdk",
|
"gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gio",
|
"gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib",
|
"maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"glib-sys",
|
"regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gtk",
|
"serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"gtk-sys",
|
"serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"maplit",
|
"xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"regex",
|
|
||||||
"serde",
|
|
||||||
"serde_yaml",
|
|
||||||
"xkbcommon",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.117"
|
version = "1.0.101"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.117"
|
version = "1.0.101"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2 1.0.4 (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.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_yaml"
|
name = "serde_yaml"
|
||||||
version = "0.8.13"
|
version = "0.8.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dtoa",
|
"dtoa 0.4.4 (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.101 (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.45"
|
version = "1.0.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2 1.0.4 (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 = "thread_local"
|
||||||
version = "0.11.0"
|
version = "0.3.6"
|
||||||
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",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-width"
|
|
||||||
version = "0.1.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-xid"
|
name = "unicode-xid"
|
||||||
version = "0.2.1"
|
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 = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
|
||||||
|
|
||||||
[[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.62 (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.4"
|
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 = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
|
|
||||||
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.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
|
||||||
|
"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.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
|
||||||
|
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
|
||||||
|
"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.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
|
||||||
|
"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.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
|
||||||
|
"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.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
|
||||||
|
"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
|
||||||
|
"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.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
|
||||||
|
"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
|
||||||
|
"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
|
||||||
|
"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
|
||||||
|
"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
|
||||||
|
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
|
||||||
|
"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"
|
||||||
|
|||||||
39
Cargo.toml
Normal file
39
Cargo.toml
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
[package]
|
||||||
|
name = "rs"
|
||||||
|
version = "0.1.0"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
bitflags = "1.0.*"
|
||||||
|
clap = "2.32.*"
|
||||||
|
maplit = "1.0.*"
|
||||||
|
regex = "1.1.*"
|
||||||
|
serde = { version = "1.0.*", features = ["derive"] }
|
||||||
|
serde_yaml = "0.8.*"
|
||||||
|
xkbcommon = { version = "0.4.*", features = ["wayland"] }
|
||||||
|
|
||||||
|
[dependencies.gio]
|
||||||
|
version = ""
|
||||||
|
features = ["v2_44"]
|
||||||
|
|
||||||
|
[dependencies.glib]
|
||||||
|
version = ""
|
||||||
|
features = ["v2_44"]
|
||||||
|
|
||||||
|
[dependencies.glib-sys]
|
||||||
|
version = ""
|
||||||
|
features = ["v2_44"]
|
||||||
|
|
||||||
|
|
||||||
|
[dependencies.gtk]
|
||||||
|
version = "0.5.*"
|
||||||
|
features = ["v3_22"]
|
||||||
|
|
||||||
|
[dependencies.gtk-sys]
|
||||||
|
version = ""
|
||||||
|
features = ["v3_22"]
|
||||||
|
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "rs"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
crate-type = ["staticlib", "rlib"]
|
||||||
@ -1,41 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "rs"
|
|
||||||
version = "0.1.0"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "rs"
|
|
||||||
path = "@path@/src/lib.rs"
|
|
||||||
crate-type = ["staticlib", "rlib"]
|
|
||||||
|
|
||||||
# Cargo can't do autodiscovery if Cargo.toml is not in the root.
|
|
||||||
[[bin]]
|
|
||||||
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]
|
|
||||||
version = ""
|
|
||||||
|
|
||||||
[dependencies.glib-sys]
|
|
||||||
version = ""
|
|
||||||
features = ["v2_44"]
|
|
||||||
|
|
||||||
[dependencies.gtk-sys]
|
|
||||||
version = ""
|
|
||||||
features = ["v3_22"]
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
maplit = "1.0.*"
|
|
||||||
serde = { version = "1.0.*", features = ["derive"] }
|
|
||||||
serde_yaml = "0.8.*"
|
|
||||||
xkbcommon = { version = "0.4.*", features = ["wayland"] }
|
|
||||||
# Here is inserted the Cargo.deps file
|
|
||||||
128
HACKING.md
Normal file
128
HACKING.md
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
Hacking
|
||||||
|
=======
|
||||||
|
|
||||||
|
This document describes the standards for modifying and maintaining the *squeekboard* project.
|
||||||
|
|
||||||
|
Development environment
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
*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.
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
On a Debian based system run
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo apt-get -y install build-essential
|
||||||
|
sudo apt-get -y build-dep .
|
||||||
|
```
|
||||||
|
|
||||||
|
For an explicit list of dependencies check the `Build-Depends` entry in the
|
||||||
|
[debian/control][] file.
|
||||||
|
|
||||||
|
Testing
|
||||||
|
-------
|
||||||
|
|
||||||
|
Most common testing is done in CI. Occasionally, and for each release, do perform manual tests to make sure that
|
||||||
|
|
||||||
|
- the application draws correctly
|
||||||
|
- it shows when relevant
|
||||||
|
- it changes layouts
|
||||||
|
- it changes views
|
||||||
|
|
||||||
|
Testing with an application:
|
||||||
|
|
||||||
|
```
|
||||||
|
python3 tests/entry.py
|
||||||
|
```
|
||||||
|
|
||||||
|
Testing visibility:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
|
||||||
|
$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
|
||||||
|
```
|
||||||
|
|
||||||
|
Testing layouts:
|
||||||
|
|
||||||
|
Layouts can be selected using the GNOME Settings application.
|
||||||
|
|
||||||
|
```
|
||||||
|
# define all available layouts. First one is currently selected.
|
||||||
|
$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
|
||||||
|
```
|
||||||
|
|
||||||
|
Coding
|
||||||
|
------
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
Bad example:
|
||||||
|
|
||||||
|
```
|
||||||
|
if (foo)
|
||||||
|
bar();
|
||||||
|
```
|
||||||
|
|
||||||
|
Good example:
|
||||||
|
|
||||||
|
```
|
||||||
|
if (foo) {
|
||||||
|
bar();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- mixing tabs and spaces in the same block of code (or config)
|
||||||
|
|
||||||
|
Strongly encouraged:
|
||||||
|
|
||||||
|
- don't make lines too long. If it's longer than ~80 characters, it's probably unreadable already, and the code needs to be clarified;
|
||||||
|
- put operators in the beginning of a continuation line
|
||||||
|
|
||||||
|
Bad example:
|
||||||
|
|
||||||
|
```
|
||||||
|
foobar = verylongexpression +
|
||||||
|
anotherverylongexpression +
|
||||||
|
yetanotherexpression;
|
||||||
|
```
|
||||||
|
|
||||||
|
Good example:
|
||||||
|
|
||||||
|
```
|
||||||
|
foobar = verylongexpression
|
||||||
|
+ anotherverylongexpression
|
||||||
|
+ yetanotherexpression;
|
||||||
|
```
|
||||||
|
|
||||||
|
- use `///` for documentation comments in front of definitions and `/*! ... */` for documentation comments in the beginning of modules (see [Rust doc-comments](https://doc.rust-lang.org/reference/comments.html#doc-comments))
|
||||||
|
|
||||||
|
If in doubt, check [PEP8](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md), the [kernel coding style](https://www.kernel.org/doc/html/v4.10/process/coding-style.html), or the [Rust style guide](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md).
|
||||||
|
|
||||||
|
Maintenance
|
||||||
|
-----------
|
||||||
|
|
||||||
|
Squeekboard uses Rust & Cargo for some of its dependencies.
|
||||||
|
|
||||||
|
Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:
|
||||||
|
|
||||||
|
```
|
||||||
|
cd build_dir
|
||||||
|
sh /source_path/cargo.sh test
|
||||||
|
```
|
||||||
|
|
||||||
|
### Cargo dependencies
|
||||||
|
|
||||||
|
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 should be updated often, preferably with each bugfix revision, and in a commit on its own:
|
||||||
|
|
||||||
|
```
|
||||||
|
cd build_dir
|
||||||
|
sh /source_path/cargo.sh update
|
||||||
|
ninja test
|
||||||
|
```
|
||||||
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 `HACKING.md`
|
||||||
|
|||||||
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,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: 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,11 +1,18 @@
|
|||||||
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 360, height: 208 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 35.33, height: 52 }
|
default:
|
||||||
altline: { width: 52.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 35.33, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
spaceline: { width: 99.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 52.67, height: 52 }
|
||||||
special: { width: 35.33, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 99.67, height: 52 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 35.33, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -45,7 +52,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "special"
|
outline: "special"
|
||||||
|
|||||||
@ -1,11 +1,18 @@
|
|||||||
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 540, height: 168 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 48, height: 42 }
|
default:
|
||||||
altline: { width: 81, height: 42 }
|
bounds: { x: 0, y: 0, width: 48, height: 42 }
|
||||||
wide: { width: 108, height: 42 }
|
altline:
|
||||||
spaceline: { width: 216, height: 42 }
|
bounds: { x: 0, y: 0, width: 81, height: 42 }
|
||||||
special: { width: 48, height: 42 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 108, height: 42 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 216, height: 42 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 48, height: 42 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -45,7 +52,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "special"
|
outline: "special"
|
||||||
|
|||||||
@ -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: "°"
|
|
||||||
@ -2,12 +2,19 @@
|
|||||||
# University of the Aegean, Department of Mathematics, atsol@aegean.gr
|
# University of the Aegean, Department of Mathematics, atsol@aegean.gr
|
||||||
# Sep 2019
|
# Sep 2019
|
||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 32, height: 52 }
|
default:
|
||||||
altline: { width: 48.39024, height: 52 }
|
bounds: { x: 0, y: 0, width: 32, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
outline7: { width: 88.97561, height: 52 }
|
bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
|
||||||
spaceline: { width: 150.5853, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
outline7:
|
||||||
|
bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -46,7 +53,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
@ -1,80 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 52, height: 52 }
|
|
||||||
altline: { width: 40, height: 52 }
|
|
||||||
narrow: { width: 22, height: 52 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "😀 😁 😅 😂 😊 😇 🙃"
|
|
||||||
- "😍 😘 😋 😜 😎 🥳 😔"
|
|
||||||
- "😢 😭 😡 😱 🤔 😬 🙄"
|
|
||||||
- "preferences blank 1 2 3 4 5 6 blank BackSpace"
|
|
||||||
two:
|
|
||||||
- "🤩 🤨 🤓 😴 🤢 🤮 😈"
|
|
||||||
- "💩 🙌 👏 👍 👎 👌 👋"
|
|
||||||
- "💪 🖕 🙏 💋 🤦♀️ 🤷♀️ 💃"
|
|
||||||
- "preferences blank 1 2 3 4 5 6 blank BackSpace"
|
|
||||||
three:
|
|
||||||
- "🐶 🐱 🐯 🙈 🐴 🦄 🌳"
|
|
||||||
- "🍀 🌹 💫 ⭐️ ✨ 💥 🔥"
|
|
||||||
- "🌈 ☀️ 🌤 🌧 ⛄️ ☂️ 🌊"
|
|
||||||
- "preferences blank 1 2 3 4 5 6 blank BackSpace"
|
|
||||||
four:
|
|
||||||
- "🍎 🍓 🍑 🍍 🍆 🥑 🥦"
|
|
||||||
- "🍕 🎂 🍫 🍿 🍻 🍾 🍽"
|
|
||||||
- "⚽️ 🏀 🏓 🏆 🎹 🎸 🎯"
|
|
||||||
- "preferences blank 1 2 3 4 5 6 blank BackSpace"
|
|
||||||
five:
|
|
||||||
- "🚗 🚌 🚲 🚄 🚂 ✈️ 🛰"
|
|
||||||
- "🚀 🛸 🚁 🚦 🏝 🏔 ⛺️"
|
|
||||||
- "🏠 🏢 🏥 🏛 🛤 🌅 🎇"
|
|
||||||
- "preferences blank 1 2 3 4 5 6 blank BackSpace"
|
|
||||||
six:
|
|
||||||
- "⌚️ 📱 💻 🖥 🖨 🕹 ✉️"
|
|
||||||
- "📞 ☎️ ⏰ ⏳ 📈 📉 📌"
|
|
||||||
- "🎁 ❤️ 💕 💯 ✅ ❎ 📢"
|
|
||||||
- "preferences blank 1 2 3 4 5 6 blank BackSpace"
|
|
||||||
|
|
||||||
buttons:
|
|
||||||
1:
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "1"
|
|
||||||
2:
|
|
||||||
action:
|
|
||||||
set_view: "two"
|
|
||||||
outline: "altline"
|
|
||||||
label: "2"
|
|
||||||
3:
|
|
||||||
action:
|
|
||||||
set_view: "three"
|
|
||||||
outline: "altline"
|
|
||||||
label: "3"
|
|
||||||
4:
|
|
||||||
action:
|
|
||||||
set_view: "four"
|
|
||||||
outline: "altline"
|
|
||||||
label: "4"
|
|
||||||
5:
|
|
||||||
action:
|
|
||||||
set_view: "five"
|
|
||||||
outline: "altline"
|
|
||||||
label: "5"
|
|
||||||
6:
|
|
||||||
action:
|
|
||||||
set_view: "six"
|
|
||||||
outline: "altline"
|
|
||||||
label: "6"
|
|
||||||
preferences:
|
|
||||||
action: "show_prefs"
|
|
||||||
outline: "altline"
|
|
||||||
icon: "keyboard-mode-symbolic"
|
|
||||||
BackSpace:
|
|
||||||
outline: "altline"
|
|
||||||
icon: "edit-clear-symbolic"
|
|
||||||
keysym: BackSpace
|
|
||||||
blank:
|
|
||||||
outline: "narrow"
|
|
||||||
text: ""
|
|
||||||
@ -1,10 +1,17 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 35.33, height: 52 }
|
default:
|
||||||
altline: { width: 52.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 35.33, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
spaceline: { width: 99.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 52.67, height: 52 }
|
||||||
special: { width: 44, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 99.67, height: 52 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 44, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -44,7 +51,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "default"
|
outline: "default"
|
||||||
|
|||||||
@ -1,10 +1,17 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 32, height: 52 }
|
default:
|
||||||
altline: { width: 48.39024, height: 52 }
|
bounds: { x: 0, y: 0, width: 32, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
outline7: { width: 88.97561, height: 52 }
|
bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
|
||||||
spaceline: { width: 150.5853, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
outline7:
|
||||||
|
bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -39,7 +46,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
|
|||||||
@ -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,92 +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 , \" ' colon ; ! = BackSpace"
|
|
||||||
- "show_letters show_eschars preferences space ? . Return"
|
|
||||||
symbols:
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ $ ¥ ^ ° * { }"
|
|
||||||
- "show_numbers \\ / < > = [ ] BackSpace"
|
|
||||||
- "show_letters show_eschars preferences space ? . Return"
|
|
||||||
eschars:
|
|
||||||
- "â ê î ô û Â Ê Î Ô Û"
|
|
||||||
- "à è ì ò ù À È Ì Ò Ù"
|
|
||||||
- "show_numbers ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ BackSpace"
|
|
||||||
- "show_letters show_eschars preferences space ᶠ . Return"
|
|
||||||
|
|
||||||
buttons:
|
|
||||||
Shift_L:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "upper"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
icon: "key-shift"
|
|
||||||
BackSpace:
|
|
||||||
outline: "altline"
|
|
||||||
icon: "edit-clear-symbolic"
|
|
||||||
action: "erase"
|
|
||||||
preferences:
|
|
||||||
action: "show_prefs"
|
|
||||||
outline: "special"
|
|
||||||
icon: "keyboard-mode-symbolic"
|
|
||||||
show_numbers:
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: "altline"
|
|
||||||
label: "123"
|
|
||||||
show_numbers_from_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: "altline"
|
|
||||||
label: "123"
|
|
||||||
show_letters:
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "abc"
|
|
||||||
show_symbols:
|
|
||||||
action:
|
|
||||||
set_view: "symbols"
|
|
||||||
outline: "altline"
|
|
||||||
label: "*/="
|
|
||||||
show_eschars:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "eschars"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "àê"
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
label: " "
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "altline"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
label: ":"
|
|
||||||
"\"":
|
|
||||||
keysym: "quotedbl"
|
|
||||||
@ -1,34 +1,41 @@
|
|||||||
# Italian layout created by Antonio Pandolfo
|
# Italian layout created by Antonio Pandolfo
|
||||||
# 03 october 2019
|
# 03 october 2019
|
||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 35.33, height: 52 }
|
default:
|
||||||
altline: { width: 52.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 35.33, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
spaceline: { width: 99.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 52.67, height: 52 }
|
||||||
special: { width: 44, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 99.67, height: 52 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 44, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
- "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 , \" ' colon ; ! ? 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:
|
||||||
- "á é í ó ú Á É Í Ó Ú"
|
- "á é í ó ú Á É Í Ó Ú"
|
||||||
- "à è ì ò « » ù ! { }"
|
- "à è ì ò « » ù ! { }"
|
||||||
@ -46,7 +53,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "default"
|
outline: "default"
|
||||||
@ -76,10 +83,12 @@ 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"
|
||||||
|
|||||||
@ -1,11 +1,18 @@
|
|||||||
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 360, height: 208 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 62, height: 52 }
|
default:
|
||||||
default-wide: { width: 62, height: 52 }
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
altline: { width: 62, height: 52 }
|
default-wide:
|
||||||
wide: { width: 62, height: 52 }
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
special: { width: 62, height: 52 }
|
altline:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base: # hiragana
|
base: # hiragana
|
||||||
@ -195,7 +202,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "wide"
|
outline: "wide"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: erase
|
keysym: "BackSpace"
|
||||||
Return:
|
Return:
|
||||||
outline: "wide"
|
outline: "wide"
|
||||||
icon: "key-enter"
|
icon: "key-enter"
|
||||||
|
|||||||
@ -1,525 +0,0 @@
|
|||||||
# Maintained by: Mark Müller <markmueller86@gmail.com>
|
|
||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 62, height: 42 }
|
|
||||||
default-wide: { width: 62, height: 42 }
|
|
||||||
altline: { width: 62, height: 42 }
|
|
||||||
wide: { width: 62, height: 42 }
|
|
||||||
special: { width: 62, height: 42 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base: # hiragana
|
|
||||||
- "preferences _a ka sa BackSpace"
|
|
||||||
- "Left ta na ha Right"
|
|
||||||
- "カタカナ ma ya ra space"
|
|
||||||
- "switch2roman symbols wa punct Return"
|
|
||||||
_a:
|
|
||||||
- "preferences dummykey _a dummykey BackSpace"
|
|
||||||
- "あ い う え お"
|
|
||||||
- "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
|
|
||||||
- "dummykey dummykey ゔ dummykey dummykey"
|
|
||||||
ka:
|
|
||||||
- "preferences dummykey ka dummykey BackSpace"
|
|
||||||
- "か き く け こ"
|
|
||||||
- "が ぎ ぐ げ ご"
|
|
||||||
- "ゕ dummykey dummykey ゖ dummykey"
|
|
||||||
sa:
|
|
||||||
- "preferences dummykey sa dummykey BackSpace"
|
|
||||||
- "さ し す せ そ"
|
|
||||||
- "ざ じ ず ぜ ぞ"
|
|
||||||
ta:
|
|
||||||
- "preferences dummykey ta dummykey BackSpace"
|
|
||||||
- "た ち つ て と"
|
|
||||||
- "だ ぢ づ で ど"
|
|
||||||
- "dummykey dummykey っ dummykey dummykey"
|
|
||||||
na:
|
|
||||||
- "preferences dummykey na dummykey BackSpace"
|
|
||||||
- "な に ぬ ね の"
|
|
||||||
ha:
|
|
||||||
- "preferences dummykey ha dummykey BackSpace"
|
|
||||||
- "は ひ ふ へ ほ"
|
|
||||||
- "ば び ぶ べ ぼ"
|
|
||||||
- "ぱ ぴ ぷ ぺ ぽ"
|
|
||||||
ma:
|
|
||||||
- "preferences dummykey ma dummykey BackSpace"
|
|
||||||
- "ま み む め も"
|
|
||||||
ya:
|
|
||||||
- "preferences dummykey ya dummykey BackSpace"
|
|
||||||
- "や dummykey ゆ dummykey よ"
|
|
||||||
- "ゃ dummykey ゅ dummykey ょ"
|
|
||||||
ra:
|
|
||||||
- "preferences dummykey ra dummykey BackSpace"
|
|
||||||
- "ら り る れ ろ"
|
|
||||||
wa:
|
|
||||||
- "preferences dummykey wa dummykey BackSpace"
|
|
||||||
- "わ ゐ dummykey ゑ を"
|
|
||||||
- "ゎ dummykey ん dummykey dummykey"
|
|
||||||
symbols:
|
|
||||||
- "preferences dummykey symbols dummykey BackSpace"
|
|
||||||
- "「 」 （ ） §"
|
|
||||||
- "【 】 ＜ ＞ ＝"
|
|
||||||
- "＋ ＊ ＆ ％ ＄ "
|
|
||||||
punct:
|
|
||||||
- "preferences dummykey punct dummykey BackSpace"
|
|
||||||
- "。 、 ？ ！ ー"
|
|
||||||
|
|
||||||
- "： ； ・ 〜 …"
|
|
||||||
- "♪ ” ’ ゙ ゚"
|
|
||||||
|
|
||||||
#a あア かカ さサ たタ なナ はハ まマ やヤ らラ わワ
|
|
||||||
#i いイ きキ しシ ちチ にニ ひヒ みミ ※ りリ ゐヰ
|
|
||||||
#u うウ くク すス つツ ぬヌ ふフ むム ゆユ るル ※
|
|
||||||
#e えエ けケ せセ てテ ねネ へヘ めメ ※ れレ ゑヱ
|
|
||||||
#o おオ こコ そソ とト のノ ほホ もモ よヨ ろロ をヲ
|
|
||||||
|
|
||||||
# g z d b p n
|
|
||||||
#a が ガ ざ ザ だ ダ ば バ ぱ パ ん ン
|
|
||||||
#i ぎ ギ じ ジ ぢ ヂ び ビ ぴ ピ
|
|
||||||
#u ぐ グ ず ズ づ ヅ ぶ ブ ぷ プ
|
|
||||||
#e げ ゲ ぜ ゼ で デ べ ベ ぺ ペ
|
|
||||||
#o ご ゴ ぞ ゾ ど ド ぼ ボ ぽ ポ
|
|
||||||
|
|
||||||
カタカナ: # katakana
|
|
||||||
- "preferences _A KA SA BackSpace"
|
|
||||||
- "Left TA NA HA Right"
|
|
||||||
- "ひらがな MA YA RA space"
|
|
||||||
- "switch2roman SYMBOLS WA PUNCT Return"
|
|
||||||
_A:
|
|
||||||
- "preferences DUMMYKEY _A DUMMYKEY BackSpace"
|
|
||||||
- "ア イ ウ エ オ"
|
|
||||||
- "ァ ィ ゥ ェ ォ"
|
|
||||||
- "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
|
|
||||||
KA:
|
|
||||||
- "preferences DUMMYKEY KA DUMMYKEY BackSpace"
|
|
||||||
- "カ キ ク ケ コ"
|
|
||||||
- "ガ ギ グ ゲ ゴ"
|
|
||||||
- "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
|
|
||||||
SA:
|
|
||||||
- "preferences DUMMYKEY SA DUMMYKEY BackSpace"
|
|
||||||
- "サ シ ス セ ソ"
|
|
||||||
- "ザ ジ ズ ゼ ゾ"
|
|
||||||
- "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
|
|
||||||
TA:
|
|
||||||
- "preferences DUMMYKEY TA DUMMYKEY BackSpace"
|
|
||||||
- "タ チ ツ テ ト"
|
|
||||||
- "ダ ヂ ヅ デ ド"
|
|
||||||
- "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
|
|
||||||
NA:
|
|
||||||
- "preferences DUMMYKEY NA DUMMYKEY BackSpace"
|
|
||||||
- "ナ ニ ヌ ネ ノ"
|
|
||||||
- "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
|
|
||||||
HA:
|
|
||||||
- "preferences DUMMYKEY HA DUMMYKEY BackSpace"
|
|
||||||
- "ハ ヒ フ ヘ ホ"
|
|
||||||
- "バ ビ ブ ベ ボ"
|
|
||||||
- "パ ピ プ ペ ポ"
|
|
||||||
MA:
|
|
||||||
- "preferences DUMMYKEY MA DUMMYKEY BackSpace"
|
|
||||||
- "マ ミ ム メ モ"
|
|
||||||
- "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
|
|
||||||
YA:
|
|
||||||
- "preferences DUMMYKEY YA DUMMYKEY BackSpace"
|
|
||||||
- "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
|
|
||||||
- "ャ DUMMYKEY ュ DUMMYKEY ョ"
|
|
||||||
RA:
|
|
||||||
- "preferences DUMMYKEY RA DUMMYKEY BackSpace"
|
|
||||||
- "ラ リ ル レ ロ"
|
|
||||||
- "ㇻ ㇼ ㇽ ㇾ ㇿ"
|
|
||||||
WA:
|
|
||||||
- "preferences DUMMYKEY WA DUMMYKEY BackSpace"
|
|
||||||
- "ワ ヰ DUMMYKEY ヱ ヲ"
|
|
||||||
- "ヮ ヸ ン ヹ ヺ"
|
|
||||||
# numbers view
|
|
||||||
numbers:
|
|
||||||
- "preferences 1 2 3 BackSpace"
|
|
||||||
- "Left 4 5 6 Right"
|
|
||||||
- "roman 7 8 9 space"
|
|
||||||
- "switch2kana * 0 # Return"
|
|
||||||
# Roman alphabet view
|
|
||||||
roman:
|
|
||||||
- "preferences RSYM1 ABC DEF BackSpace"
|
|
||||||
- "Left GHI JKL MNO Right"
|
|
||||||
- "ひらがな PQRS TUV WXYZ space"
|
|
||||||
- "switch2num RSYM2 RSYM3 RSYM4 Return"
|
|
||||||
RSYM1:
|
|
||||||
- "preferences dummykey RSYM1 dummykey BackSpace"
|
|
||||||
- "@ # $ § :"
|
|
||||||
- "| € ¥ £ 1"
|
|
||||||
ABC:
|
|
||||||
- "preferences dummykey ABC dummykey BackSpace"
|
|
||||||
- "A B C Ä ç"
|
|
||||||
- "a b c ä 2"
|
|
||||||
DEF:
|
|
||||||
- "preferences dummykey DEF dummykey BackSpace"
|
|
||||||
- "D E F dummykey"
|
|
||||||
- "d e f 3"
|
|
||||||
GHI:
|
|
||||||
- "preferences dummykey GHI dummykey BackSpace"
|
|
||||||
- "G H I dummykey"
|
|
||||||
- "g h i 4"
|
|
||||||
JKL:
|
|
||||||
- "preferences dummykey JKL dummykey BackSpace"
|
|
||||||
- "J K L dummykey"
|
|
||||||
- "j k l 5"
|
|
||||||
MNO:
|
|
||||||
- "preferences dummykey MNO dummykey BackSpace"
|
|
||||||
- "M N O Ö dummykey"
|
|
||||||
- "m n o ö 6"
|
|
||||||
PQRS:
|
|
||||||
- "preferences dummykey PQRS dummykey BackSpace"
|
|
||||||
- "P Q R S ß"
|
|
||||||
- "p q r s 7"
|
|
||||||
TUV:
|
|
||||||
- "preferences dummykey TUV dummykey BackSpace"
|
|
||||||
- "T U V Ü dummykey"
|
|
||||||
- "t u v ü 8"
|
|
||||||
WXYZ:
|
|
||||||
- "preferences dummykey WXYZ dummykey BackSpace"
|
|
||||||
- "W X Y Z dummykey"
|
|
||||||
- "w x y z 9"
|
|
||||||
RSYM2:
|
|
||||||
- "preferences dummykey RSYM2 dummykey BackSpace"
|
|
||||||
- "( ) ' \" ~"
|
|
||||||
- "[ ] { } _"
|
|
||||||
RSYM3:
|
|
||||||
- "preferences dummykey RSYM3 dummykey BackSpace"
|
|
||||||
- "+ - * / ="
|
|
||||||
- "< > ^ ° 0"
|
|
||||||
RSYM4:
|
|
||||||
- "preferences dummykey RSYM4 dummykey BackSpace"
|
|
||||||
- ", . ? ! ;"
|
|
||||||
- "\\ ´ ` · ¶"
|
|
||||||
|
|
||||||
buttons:
|
|
||||||
# following 4 buttons use the corresponding xkb name as keysym
|
|
||||||
BackSpace:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "edit-clear-symbolic"
|
|
||||||
action: erase
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
Left:
|
|
||||||
outline: "wide"
|
|
||||||
label: "←"
|
|
||||||
keysym: "Left"
|
|
||||||
Right:
|
|
||||||
outline: "wide"
|
|
||||||
label: "→"
|
|
||||||
keysym: "Right"
|
|
||||||
# special button "preferences" is handled in the code
|
|
||||||
preferences:
|
|
||||||
action: "show_prefs"
|
|
||||||
outline: "special"
|
|
||||||
icon: "keyboard-mode-symbolic"
|
|
||||||
# space button using text tag for ideographic space
|
|
||||||
space:
|
|
||||||
outline: "default-wide"
|
|
||||||
label: "␣"
|
|
||||||
text: " "
|
|
||||||
# switch to number view
|
|
||||||
numbers:
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: "wide"
|
|
||||||
label: "123"
|
|
||||||
# switch to latin characters
|
|
||||||
roman:
|
|
||||||
action:
|
|
||||||
set_view: "roman"
|
|
||||||
outline: "wide"
|
|
||||||
label: "ᴀʙᴄ"
|
|
||||||
# toggle button with 3 different states
|
|
||||||
switch2roman: # switch from kana to latin characters view
|
|
||||||
action:
|
|
||||||
set_view: "roman"
|
|
||||||
outline: "wide"
|
|
||||||
label: "あᴀ₁"
|
|
||||||
switch2num: # switch from latin characters to numbers view
|
|
||||||
action:
|
|
||||||
set_view: "numbers"
|
|
||||||
outline: "wide"
|
|
||||||
label: "ぁA₁"
|
|
||||||
switch2kana: # switch from numbers to hiragana view
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "wide"
|
|
||||||
label: "ぁᴀ1"
|
|
||||||
# Buttons for katakana and symbols
|
|
||||||
ひらがな:
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "wide"
|
|
||||||
label: "あさ"
|
|
||||||
_a:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "_a"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "あ"
|
|
||||||
ka:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ka"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "か"
|
|
||||||
sa:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "sa"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "さ"
|
|
||||||
ta:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ta"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "た"
|
|
||||||
na:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "na"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "な"
|
|
||||||
ha:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ha"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "は"
|
|
||||||
ma:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ma"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ま"
|
|
||||||
ya:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ya"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "や"
|
|
||||||
ra:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ra"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ら"
|
|
||||||
wa:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "wa"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "わ"
|
|
||||||
dummykey:
|
|
||||||
action:
|
|
||||||
set_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: ""
|
|
||||||
# buttons available on different views like symbols and punct should go
|
|
||||||
# back to their corresponding view
|
|
||||||
symbols:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "symbols"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "（）"
|
|
||||||
punct:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "punct"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
label: "。"
|
|
||||||
# Buttons for katakana and symbols
|
|
||||||
カタカナ:
|
|
||||||
action:
|
|
||||||
set_view: "カタカナ"
|
|
||||||
outline: "wide"
|
|
||||||
label: "アサ"
|
|
||||||
_A:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "_A"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ア"
|
|
||||||
KA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "KA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "カ"
|
|
||||||
SA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "SA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "サ"
|
|
||||||
TA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "TA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "タ"
|
|
||||||
NA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "NA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ナ"
|
|
||||||
HA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "HA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ハ"
|
|
||||||
MA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "MA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "マ"
|
|
||||||
YA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "YA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ヤ"
|
|
||||||
RA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "RA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ラ"
|
|
||||||
WA:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "WA"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ワ"
|
|
||||||
DUMMYKEY:
|
|
||||||
action:
|
|
||||||
set_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: ""
|
|
||||||
SYMBOLS:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "symbols"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "（）"
|
|
||||||
PUNCT:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "punct"
|
|
||||||
unlock_view: "カタカナ"
|
|
||||||
outline: "altline"
|
|
||||||
label: "。"
|
|
||||||
# Buttons for Latin charachters
|
|
||||||
RSYM1:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "RSYM1"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "@#"
|
|
||||||
ABC:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "ABC"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴀʙᴄ"
|
|
||||||
DEF:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "DEF"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴅᴇꜰ"
|
|
||||||
GHI:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "GHI"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ɢʜɪ"
|
|
||||||
JKL:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "JKL"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴊᴋʟ"
|
|
||||||
MNO:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "MNO"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴍɴᴏ"
|
|
||||||
PQRS:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "PQRS"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴘǫʀs"
|
|
||||||
TUV:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "TUV"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴛᴜᴠ"
|
|
||||||
WXYZ:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "WXYZ"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ᴡxʏᴢ"
|
|
||||||
RSYM2:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "RSYM2"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "()"
|
|
||||||
RSYM3:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "RSYM3"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: "+-"
|
|
||||||
RSYM4:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "RSYM4"
|
|
||||||
unlock_view: "roman"
|
|
||||||
outline: "altline"
|
|
||||||
label: ",.?"
|
|
||||||
@ -1,10 +1,17 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 32, height: 52 }
|
default:
|
||||||
altline: { width: 48.39024, height: 52 }
|
bounds: { x: 0, y: 0, width: 32, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
outline7: { width: 88.97561, height: 52 }
|
bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
|
||||||
spaceline: { width: 150.5853, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
outline7:
|
||||||
|
bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -39,7 +46,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: erase
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
|
|||||||
@ -1,9 +1,15 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 37.46341, height: 52 }
|
default:
|
||||||
altline: { width: 48.39024, height: 52 }
|
bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
|
||||||
outline7: { width: 88.97561, height: 52 }
|
altline:
|
||||||
spaceline: { width: 120.5853, height: 52 }
|
bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
|
||||||
|
outline7:
|
||||||
|
bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 120.5853, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -16,14 +22,14 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: erase
|
keysym: "BackSpace"
|
||||||
space:
|
space:
|
||||||
outline: spaceline
|
outline: spaceline
|
||||||
text: " "
|
text: " "
|
||||||
Return:
|
Return:
|
||||||
outline: outline7
|
outline: outline7
|
||||||
icon: "key-enter"
|
icon: "key-enter"
|
||||||
keysym: "Return"
|
keysym: "BackSpace"
|
||||||
asterisk:
|
asterisk:
|
||||||
text: "*"
|
text: "*"
|
||||||
numbersign:
|
numbersign:
|
||||||
|
|||||||
@ -1,110 +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:
|
|
||||||
- "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_accents 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 show_upper_accents 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"
|
|
||||||
accents:
|
|
||||||
- "q w ę r t y u i ó p"
|
|
||||||
- "ą ś d f g h j k ł"
|
|
||||||
- "accents_show_upper ż ź ć v b ń m BackSpace"
|
|
||||||
- "show_numbers preferences space show_accents Return"
|
|
||||||
upper_accents:
|
|
||||||
- "Q W Ę R T Y U I Ó P"
|
|
||||||
- "Ą Ś D F G H J K Ł"
|
|
||||||
- "accents_show_upper Ż Ź Ć V B Ń M BackSpace"
|
|
||||||
- "show_numbers preferences space show_upper_accents Return"
|
|
||||||
|
|
||||||
|
|
||||||
buttons:
|
|
||||||
Shift_L:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "upper"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
icon: "key-shift"
|
|
||||||
accents_show_upper:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "upper_accents"
|
|
||||||
unlock_view: "accents"
|
|
||||||
outline: "altline"
|
|
||||||
icon: "key-shift"
|
|
||||||
BackSpace:
|
|
||||||
outline: "altline"
|
|
||||||
icon: "edit-clear-symbolic"
|
|
||||||
keysym: "BackSpace"
|
|
||||||
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: "altline"
|
|
||||||
label: "ąę"
|
|
||||||
show_upper_accents:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "upper_accents"
|
|
||||||
unlock_view: "upper"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ĄĘ"
|
|
||||||
period:
|
|
||||||
outline: "altline"
|
|
||||||
text: "."
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
text: " "
|
|
||||||
Return:
|
|
||||||
outline: "wide"
|
|
||||||
icon: "key-enter"
|
|
||||||
keysym: "Return"
|
|
||||||
colon:
|
|
||||||
text: ":"
|
|
||||||
@ -1,102 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 54, height: 42 }
|
|
||||||
altline: { width: 81, height: 42 }
|
|
||||||
wide: { width: 100, height: 42 }
|
|
||||||
spaceline: { width: 206, 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 space show_accents 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 show_upper_accents 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"
|
|
||||||
accents:
|
|
||||||
- "q w ę r t y u i ó p"
|
|
||||||
- "ą ś d f g h j k ł"
|
|
||||||
- "Shift_L ż ź ć v b ń m BackSpace"
|
|
||||||
- "show_numbers preferences space show_accents Return"
|
|
||||||
upper_accents:
|
|
||||||
- "Q W Ę R T Y U I Ó P"
|
|
||||||
- "Ą Ś D F G H J K Ł"
|
|
||||||
- "Shift_L Ż Ź Ć V B Ń M BackSpace"
|
|
||||||
- "show_numbers preferences space show_upper_accents Return"
|
|
||||||
|
|
||||||
buttons:
|
|
||||||
Shift_L:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "upper"
|
|
||||||
unlock_view: "base"
|
|
||||||
outline: "altline"
|
|
||||||
icon: "key-shift"
|
|
||||||
BackSpace:
|
|
||||||
outline: "altline"
|
|
||||||
icon: "edit-clear-symbolic"
|
|
||||||
keysym: "BackSpace"
|
|
||||||
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: "altline"
|
|
||||||
label: "ąę"
|
|
||||||
show_upper_accents:
|
|
||||||
action:
|
|
||||||
locking:
|
|
||||||
lock_view: "upper_accents"
|
|
||||||
unlock_view: "upper"
|
|
||||||
outline: "altline"
|
|
||||||
label: "ĄĘ"
|
|
||||||
period:
|
|
||||||
outline: "altline"
|
|
||||||
text: "."
|
|
||||||
space:
|
|
||||||
outline: "spaceline"
|
|
||||||
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,11 +1,17 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 32, height: 52 }
|
default:
|
||||||
altline: { width: 48.39024, height: 52 }
|
bounds: { x: 0, y: 0, width: 32, height: 52 }
|
||||||
wide: { width: 64, height: 52 }
|
altline:
|
||||||
spaceline: { width: 142, height: 52 }
|
bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
|
||||||
special: { width: 44, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
outline7:
|
||||||
|
bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -26,7 +32,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 +44,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
|
keysym: "BackSpace"
|
||||||
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 +67,7 @@ buttons:
|
|||||||
outline: "altline"
|
outline: "altline"
|
||||||
label: "*/="
|
label: "*/="
|
||||||
".":
|
".":
|
||||||
outline: "special"
|
outline: altline
|
||||||
space:
|
space:
|
||||||
outline: spaceline
|
outline: spaceline
|
||||||
text: " "
|
text: " "
|
||||||
@ -162,3 +163,4 @@ buttons:
|
|||||||
text: "["
|
text: "["
|
||||||
bracketright:
|
bracketright:
|
||||||
text: "]"
|
text: "]"
|
||||||
|
|
||||||
|
|||||||
@ -1,204 +0,0 @@
|
|||||||
---
|
|
||||||
outlines:
|
|
||||||
default: { width: 35.33, height: 46 }
|
|
||||||
action: { width: 59, height: 46 }
|
|
||||||
altline: { width: 52.67, height: 46 }
|
|
||||||
wide: { width: 59, height: 46 }
|
|
||||||
spaceline: { width: 140, height: 46 }
|
|
||||||
special: { width: 44, height: 46 }
|
|
||||||
small: { width: 59, height: 22 }
|
|
||||||
|
|
||||||
views:
|
|
||||||
base:
|
|
||||||
- "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:
|
|
||||||
- "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:
|
|
||||||
- "Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "1 2 3 4 5 6 7 8 9 0"
|
|
||||||
- "* # $ / & - _ + ( )"
|
|
||||||
- "show_symbols , \" ' colon ; ! ? BackSpace"
|
|
||||||
- "show_letters preferences space period Return"
|
|
||||||
symbols:
|
|
||||||
- "Ctrl Alt ↑ ↓ ← →"
|
|
||||||
- "~ ` | · √ π τ ÷ × ¶"
|
|
||||||
- "© ® £ € ¥ ^ ° @ { }"
|
|
||||||
- "show_numbers_from_symbols \\ % < > = [ ] BackSpace"
|
|
||||||
- "show_letters preferences space period 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:
|
|
||||||
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"
|
|
||||||
Tab:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Tab"
|
|
||||||
Del:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Delete"
|
|
||||||
Insert:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Insert"
|
|
||||||
Menu:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Menu"
|
|
||||||
Pause:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Pause"
|
|
||||||
Menu:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Menu"
|
|
||||||
Break:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Break"
|
|
||||||
Home:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Home"
|
|
||||||
End:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "End"
|
|
||||||
PgUp:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Page_Up"
|
|
||||||
PgDn:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Page_Down"
|
|
||||||
"↑":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Up"
|
|
||||||
"↓":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Down"
|
|
||||||
"←":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Left"
|
|
||||||
"→":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Right"
|
|
||||||
Up:
|
|
||||||
label: "↑"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Up"
|
|
||||||
Left:
|
|
||||||
label: "←"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Left"
|
|
||||||
Down:
|
|
||||||
label: "↓"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Down"
|
|
||||||
Right:
|
|
||||||
label: "→"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Right"
|
|
||||||
Ctrl:
|
|
||||||
modifier: "Control"
|
|
||||||
outline: "small"
|
|
||||||
label: "Ctrl"
|
|
||||||
Alt:
|
|
||||||
modifier: "Alt"
|
|
||||||
outline: "small"
|
|
||||||
label: "Alt"
|
|
||||||
|
|
||||||
@ -1,211 +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"
|
|
||||||
Menu:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Menu"
|
|
||||||
Break:
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Break"
|
|
||||||
Home:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Home"
|
|
||||||
End:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "End"
|
|
||||||
PgUp:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Page_Up"
|
|
||||||
PgDn:
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Page_Down"
|
|
||||||
"↑":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Up"
|
|
||||||
"↓":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Down"
|
|
||||||
"←":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Left"
|
|
||||||
"→":
|
|
||||||
outline: "small"
|
|
||||||
keysym: "Right"
|
|
||||||
Up:
|
|
||||||
label: "↑"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Up"
|
|
||||||
Left:
|
|
||||||
label: "←"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Left"
|
|
||||||
Down:
|
|
||||||
label: "↓"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Down"
|
|
||||||
Right:
|
|
||||||
label: "→"
|
|
||||||
outline: "action"
|
|
||||||
keysym: "Right"
|
|
||||||
Ctrl:
|
|
||||||
modifier: "Control"
|
|
||||||
outline: "small"
|
|
||||||
label: "Ctrl"
|
|
||||||
Alt:
|
|
||||||
modifier: "Alt"
|
|
||||||
outline: "small"
|
|
||||||
label: "Alt"
|
|
||||||
@ -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,10 +1,17 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 360, height: 208 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 35.33, height: 52 }
|
default:
|
||||||
altline: { width: 52.67, height: 52 }
|
bounds: { x: 0, y: 0, width: 35.33, height: 52 }
|
||||||
wide: { width: 62, height: 52 }
|
altline:
|
||||||
spaceline: { width: 142, height: 52 }
|
bounds: { x: 0, y: 0, width: 52.67, height: 52 }
|
||||||
special: { width: 44, height: 52 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 62, height: 52 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 142, height: 52 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 44, height: 52 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -39,9 +46,9 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: erase
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: show_prefs
|
action: "show_prefs"
|
||||||
outline: "special"
|
outline: "special"
|
||||||
icon: "keyboard-mode-symbolic"
|
icon: "keyboard-mode-symbolic"
|
||||||
show_numbers:
|
show_numbers:
|
||||||
|
|||||||
@ -1,10 +1,17 @@
|
|||||||
---
|
---
|
||||||
|
bounds: { x: 0, y: 1, width: 540, height: 168 }
|
||||||
|
|
||||||
outlines:
|
outlines:
|
||||||
default: { width: 54, height: 42 }
|
default:
|
||||||
altline: { width: 81, height: 42 }
|
bounds: { x: 0, y: 0, width: 54, height: 42 }
|
||||||
wide: { width: 108, height: 42 }
|
altline:
|
||||||
spaceline: { width: 216, height: 42 }
|
bounds: { x: 0, y: 0, width: 81, height: 42 }
|
||||||
special: { width: 54, height: 42 }
|
wide:
|
||||||
|
bounds: { x: 0, y: 0, width: 108, height: 42 }
|
||||||
|
spaceline:
|
||||||
|
bounds: { x: 0, y: 0, width: 216, height: 42 }
|
||||||
|
special:
|
||||||
|
bounds: { x: 0, y: 0, width: 54, height: 42 }
|
||||||
|
|
||||||
views:
|
views:
|
||||||
base:
|
base:
|
||||||
@ -39,7 +46,7 @@ buttons:
|
|||||||
BackSpace:
|
BackSpace:
|
||||||
outline: "altline"
|
outline: "altline"
|
||||||
icon: "edit-clear-symbolic"
|
icon: "edit-clear-symbolic"
|
||||||
action: "erase"
|
keysym: "BackSpace"
|
||||||
preferences:
|
preferences:
|
||||||
action: "show_prefs"
|
action: "show_prefs"
|
||||||
outline: "special"
|
outline: "special"
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
us Englisch (US)
|
||||||
|
de Deutsch
|
||||||
|
el Griechisch
|
||||||
|
es Spanisch
|
||||||
|
it Italienisch
|
||||||
|
jp+kana Japanisch (Kana)
|
||||||
|
no Norwegisch
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +1,10 @@
|
|||||||
emoji Emoji
|
us English (US)
|
||||||
terminal Terminal
|
de German
|
||||||
|
el Greek
|
||||||
|
es Spanish
|
||||||
|
fi Finnish
|
||||||
|
it Italian
|
||||||
|
jp+kana Japanese (kana)
|
||||||
|
no Norwegian
|
||||||
|
se Swedish
|
||||||
|
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
be Belgjic
|
|
||||||
br Brasilian
|
|
||||||
de Todesc
|
|
||||||
dk Danês
|
|
||||||
es Spgnû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)
|
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
us 英語 (US)
|
||||||
|
de ドイツ語
|
||||||
|
el ギリシャ語
|
||||||
|
es スペイン語
|
||||||
|
it イタリア語
|
||||||
|
jp+kana 日本語 (かな)
|
||||||
|
nb ノルウェー語
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +1,9 @@
|
|||||||
emoji emoji
|
us angielski (USA)
|
||||||
terminal terminal
|
de niemiecki
|
||||||
|
el grecki
|
||||||
|
es hiszpański
|
||||||
|
fi fiński
|
||||||
|
it włoski
|
||||||
|
jp+kana japoński (kana)
|
||||||
|
no norweski
|
||||||
|
se szwedzki
|
||||||
|
|||||||
@ -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
|
||||||
@ -2,7 +2,6 @@ sq_view {
|
|||||||
background-color: rgba(0, 0, 0, 255);
|
background-color: rgba(0, 0, 0, 255);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
font-family: cantarell, sans-serif;
|
font-family: cantarell, sans-serif;
|
||||||
font-size: 25px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_view sq_button {
|
sq_view sq_button {
|
||||||
@ -36,14 +35,6 @@ sq_button.locked {
|
|||||||
color: #2b292f;
|
color: #2b292f;
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.action {
|
|
||||||
font-size: 0.75em;
|
|
||||||
}
|
|
||||||
|
|
||||||
sq_button.small {
|
|
||||||
font-size: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#Return {
|
#Return {
|
||||||
background: #1c71d8;
|
background: #1c71d8;
|
||||||
border-color: #1a5fb4;
|
border-color: #1a5fb4;
|
||||||
|
|||||||
@ -2,7 +2,6 @@ sq_view {
|
|||||||
background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
|
background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
|
||||||
color: @theme_text_color; /*#ffffff;*/
|
color: @theme_text_color; /*#ffffff;*/
|
||||||
font-family: cantarell, sans-serif;
|
font-family: cantarell, sans-serif;
|
||||||
font-size: 25px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_view sq_button {
|
sq_view sq_button {
|
||||||
@ -39,14 +38,6 @@ sq_button.locked {
|
|||||||
color: @theme_bg_color; /*#2b292f;*/
|
color: @theme_bg_color; /*#2b292f;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
sq_button.action {
|
|
||||||
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;*/
|
||||||
|
|||||||
39
dco.txt
39
dco.txt
@ -1,39 +0,0 @@
|
|||||||
Developer Certificate of Origin
|
|
||||||
Version 1.1
|
|
||||||
|
|
||||||
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
|
|
||||||
1 Letterman Drive
|
|
||||||
Suite D4700
|
|
||||||
San Francisco, CA, 94129
|
|
||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies of this
|
|
||||||
license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
|
|
||||||
Developer's Certificate of Origin 1.1
|
|
||||||
|
|
||||||
By making a contribution to this project, I certify that:
|
|
||||||
|
|
||||||
(a) The contribution was created in whole or in part by me and I
|
|
||||||
have the right to submit it under the open source license
|
|
||||||
indicated in the file; or
|
|
||||||
|
|
||||||
(b) The contribution is based upon previous work that, to the best
|
|
||||||
of my knowledge, is covered under an appropriate open source
|
|
||||||
license and I have the right under that license to submit that
|
|
||||||
work with modifications, whether created in whole or in part
|
|
||||||
by me, under the same open source license (unless I am
|
|
||||||
permitted to submit under a different license), as indicated
|
|
||||||
in the file; or
|
|
||||||
|
|
||||||
(c) The contribution was provided directly to me by some other
|
|
||||||
person who certified (a), (b) or (c) and I have not modified
|
|
||||||
it.
|
|
||||||
|
|
||||||
(d) I understand and agree that this project and the contribution
|
|
||||||
are public and that a record of the contribution (including all
|
|
||||||
personal information I submit with it, including my sign-off) is
|
|
||||||
maintained indefinitely and may be redistributed consistent with
|
|
||||||
this project or the open source license(s) involved.
|
|
||||||
|
|
||||||
|
|
||||||
360
debian/changelog
vendored
360
debian/changelog
vendored
@ -1,363 +1,3 @@
|
|||||||
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
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* imservice: Add commit_string method
|
|
||||||
* submission: Handle submitting strings
|
|
||||||
* input_method: Use for erasing
|
|
||||||
* logging: Use in merged functions
|
|
||||||
* translations: Remove redundant ones
|
|
||||||
* translations: Translate builtin layouts
|
|
||||||
* greek: Rename to gr which is used by gnome settings
|
|
||||||
|
|
||||||
[ Sebastian Krzyszkowiak ]
|
|
||||||
* layouts: Add Polish layouts
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* locks: Draw based on current view
|
|
||||||
* locking: Lock keys statelessly
|
|
||||||
* layouts: Better accented uppercase in PL
|
|
||||||
* emoji: Add more choices
|
|
||||||
* row: Eliminate angle
|
|
||||||
* layout: Center views relative to each other and the layout bounds
|
|
||||||
* drawing: Generalized foreach_visible_button
|
|
||||||
* variant: Fix double-free
|
|
||||||
* variant: Fix leak
|
|
||||||
* keyboard_layout: Fix leak
|
|
||||||
* layout: Improve scoping of locked variable
|
|
||||||
* terminal: Make */ easier to reach
|
|
||||||
|
|
||||||
[ Sebastian Krzyszkowiak ]
|
|
||||||
* layouts: terminal: Use altline outline for dot key
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* text input: Disable erasing
|
|
||||||
* cargo: Update deps
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Wed, 19 Feb 2020 14:32:39 +0000
|
|
||||||
|
|
||||||
squeekboard (1.8.1) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* action: Rename Level to View
|
|
||||||
* keyboard: Introduce a KeyCode type wrapping u32
|
|
||||||
* layout: Centralize handling key releases
|
|
||||||
* layout: Make handling presses uniform
|
|
||||||
* UI: Drop indirection for show/hide functions
|
|
||||||
* managers: Move visible flag to UI manager
|
|
||||||
* dbus_service: Remove unused function
|
|
||||||
* dbus: Remove unneeded gobjectness
|
|
||||||
* dbus: Rename handler from eekboard_service
|
|
||||||
* context: Moved keymap setting together with its generation
|
|
||||||
* key-emitter: Remove unused
|
|
||||||
* eekboard_context_service: Drop unused enable property
|
|
||||||
* services: Split out layout management from EekboardContextService
|
|
||||||
* submission: Move away from virtual-keyboard
|
|
||||||
* submission: Create a new wrapper over imservice
|
|
||||||
* imservice: Limited scope of unsafe
|
|
||||||
* EekGtkKeyboard: Use a direct reference to EekboardContext
|
|
||||||
* submission: Take over virtual_keyboard handling
|
|
||||||
* keyboard: Cleanups of unused code
|
|
||||||
* levelkeyboard: Drop unused manager references
|
|
||||||
* keyboard: Gather up keymap handling, drop layout
|
|
||||||
* submission: Remove wildcard reexport
|
|
||||||
* imservice: Rename commit_state to done to match protocol
|
|
||||||
* ci: Clean up `..` before it's searched for artifacts
|
|
||||||
* dbus: Log error on dbus exit
|
|
||||||
* logging: Try to improve common operations
|
|
||||||
* imservice: Return something more resembling an Error on failure
|
|
||||||
* logging: Unified to remove random eprint calls
|
|
||||||
* press_key: Use proper logging
|
|
||||||
* number: Fix keysym for Return
|
|
||||||
* build: Strip clap of optional features
|
|
||||||
* layouts: Fix segfault on switching to wide
|
|
||||||
* font: Use font from style context
|
|
||||||
* font: Only pass relevant data to label renderer
|
|
||||||
|
|
||||||
[ Sebastian Krzyszkowiak ]
|
|
||||||
* layout: terminal: Swap positions of preferences and actions button
|
|
||||||
* layout: terminal: Show actions button on all views
|
|
||||||
* layout: terminal: Replace actions button with period on symbols view
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* setup: Connect ui to the state manager
|
|
||||||
* debian: Add missing commas
|
|
||||||
|
|
||||||
[ David Boddie ]
|
|
||||||
* Tidy build file and docs
|
|
||||||
* Use pip to install recommonmark
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Fri, 31 Jan 2020 09:59:12 +0000
|
|
||||||
|
|
||||||
squeekboard (1.8.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* translations: Use gnome-desktop's xkb info database for layout names
|
|
||||||
* translations: Make the code cleaner
|
|
||||||
* overlay: Add terminal
|
|
||||||
* eek-layout: Remove unused
|
|
||||||
* pre-release: Update deps
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Tue, 14 Jan 2020 13:55:00 +0000
|
|
||||||
|
|
||||||
squeekboard (1.7.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
* New terminal layout appearing on terminal input hint
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Wed, 08 Jan 2020 11:53:07 +0000
|
|
||||||
|
|
||||||
squeekboard (1.7.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
* New terminal layout appearing on terminal input hint
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Wed, 08 Jan 2020 11:53:07 +0000
|
|
||||||
|
|
||||||
squeekboard (1.6.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* tools: Move entry.py
|
|
||||||
* build: Move building of squeekboard-test-layout to tools
|
|
||||||
* packaging: Install entty.py as squeekboard-entry
|
|
||||||
* Remove unused build dependencies
|
|
||||||
* Remove unused header generator
|
|
||||||
* logging: Move all facilities to one file
|
|
||||||
* logging: Described the design
|
|
||||||
* logging: Add described log levels
|
|
||||||
* popover: Install emoji layout
|
|
||||||
* popover: Show overlays as selected
|
|
||||||
* Fix old Rust woes
|
|
||||||
* emoji: Add a passable layout
|
|
||||||
* Fix g_ and stdlib allocation/free mismatches
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Thu, 02 Jan 2020 12:02:50 +0000
|
|
||||||
|
|
||||||
squeekboard (1.5.0) amber-phone; urgency=medium
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* keycodes: Sort to eliminate runtime indeterminism
|
|
||||||
* switcher: Switch layout on menu item click
|
|
||||||
* Drop squeek_key
|
|
||||||
* renderer: Remove some unneeded vars
|
|
||||||
* renderer: Simplified outline rendering
|
|
||||||
* renderer: Drop row from button rendering
|
|
||||||
* renderer: Drop unused params
|
|
||||||
* renderer: Simplify surface rendering
|
|
||||||
* rendering: Simplify Cairo context usage, remove unneeded calls.
|
|
||||||
* rendering: Remove unneeded redraw after button release
|
|
||||||
* renderer: Remove unused locked key render function
|
|
||||||
* renderer: Simply cut off when painting outside bounds
|
|
||||||
* renderer: Render whole keyboard the same way as pressed buttons
|
|
||||||
|
|
||||||
[ Mark Müller ]
|
|
||||||
* layout: add German wide layout
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* renderer: Remove unused functions
|
|
||||||
* cleanup: Remove references to squeek_view
|
|
||||||
* cleanup: Unbox View and Row
|
|
||||||
* cleanup: Remove unused single frame draw
|
|
||||||
* positioning: Calculate sizes instead of storing, move position out of widgets
|
|
||||||
* positioning: Clean up unused code
|
|
||||||
* Fix old Rust woes
|
|
||||||
|
|
||||||
[ Mark Müller ]
|
|
||||||
* layout: add Japanese Kana wide layout
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* Entry test: Add Terminal input purpose
|
|
||||||
* readme: Add note about Cargo dependencies
|
|
||||||
* Create a library/UI module separation
|
|
||||||
* hacking: Add DCO and licensing requirement
|
|
||||||
* Fix internal .md link
|
|
||||||
|
|
||||||
[ Mark Müller ]
|
|
||||||
* squeekboard-test-layout: add argument parsing and some more output
|
|
||||||
|
|
||||||
[ Dorota Czaplejewicz ]
|
|
||||||
* Use clap in the lockfile
|
|
||||||
* parsing: Remove bounds which weren't used anyway
|
|
||||||
* layout: Respect margins
|
|
||||||
* CI: Build arm64 .deb
|
|
||||||
|
|
||||||
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Mon, 23 Dec 2019 11:58:57 +0000
|
|
||||||
|
|
||||||
squeekboard (1.4.0) amber-phone; urgency=medium
|
squeekboard (1.4.0) amber-phone; urgency=medium
|
||||||
|
|
||||||
* "text" property in layouts
|
* "text" property in layouts
|
||||||
|
|||||||
10
debian/check_release.py
vendored
10
debian/check_release.py
vendored
@ -1,10 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
"""Checks tag before release.
|
|
||||||
Feed it the first changelog line, and then all available tags.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import re, sys
|
|
||||||
tag = "v" + re.findall("\\((.*)\\)", input())[0]
|
|
||||||
if tag not in map(str.strip, sys.stdin.readlines()):
|
|
||||||
raise Exception("Changelog's current version doesn't have a tag. Push the tag!")
|
|
||||||
22
debian/control
vendored
22
debian/control
vendored
@ -9,9 +9,8 @@ Build-Depends:
|
|||||||
ninja-build,
|
ninja-build,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
libglib2.0-dev,
|
libglib2.0-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,9 +24,11 @@ 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,
|
|
||||||
rustc,
|
rustc,
|
||||||
wayland-protocols (>= 1.14),
|
wayland-protocols (>= 1.14),
|
||||||
|
# for running the tests
|
||||||
|
xvfb,
|
||||||
|
xauth,
|
||||||
Standards-Version: 4.1.3
|
Standards-Version: 4.1.3
|
||||||
Homepage: https://source.puri.sm/Librem5/squeekboard
|
Homepage: https://source.puri.sm/Librem5/squeekboard
|
||||||
|
|
||||||
@ -36,22 +37,17 @@ Architecture: linux-any
|
|||||||
Depends:
|
Depends:
|
||||||
# for the Adwaita-dark theme
|
# for the Adwaita-dark theme
|
||||||
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.
|
||||||
|
|
||||||
Package: squeekboard-devel
|
Package: squeekboard-devel
|
||||||
Architecture: linux-any
|
Architecture: linux-any
|
||||||
Depends:
|
Depends:
|
||||||
python3,
|
${shlibs:Depends}
|
||||||
python3-gi,
|
${misc:Depends}
|
||||||
${shlibs:Depends},
|
|
||||||
${misc:Depends},
|
|
||||||
Description: Resources for making Squeekboard layouts
|
Description: Resources for making Squeekboard layouts
|
||||||
Tools for creating and testing Squeekboard layouts:
|
Tools for creating Squeekboard layouts:
|
||||||
.
|
.
|
||||||
* squeekboard-entry
|
|
||||||
* squeekboard-test-layout
|
* squeekboard-test-layout
|
||||||
|
|||||||
13
debian/rules
vendored
13
debian/rules
vendored
@ -3,20 +3,13 @@
|
|||||||
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
|
||||||
|
|
||||||
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:
|
||||||
|
|||||||
1
debian/squeekboard-devel.install
vendored
1
debian/squeekboard-devel.install
vendored
@ -1,2 +1 @@
|
|||||||
usr/bin/squeekboard-test-layout /usr/bin
|
usr/bin/squeekboard-test-layout /usr/bin
|
||||||
usr/bin/squeekboard-entry /usr/bin
|
|
||||||
|
|||||||
22
doc/build.sh
22
doc/build.sh
@ -1,22 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Builds the documentation and places in the selected directory,
|
|
||||||
# or the working directory.
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
SCRIPT_PATH="$(realpath "$0")"
|
|
||||||
DOCS_DIR="$(dirname "$SCRIPT_PATH")"
|
|
||||||
|
|
||||||
TARGET_DIR="${1:-./}"
|
|
||||||
|
|
||||||
SPHINX=sphinx-build
|
|
||||||
|
|
||||||
if [ ! -d $DOCS_DIR/_static ]; then
|
|
||||||
mkdir -p $DOCS_DIR/_static
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! which sphinx-build ; then
|
|
||||||
SPHINX=sphinx-build-3
|
|
||||||
fi
|
|
||||||
$SPHINX -b html "${DOCS_DIR}" "${TARGET_DIR}"
|
|
||||||
165
doc/conf.py
165
doc/conf.py
@ -1,165 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# Configuration file for the Sphinx documentation builder.
|
|
||||||
#
|
|
||||||
# This file does only contain a selection of the most common options. For a
|
|
||||||
# full list see the documentation:
|
|
||||||
# http://www.sphinx-doc.org/en/master/config
|
|
||||||
|
|
||||||
# -- Path setup --------------------------------------------------------------
|
|
||||||
|
|
||||||
# If extensions (or modules to document with autodoc) are in another directory,
|
|
||||||
# add these directories to sys.path here. If the directory is relative to the
|
|
||||||
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
|
||||||
#
|
|
||||||
# import os
|
|
||||||
# import sys
|
|
||||||
# sys.path.insert(0, os.path.abspath('.'))
|
|
||||||
|
|
||||||
|
|
||||||
# -- Project information -----------------------------------------------------
|
|
||||||
|
|
||||||
project = 'squeekboard'
|
|
||||||
copyright = 'Squeekboard contributors'
|
|
||||||
author = 'Dorota Czaplejewicz'
|
|
||||||
|
|
||||||
# The short X.Y version
|
|
||||||
version = ''
|
|
||||||
# The full version, including alpha/beta/rc tags
|
|
||||||
release = ''
|
|
||||||
|
|
||||||
|
|
||||||
# -- General configuration ---------------------------------------------------
|
|
||||||
|
|
||||||
# If your documentation needs a minimal Sphinx version, state it here.
|
|
||||||
#
|
|
||||||
# needs_sphinx = '1.0'
|
|
||||||
|
|
||||||
# Add any Sphinx extension module names here, as strings. They can be
|
|
||||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
|
||||||
# ones.
|
|
||||||
extensions = [
|
|
||||||
'recommonmark'
|
|
||||||
]
|
|
||||||
|
|
||||||
# Add any paths that contain templates here, relative to this directory.
|
|
||||||
templates_path = ['_templates']
|
|
||||||
|
|
||||||
# The suffix(es) of source filenames.
|
|
||||||
# You can specify multiple suffix as a list of string:
|
|
||||||
#
|
|
||||||
# source_suffix = ['.rst', '.md']
|
|
||||||
source_suffix = '.md'
|
|
||||||
|
|
||||||
# The master toctree document.
|
|
||||||
master_doc = 'index'
|
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
|
||||||
# for a list of supported languages.
|
|
||||||
#
|
|
||||||
# This is also used if you do content translation via gettext catalogs.
|
|
||||||
# Usually you set "language" from the command line for these cases.
|
|
||||||
language = None
|
|
||||||
|
|
||||||
# List of patterns, relative to source directory, that match files and
|
|
||||||
# directories to ignore when looking for source files.
|
|
||||||
# This pattern also affects html_static_path and html_extra_path .
|
|
||||||
exclude_patterns = []
|
|
||||||
|
|
||||||
# The name of the Pygments (syntax highlighting) style to use.
|
|
||||||
pygments_style = 'sphinx'
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTML output -------------------------------------------------
|
|
||||||
|
|
||||||
# The theme to use for HTML and HTML Help pages. See the documentation for
|
|
||||||
# a list of builtin themes.
|
|
||||||
#
|
|
||||||
html_theme = 'alabaster'
|
|
||||||
|
|
||||||
# Theme options are theme-specific and customize the look and feel of a theme
|
|
||||||
# further. For a list of options available for each theme, see the
|
|
||||||
# documentation.
|
|
||||||
#
|
|
||||||
# html_theme_options = {}
|
|
||||||
|
|
||||||
# Add any paths that contain custom static files (such as style sheets) here,
|
|
||||||
# relative to this directory. They are copied after the builtin static files,
|
|
||||||
# so a file named "default.css" will overwrite the builtin "default.css".
|
|
||||||
html_static_path = ['_static']
|
|
||||||
|
|
||||||
# Custom sidebar templates, must be a dictionary that maps document names
|
|
||||||
# to template names.
|
|
||||||
#
|
|
||||||
# The default sidebars (for documents that don't match any pattern) are
|
|
||||||
# defined by theme itself. Builtin themes are using these templates by
|
|
||||||
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
|
|
||||||
# 'searchbox.html']``.
|
|
||||||
#
|
|
||||||
# html_sidebars = {}
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTMLHelp output ---------------------------------------------
|
|
||||||
|
|
||||||
# Output file base name for HTML help builder.
|
|
||||||
htmlhelp_basename = 'squeekboarddoc'
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for LaTeX output ------------------------------------------------
|
|
||||||
|
|
||||||
latex_elements = {
|
|
||||||
# The paper size ('letterpaper' or 'a4paper').
|
|
||||||
#
|
|
||||||
# 'papersize': 'letterpaper',
|
|
||||||
|
|
||||||
# The font size ('10pt', '11pt' or '12pt').
|
|
||||||
#
|
|
||||||
# 'pointsize': '10pt',
|
|
||||||
|
|
||||||
# Additional stuff for the LaTeX preamble.
|
|
||||||
#
|
|
||||||
# 'preamble': '',
|
|
||||||
|
|
||||||
# Latex figure (float) alignment
|
|
||||||
#
|
|
||||||
# 'figure_align': 'htbp',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Grouping the document tree into LaTeX files. List of tuples
|
|
||||||
# (source start file, target name, title,
|
|
||||||
# author, documentclass [howto, manual, or own class]).
|
|
||||||
latex_documents = [
|
|
||||||
(master_doc, 'squeekboard.tex', 'squeekboard Documentation',
|
|
||||||
'Dorota Czaplejewicz', 'manual'),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for manual page output ------------------------------------------
|
|
||||||
|
|
||||||
# One entry per manual page. List of tuples
|
|
||||||
# (source start file, name, description, authors, manual section).
|
|
||||||
man_pages = [
|
|
||||||
(master_doc, 'squeekboard', 'squeekboard Documentation',
|
|
||||||
[author], 1)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for Texinfo output ----------------------------------------------
|
|
||||||
|
|
||||||
# Grouping the document tree into Texinfo files. List of tuples
|
|
||||||
# (source start file, target name, title, author,
|
|
||||||
# dir menu entry, description, category)
|
|
||||||
texinfo_documents = [
|
|
||||||
(master_doc, 'squeekboard', 'squeekboard Documentation',
|
|
||||||
author, 'squeekboard', 'One line description of project.',
|
|
||||||
'Miscellaneous'),
|
|
||||||
]
|
|
||||||
|
|
||||||
from recommonmark.transform import AutoStructify
|
|
||||||
|
|
||||||
def setup(app):
|
|
||||||
app.add_config_value('recommonmark_config', {
|
|
||||||
'enable_auto_toc_tree': True,
|
|
||||||
'auto_toc_tree_section': 'Contents',
|
|
||||||
}, True)
|
|
||||||
app.add_transform(AutoStructify)
|
|
||||||
185
doc/hacking.md
185
doc/hacking.md
@ -1,185 +0,0 @@
|
|||||||
Hacking
|
|
||||||
=======
|
|
||||||
|
|
||||||
This document describes the standards for modifying and maintaining the *squeekboard* project.
|
|
||||||
|
|
||||||
Principles
|
|
||||||
----------
|
|
||||||
|
|
||||||
The project was built upon some guiding principles, which should be respected primarily by the maintainers, but also by contributors to avoid needlessly rejected changes.
|
|
||||||
|
|
||||||
The overarching principle of *squeekboard* is to empower users.
|
|
||||||
|
|
||||||
Software is primarily meant to solve problems of its users. Often in the quest to make software better, a hard distinction is made between the developer, who becomes the creator, and the user, who takes the role of the consumer, without direct influence on the software they use.
|
|
||||||
This project aims to give users the power to make the software work for them by blurring the lines between users and developers.
|
|
||||||
|
|
||||||
Notwithstanding its current state, *squeekboard* must be structured in a way that provides users a gradual way to gain more experience and power to adjust it. It must be easy, in order of importance:
|
|
||||||
|
|
||||||
- to use the software,
|
|
||||||
- to modify its resources,
|
|
||||||
- to change its behavior,
|
|
||||||
- to contribute upstream.
|
|
||||||
|
|
||||||
To give an idea of what it means in practice, those are some examples of what has been important for *squeekboard* so far:
|
|
||||||
|
|
||||||
- being quick and usable,
|
|
||||||
- allowing local overrides of resources and config,
|
|
||||||
- storing resources and config as editable, standard files,
|
|
||||||
- having complete, up to date documentation of interfaces,
|
|
||||||
- having an easy process of sending contributions,
|
|
||||||
- adapting to to user's settings and constrains without overriding them,
|
|
||||||
- avoiding compiling whenever possible,
|
|
||||||
- making it easy to build,
|
|
||||||
- having code that is [simple and obvious](https://www.python.org/dev/peps/pep-0020/),
|
|
||||||
- having an easy process of testing and accepting contributions.
|
|
||||||
|
|
||||||
You may notice that they are ordered roughly from "user-focused" to "maintainer-focused". While good properties are desired, sometimes they conflict, and maintainers should give additional weight to those benefiting the user compared to those benefiting regular contributors.
|
|
||||||
|
|
||||||
Sending patches
|
|
||||||
---------------
|
|
||||||
|
|
||||||
By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
|
|
||||||
|
|
||||||
Development environment
|
|
||||||
-----------------------
|
|
||||||
|
|
||||||
*Squeekboard* is regularly built and tested on [the development environment](https://developer.puri.sm/Librem5/Development_Environment.html).
|
|
||||||
|
|
||||||
Recent Fedora releases are likely to be tested as well.
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
On a Debian based system run
|
|
||||||
|
|
||||||
```sh
|
|
||||||
sudo apt-get -y install build-essential
|
|
||||||
sudo apt-get -y build-dep .
|
|
||||||
```
|
|
||||||
|
|
||||||
For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
|
|
||||||
|
|
||||||
Testing
|
|
||||||
-------
|
|
||||||
|
|
||||||
Most common testing is done in CI. Occasionally, and for each release, do perform manual tests to make sure that
|
|
||||||
|
|
||||||
- the application draws correctly
|
|
||||||
- it shows when relevant
|
|
||||||
- it changes layouts
|
|
||||||
- it changes views
|
|
||||||
|
|
||||||
Testing with an application:
|
|
||||||
|
|
||||||
```
|
|
||||||
python3 tools/entry.py
|
|
||||||
```
|
|
||||||
|
|
||||||
Testing visibility:
|
|
||||||
|
|
||||||
```
|
|
||||||
$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
|
|
||||||
$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
|
|
||||||
```
|
|
||||||
|
|
||||||
Testing layouts:
|
|
||||||
|
|
||||||
Layouts can be selected using the GNOME Settings application.
|
|
||||||
|
|
||||||
```
|
|
||||||
# define all available layouts. First one is currently selected.
|
|
||||||
$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
|
|
||||||
```
|
|
||||||
|
|
||||||
Coding
|
|
||||||
------
|
|
||||||
|
|
||||||
### Project structure
|
|
||||||
|
|
||||||
Rust modules should be split into 2 categories: libraries, and user interface. They differ in the way they do error handling.
|
|
||||||
|
|
||||||
Libraries should:
|
|
||||||
|
|
||||||
- not panic due to external surprises, only due to internal inconsistencies
|
|
||||||
- pass errors and surprises they can't handle to the callers instead
|
|
||||||
- not silence errors and surprises
|
|
||||||
|
|
||||||
User interface modules should:
|
|
||||||
|
|
||||||
- try to provide safe values whenever they encounter an error
|
|
||||||
- do the logging
|
|
||||||
- give libraries the ability to report errors and surprises (e.g. via giving them loggers)
|
|
||||||
|
|
||||||
### Style
|
|
||||||
|
|
||||||
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))
|
|
||||||
|
|
||||||
Bad example:
|
|
||||||
|
|
||||||
```
|
|
||||||
if (foo)
|
|
||||||
bar();
|
|
||||||
```
|
|
||||||
|
|
||||||
Good example:
|
|
||||||
|
|
||||||
```
|
|
||||||
if (foo) {
|
|
||||||
bar();
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
- mixing tabs and spaces in the same block of code (or config)
|
|
||||||
|
|
||||||
Strongly encouraged:
|
|
||||||
|
|
||||||
- don't make lines too long. If it's longer than ~80 characters, it's probably unreadable already, and the code needs to be clarified;
|
|
||||||
- put operators in the beginning of a continuation line
|
|
||||||
|
|
||||||
Bad example:
|
|
||||||
|
|
||||||
```
|
|
||||||
foobar = verylongexpression +
|
|
||||||
anotherverylongexpression +
|
|
||||||
yetanotherexpression;
|
|
||||||
```
|
|
||||||
|
|
||||||
Good example:
|
|
||||||
|
|
||||||
```
|
|
||||||
foobar = verylongexpression
|
|
||||||
+ anotherverylongexpression
|
|
||||||
+ yetanotherexpression;
|
|
||||||
```
|
|
||||||
|
|
||||||
- use `///` for documentation comments in front of definitions and `/*! ... */` for documentation comments in the beginning of modules (see [Rust doc-comments](https://doc.rust-lang.org/reference/comments.html#doc-comments))
|
|
||||||
|
|
||||||
If in doubt, check [PEP8](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md), the [kernel coding style](https://www.kernel.org/doc/html/v4.10/process/coding-style.html), or the [Rust style guide](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md).
|
|
||||||
|
|
||||||
Maintenance
|
|
||||||
-----------
|
|
||||||
|
|
||||||
Squeekboard uses Rust & Cargo for some of its dependencies.
|
|
||||||
|
|
||||||
Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positional arguments: source directory, and output artifact. So, `cargo test` becomes:
|
|
||||||
|
|
||||||
```
|
|
||||||
cd build_dir
|
|
||||||
sh /source_path/cargo.sh test
|
|
||||||
```
|
|
||||||
|
|
||||||
### Cargo dependencies
|
|
||||||
|
|
||||||
All Cargo dependencies must be selected in the version available in PureOS, and added to the file `debian/control`. Please check with https://software.pureos.net/search_pkg?term=librust .
|
|
||||||
|
|
||||||
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:
|
|
||||||
|
|
||||||
```
|
|
||||||
cd build_dir
|
|
||||||
ninja build src/Cargo.toml
|
|
||||||
sh /source_path/cargo.sh update
|
|
||||||
ninja test
|
|
||||||
```
|
|
||||||
27
doc/index.md
27
doc/index.md
@ -1,27 +0,0 @@
|
|||||||
Welcome to squeekboard's documentation!
|
|
||||||
=======================================
|
|
||||||
|
|
||||||
Contents
|
|
||||||
--------
|
|
||||||
|
|
||||||
* [Tutorial](tutorial.md)
|
|
||||||
* [Contributing](hacking.md)
|
|
||||||
|
|
||||||
Introduction
|
|
||||||
------------
|
|
||||||
|
|
||||||
Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
|
|
||||||
|
|
||||||
Layouts
|
|
||||||
-------
|
|
||||||
|
|
||||||
Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
|
|
||||||
|
|
||||||
Layouts are created using a text-based format, based on YAML.
|
|
||||||
|
|
||||||
TODO: Provide a description of the format.
|
|
||||||
|
|
||||||
Contributions
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
A 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.
|
|
||||||
|
|
||||||
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/)
|
|
||||||
|
|
||||||
## Creating a new layout
|
|
||||||
|
|
||||||
Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
|
|
||||||
|
|
||||||
### Get one of the existing keyboard layouts
|
|
||||||
|
|
||||||
* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
|
|
||||||
* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
|
|
||||||
* Take a look and try to understand them :slight_smile:
|
|
||||||
|
|
||||||
|
|
||||||
### Creating the keyboard layout
|
|
||||||
|
|
||||||
* To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
|
|
||||||
* The correct name of the .yaml file can be found with the command
|
|
||||||
|
|
||||||
```
|
|
||||||
gsettings get org.gnome.desktop.input-sources sources
|
|
||||||
```
|
|
||||||
|
|
||||||
The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
|
|
||||||
So for example “de.yaml” would be the correct name for the German keyboard layout.
|
|
||||||
|
|
||||||
If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
|
|
||||||
|
|
||||||
### Testing the layout
|
|
||||||
|
|
||||||
Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically.
|
|
||||||
|
|
||||||
You can also use the `test_layout` tool from the -devel package to check it for errors:
|
|
||||||
|
|
||||||
```
|
|
||||||
# squeekboard_test_layout ./mylayout.yaml
|
|
||||||
Test result: OK
|
|
||||||
```
|
|
||||||
|
|
||||||
## Contributing your changes
|
|
||||||
|
|
||||||
If you want to share your layout with the world, the best way is to submit it to the Squeekboard project. The workflow is similar to any other Gitlab-based project.
|
|
||||||
|
|
||||||
Above all, your layout should be working, be tested, not break anything, and make sense.
|
|
||||||
|
|
||||||
### Fork your own copy of squeekboard
|
|
||||||
|
|
||||||
* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
|
|
||||||
* Clone your fork locally with `git clone` and use the uri of your forked repo there
|
|
||||||
|
|
||||||
### 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)
|
|
||||||
* Create a branch: Name it “keyboard-layout-mylanguage” or whatever
|
|
||||||
* Checkout your branch, edit your keyboard layout and commit your changes
|
|
||||||
* Your layout **must** be correctly named, and in `data/keyboards/`.
|
|
||||||
* Your layout **must** pass the `test_layout` tool with zero problems.
|
|
||||||
* Your translation **must** be correctly named, and in `data/langs/`.
|
|
||||||
* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
|
|
||||||
|
|
||||||
### Get it merged
|
|
||||||
|
|
||||||
It's always recommended to **compile and run** squeekboard before submitting your changes. This serves as a test that all is working. See instructions in the [compiling section](#compiling-and-running-squeekboard).
|
|
||||||
|
|
||||||
* Push the local changes (to the branch of your fork of squeekboard)
|
|
||||||
* Create a merge request for the branch to get your changes merged to the official squeekboard git repository
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
## Compiling and running Squeekboard
|
|
||||||
|
|
||||||
If you want your change to become part of official Squeekboard, or if you want to add a translation of your layout name, you will have to recompile Squeekboard and test your changes there.
|
|
||||||
|
|
||||||
### Compile squeekboard
|
|
||||||
|
|
||||||
* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
|
|
||||||
|
|
||||||
### Run squeekboard
|
|
||||||
|
|
||||||
* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
|
|
||||||
* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
|
|
||||||
* You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
|
|
||||||
* To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
|
|
||||||
`deb [arch=amd64] http://ci.puri.sm/ scratch librem5`
|
|
||||||
|
|
||||||
Squeekboard can be installed from there as a Debian package, too (that’s what I often do). But beware - there be dragons! You could bork your system with these packages and you should probably disable this repository again after installing what you need - these packages are not meant for production systems (or so I heard :wink: )
|
|
||||||
@ -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>
|
||||||
|
|
||||||
@ -35,28 +39,32 @@
|
|||||||
|
|
||||||
#include "eekboard/eekboard-context-service.h"
|
#include "eekboard/eekboard-context-service.h"
|
||||||
#include "src/layout.h"
|
#include "src/layout.h"
|
||||||
#include "src/submission.h"
|
|
||||||
|
|
||||||
#define LIBFEEDBACK_USE_UNSTABLE_API
|
enum {
|
||||||
#include <libfeedback.h>
|
PROP_0,
|
||||||
|
PROP_LAST
|
||||||
|
};
|
||||||
|
|
||||||
#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"
|
/* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
|
||||||
|
GdkWindow as the argument */
|
||||||
|
#ifndef GDK_DRAWABLE
|
||||||
|
#define GDK_DRAWABLE(x) (x)
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct _EekGtkKeyboardPrivate
|
typedef struct _EekGtkKeyboardPrivate
|
||||||
{
|
{
|
||||||
EekRenderer *renderer; // owned, nullable
|
EekRenderer *renderer;
|
||||||
EekboardContextService *eekboard_context; // unowned reference
|
LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)
|
||||||
struct submission *submission; // unowned reference
|
|
||||||
|
|
||||||
struct squeek_layout_state *layout; // unowned
|
|
||||||
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)
|
||||||
|
|
||||||
|
static void render_pressed_button (GtkWidget *widget, struct button_place *place);
|
||||||
|
static void render_released_button (GtkWidget *widget,
|
||||||
|
const struct squeek_button *button);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eek_gtk_keyboard_real_realize (GtkWidget *self)
|
eek_gtk_keyboard_real_realize (GtkWidget *self)
|
||||||
{
|
{
|
||||||
@ -77,91 +85,51 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
|
|||||||
cairo_t *cr)
|
cairo_t *cr)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv =
|
EekGtkKeyboardPrivate *priv =
|
||||||
eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
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);
|
||||||
|
|
||||||
if (!priv->keyboard) {
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!priv->renderer) {
|
if (!priv->renderer) {
|
||||||
PangoContext *pcontext = gtk_widget_get_pango_context (self);
|
PangoContext *pcontext = gtk_widget_get_pango_context (self);
|
||||||
|
|
||||||
priv->renderer = eek_renderer_new (
|
priv->renderer = eek_renderer_new (priv->keyboard, pcontext);
|
||||||
priv->keyboard,
|
|
||||||
pcontext);
|
|
||||||
|
|
||||||
eek_renderer_set_allocation_size (priv->renderer,
|
eek_renderer_set_allocation_size (priv->renderer,
|
||||||
priv->keyboard->layout,
|
|
||||||
allocation.width,
|
allocation.width,
|
||||||
allocation.height);
|
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->submission, cr, priv->keyboard);
|
// render the keyboard without any key activity (TODO: from a cached buffer)
|
||||||
|
eek_renderer_render_keyboard (priv->renderer, cr);
|
||||||
|
// render only a few remaining changes
|
||||||
|
squeek_layout_draw_all_changed(priv->keyboard->layout, EEK_GTK_KEYBOARD(self));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Units of virtual pixels size
|
|
||||||
static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
|
|
||||||
(void)height;
|
|
||||||
if (width < 540) {
|
|
||||||
return ARRANGEMENT_KIND_BASE;
|
|
||||||
}
|
|
||||||
return ARRANGEMENT_KIND_WIDE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eek_gtk_keyboard_real_size_allocate (GtkWidget *self,
|
eek_gtk_keyboard_real_size_allocate (GtkWidget *self,
|
||||||
GtkAllocation *allocation)
|
GtkAllocation *allocation)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv =
|
EekGtkKeyboardPrivate *priv =
|
||||||
eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
||||||
// check if the change would switch types
|
|
||||||
enum squeek_arrangement_kind new_type = get_type(
|
|
||||||
(uint32_t)(allocation->width - allocation->x),
|
|
||||||
(uint32_t)(allocation->height - allocation->y));
|
|
||||||
if (priv->layout->arrangement != new_type) {
|
|
||||||
priv->layout->arrangement = new_type;
|
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
|
||||||
eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (priv->renderer) {
|
if (priv->renderer)
|
||||||
eek_renderer_set_allocation_size (priv->renderer,
|
eek_renderer_set_allocation_size (priv->renderer,
|
||||||
priv->keyboard->layout,
|
|
||||||
allocation->width,
|
allocation->width,
|
||||||
allocation->height);
|
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)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
if (!priv->keyboard) {
|
|
||||||
return;
|
squeek_layout_depress(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
|
||||||
}
|
|
||||||
squeek_layout_depress(priv->keyboard->layout,
|
|
||||||
priv->submission,
|
|
||||||
x, y, eek_renderer_get_transformation(priv->renderer), time, self);
|
x, y, eek_renderer_get_transformation(priv->renderer), time, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -169,25 +137,15 @@ static void drag(EekGtkKeyboard *self,
|
|||||||
gdouble x, gdouble y, guint32 time)
|
gdouble x, gdouble y, guint32 time)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
if (!priv->keyboard) {
|
squeek_layout_drag(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
|
||||||
return;
|
x, y, eek_renderer_get_transformation(priv->renderer), time, self);
|
||||||
}
|
|
||||||
squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
|
|
||||||
priv->submission,
|
|
||||||
x, y, eek_renderer_get_transformation(priv->renderer), time,
|
|
||||||
priv->eekboard_context, self);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void release(EekGtkKeyboard *self, guint32 time)
|
static void release(EekGtkKeyboard *self, guint32 time)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
if (!priv->keyboard) {
|
|
||||||
return;
|
squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard, eek_renderer_get_transformation(priv->renderer), time, self);
|
||||||
}
|
|
||||||
squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
|
|
||||||
priv->submission,
|
|
||||||
eek_renderer_get_transformation(priv->renderer), time,
|
|
||||||
priv->eekboard_context, self);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
@ -200,6 +158,8 @@ eek_gtk_keyboard_real_button_press_event (GtkWidget *self,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// TODO: this belongs more in gtk_keyboard, with a way to find out which key to re-render
|
// TODO: this belongs more in gtk_keyboard, with a way to find out which key to re-render
|
||||||
static gboolean
|
static gboolean
|
||||||
eek_gtk_keyboard_real_button_release_event (GtkWidget *self,
|
eek_gtk_keyboard_real_button_release_event (GtkWidget *self,
|
||||||
@ -271,12 +231,11 @@ static void
|
|||||||
eek_gtk_keyboard_real_unmap (GtkWidget *self)
|
eek_gtk_keyboard_real_unmap (GtkWidget *self)
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv =
|
EekGtkKeyboardPrivate *priv =
|
||||||
eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
||||||
|
|
||||||
if (priv->keyboard) {
|
if (priv->keyboard) {
|
||||||
squeek_layout_release_all_only(
|
squeek_layout_release_all_only(
|
||||||
priv->keyboard->layout,
|
priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
|
||||||
priv->submission,
|
|
||||||
gdk_event_get_time(NULL));
|
gdk_event_get_time(NULL));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -289,7 +248,6 @@ eek_gtk_keyboard_set_property (GObject *object,
|
|||||||
const GValue *value,
|
const GValue *value,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
(void)value;
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
@ -304,24 +262,18 @@ eek_gtk_keyboard_dispose (GObject *object)
|
|||||||
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
|
|
||||||
if (priv->renderer) {
|
if (priv->renderer) {
|
||||||
eek_renderer_free(priv->renderer);
|
g_object_unref (priv->renderer);
|
||||||
priv->renderer = NULL;
|
priv->renderer = NULL;
|
||||||
priv->renderer = NULL;
|
priv->renderer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->keyboard) {
|
if (priv->keyboard) {
|
||||||
squeek_layout_release_all_only(
|
squeek_layout_release_all_only(
|
||||||
priv->keyboard->layout,
|
priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
|
||||||
priv->submission,
|
|
||||||
gdk_event_get_time(NULL));
|
gdk_event_get_time(NULL));
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -352,82 +304,128 @@ 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));
|
|
||||||
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
|
|
||||||
on_notify_keyboard (GObject *object,
|
|
||||||
GParamSpec *spec,
|
|
||||||
EekGtkKeyboard *self) {
|
|
||||||
(void)spec;
|
|
||||||
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
|
|
||||||
priv->keyboard = eekboard_context_service_get_keyboard(EEKBOARD_CONTEXT_SERVICE(object));
|
|
||||||
if (priv->renderer) {
|
|
||||||
eek_renderer_free(priv->renderer);
|
|
||||||
}
|
|
||||||
priv->renderer = NULL;
|
|
||||||
gtk_widget_queue_draw(GTK_WIDGET(self));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* eek_gtk_keyboard_new:
|
||||||
|
* @keyboard: an #EekKeyboard
|
||||||
|
*
|
||||||
* Create a new #GtkWidget displaying @keyboard.
|
* Create a new #GtkWidget displaying @keyboard.
|
||||||
* Returns: a #GtkWidget
|
* Returns: a #GtkWidget
|
||||||
*/
|
*/
|
||||||
GtkWidget *
|
GtkWidget *
|
||||||
eek_gtk_keyboard_new (EekboardContextService *eekservice,
|
eek_gtk_keyboard_new (LevelKeyboard *keyboard)
|
||||||
struct submission *submission,
|
|
||||||
struct squeek_layout_state *layout)
|
|
||||||
{
|
{
|
||||||
EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
|
EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
|
||||||
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
|
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
|
||||||
priv->eekboard_context = eekservice;
|
priv->keyboard = keyboard;
|
||||||
priv->submission = submission;
|
|
||||||
priv->layout = layout;
|
|
||||||
priv->renderer = NULL;
|
|
||||||
g_signal_connect (eekservice,
|
|
||||||
"notify::keyboard",
|
|
||||||
G_CALLBACK(on_notify_keyboard),
|
|
||||||
ret);
|
|
||||||
on_notify_keyboard(G_OBJECT(eekservice), NULL, ret);
|
|
||||||
/* TODO: this is how a compound keyboard
|
|
||||||
* made out of a layout and a suggestion bar could start.
|
|
||||||
* GtkBox *box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
|
|
||||||
GtkEntry *fill = GTK_ENTRY(gtk_entry_new());
|
|
||||||
gtk_box_pack_start(box, GTK_WIDGET(fill), FALSE, FALSE, 0);
|
|
||||||
gtk_box_pack_start(box, GTK_WIDGET(ret), TRUE, TRUE, 0);
|
|
||||||
return GTK_WIDGET(box);*/
|
|
||||||
return GTK_WIDGET(ret);
|
return GTK_WIDGET(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
static void
|
||||||
* eek_gtk_keyboard_emit_feedback:
|
render_pressed_button (GtkWidget *widget,
|
||||||
*
|
struct button_place *place)
|
||||||
* Emit button press haptic feedback via libfeedack.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
|
|
||||||
{
|
{
|
||||||
EekGtkKeyboardPrivate *priv;
|
EekGtkKeyboard *self = EEK_GTK_KEYBOARD (widget);
|
||||||
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
|
|
||||||
g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
|
GdkWindow *window = gtk_widget_get_window (widget);
|
||||||
|
cairo_region_t *region = gdk_window_get_clip_region (window);
|
||||||
|
GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
|
||||||
|
cairo_t *cr = gdk_drawing_context_get_cairo_context (context);
|
||||||
|
|
||||||
priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
|
eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
|
||||||
if (priv->event) {
|
/*
|
||||||
lfb_event_trigger_feedback_async (priv->event,
|
eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
|
||||||
NULL,
|
*/
|
||||||
(GAsyncReadyCallback)on_event_triggered,
|
gdk_window_end_draw_frame (window, context);
|
||||||
NULL);
|
|
||||||
}
|
cairo_region_destroy (region);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_gtk_render_locked_button (EekGtkKeyboard *self, struct button_place place)
|
||||||
|
{
|
||||||
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
|
|
||||||
|
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET(self));
|
||||||
|
cairo_region_t *region = gdk_window_get_clip_region (window);
|
||||||
|
GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
|
||||||
|
cairo_t *cr = gdk_drawing_context_get_cairo_context (context);
|
||||||
|
|
||||||
|
eek_renderer_render_button (priv->renderer, cr, &place, 1.0, TRUE);
|
||||||
|
|
||||||
|
gdk_window_end_draw_frame (window, context);
|
||||||
|
|
||||||
|
cairo_region_destroy (region);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: does it really redraw the entire keyboard?
|
||||||
|
static void
|
||||||
|
render_released_button (GtkWidget *widget,
|
||||||
|
const struct squeek_button *button)
|
||||||
|
{
|
||||||
|
(void)button;
|
||||||
|
EekGtkKeyboard *self = EEK_GTK_KEYBOARD (widget);
|
||||||
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
|
|
||||||
|
GdkWindow *window = gtk_widget_get_window (widget);
|
||||||
|
cairo_region_t *region = gdk_window_get_clip_region (window);
|
||||||
|
GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
|
||||||
|
cairo_t *cr = gdk_drawing_context_get_cairo_context (context);
|
||||||
|
|
||||||
|
eek_renderer_render_keyboard (priv->renderer, cr);
|
||||||
|
|
||||||
|
gdk_window_end_draw_frame (window, context);
|
||||||
|
|
||||||
|
cairo_region_destroy (region);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_gtk_on_button_pressed (struct button_place place,
|
||||||
|
EekGtkKeyboard *self)
|
||||||
|
{
|
||||||
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
|
|
||||||
|
/* renderer may have not been set yet if the widget is a popup */
|
||||||
|
if (!priv->renderer)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!place.row) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
render_pressed_button (GTK_WIDGET(self), &place);
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET(self));
|
||||||
|
|
||||||
|
#if HAVE_LIBCANBERRA
|
||||||
|
ca_gtk_play_for_widget (widget, 0,
|
||||||
|
CA_PROP_EVENT_ID, "button-pressed",
|
||||||
|
CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
|
||||||
|
CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
|
||||||
|
NULL);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_gtk_on_button_released (const struct squeek_button *button,
|
||||||
|
struct squeek_view *view,
|
||||||
|
EekGtkKeyboard *self)
|
||||||
|
{
|
||||||
|
(void)view;
|
||||||
|
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
|
||||||
|
|
||||||
|
/* renderer may have not been set yet if the widget is a popup */
|
||||||
|
if (!priv->renderer)
|
||||||
|
return;
|
||||||
|
|
||||||
|
render_released_button (GTK_WIDGET(self), button);
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET(self));
|
||||||
|
|
||||||
|
#if HAVE_LIBCANBERRA
|
||||||
|
ca_gtk_play_for_widget (widget, 0,
|
||||||
|
CA_PROP_EVENT_ID, "button-released",
|
||||||
|
CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
|
||||||
|
CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
|
||||||
|
NULL);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,10 +28,7 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#include "eek/eek-types.h"
|
typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
|
||||||
|
|
||||||
struct submission;
|
|
||||||
struct squeek_layout_state;
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
#define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
|
#define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
|
||||||
@ -47,8 +44,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 (LevelKeyboard *keyboard);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
#endif /* EEK_GTK_KEYBOARD_H */
|
#endif /* EEK_GTK_KEYBOARD_H */
|
||||||
|
|||||||
@ -18,85 +18,49 @@
|
|||||||
* 02110-1301 USA
|
* 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SECTION:eek-keyboard
|
||||||
|
* @short_description: Base class of a keyboard
|
||||||
|
* @see_also: #EekSection
|
||||||
|
*
|
||||||
|
* The #EekKeyboardClass class represents a keyboard, which consists
|
||||||
|
* of one or more sections of the #EekSectionClass class.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include <glib/gprintf.h>
|
||||||
|
|
||||||
#define _XOPEN_SOURCE 500
|
#include "eek-enumtypes.h"
|
||||||
#include <errno.h>
|
#include "eekboard/eekboard-context-service.h"
|
||||||
#include <fcntl.h>
|
#include "eekboard/key-emitter.h"
|
||||||
#include <string.h>
|
#include "keymap.h"
|
||||||
#include <sys/mman.h>
|
#include "src/keyboard.h"
|
||||||
#include <sys/random.h> // TODO: this is Linux-specific
|
|
||||||
#include <xkbcommon/xkbcommon.h>
|
|
||||||
|
|
||||||
|
|
||||||
#include "eek-keyboard.h"
|
#include "eek-keyboard.h"
|
||||||
|
|
||||||
/// External linkage for Rust.
|
void level_keyboard_deinit(LevelKeyboard *self) {
|
||||||
/// The corresponding deinit is implemented in vkeyboard::KeyMap::drop
|
xkb_keymap_unref(self->keymap);
|
||||||
struct keymap squeek_key_map_from_str(const char *keymap_str) {
|
close(self->keymap_fd);
|
||||||
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
squeek_layout_free(self->layout);
|
||||||
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) {
|
||||||
squeek_layout_free(self->layout);
|
level_keyboard_deinit(self);
|
||||||
g_free(self);
|
g_free(self);
|
||||||
}
|
}
|
||||||
|
|
||||||
LevelKeyboard*
|
void level_keyboard_init(LevelKeyboard *self, struct squeek_layout *layout) {
|
||||||
level_keyboard_new (struct squeek_layout *layout)
|
self->layout = layout;
|
||||||
{
|
}
|
||||||
|
|
||||||
|
LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout) {
|
||||||
LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
|
LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
|
||||||
if (!keyboard) {
|
level_keyboard_init(keyboard, layout);
|
||||||
g_error("Failed to create a keyboard");
|
keyboard->manager = manager;
|
||||||
}
|
|
||||||
keyboard->layout = layout;
|
|
||||||
return keyboard;
|
return keyboard;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard)
|
||||||
|
{
|
||||||
|
return squeek_layout_get_current_view(keyboard->layout);
|
||||||
|
}
|
||||||
|
|||||||
@ -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
|
||||||
@ -28,27 +28,30 @@
|
|||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
#include "eek-types.h"
|
#include "eek-types.h"
|
||||||
|
#include "eek-layout.h"
|
||||||
#include "src/layout.h"
|
#include "src/layout.h"
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
|
EekboardContextService *manager; // unowned reference
|
||||||
};
|
};
|
||||||
typedef struct _LevelKeyboard LevelKeyboard;
|
typedef struct _LevelKeyboard LevelKeyboard;
|
||||||
|
|
||||||
gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
|
gchar * eek_keyboard_get_keymap
|
||||||
|
(LevelKeyboard *keyboard);
|
||||||
|
|
||||||
LevelKeyboard*
|
struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard);
|
||||||
level_keyboard_new (struct squeek_layout *layout);
|
LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout);
|
||||||
|
void level_keyboard_deinit(LevelKeyboard *self);
|
||||||
void level_keyboard_free(LevelKeyboard *self);
|
void level_keyboard_free(LevelKeyboard *self);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|||||||
47
eek/eek-layout.c
Normal file
47
eek/eek-layout.c
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2010-2011 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
* 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SECTION:eek-layout
|
||||||
|
* @short_description: Base class of a layout engine
|
||||||
|
*
|
||||||
|
* The #EekLayout class is a base class of layout engine which
|
||||||
|
* arranges keyboard elements.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include "eek-layout.h"
|
||||||
|
#include "eek-keyboard.h"
|
||||||
|
#include "eekboard/eekboard-context-service.h"
|
||||||
|
#include "eek-xml-layout.h"
|
||||||
|
|
||||||
|
G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT)
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_layout_class_init (EekLayoutClass *klass)
|
||||||
|
{
|
||||||
|
klass->create_keyboard = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_layout_init (EekLayout *self)
|
||||||
|
{
|
||||||
|
}
|
||||||
60
eek/eek-layout.h
Normal file
60
eek/eek-layout.h
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2010-2011 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
* 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
|
||||||
|
#error "Only <eek/eek.h> can be included directly."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef EEK_LAYOUT_H
|
||||||
|
#define EEK_LAYOUT_H 1
|
||||||
|
|
||||||
|
#include <glib-object.h>
|
||||||
|
#include "eek-types.h"
|
||||||
|
#include "src/layout.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
#define EEK_TYPE_LAYOUT (eek_layout_get_type())
|
||||||
|
G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekLayoutClass:
|
||||||
|
* @create_keyboard: virtual function for creating a keyboard
|
||||||
|
*/
|
||||||
|
struct _EekLayoutClass
|
||||||
|
{
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< public >*/
|
||||||
|
LevelKeyboard* (* create_keyboard) (EekboardContextService *manager,
|
||||||
|
EekLayout *self,
|
||||||
|
gdouble initial_width,
|
||||||
|
gdouble initial_height);
|
||||||
|
|
||||||
|
/*< private >*/
|
||||||
|
/* padding */
|
||||||
|
gpointer pdummy[24];
|
||||||
|
};
|
||||||
|
|
||||||
|
GType eek_layout_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
#endif /* EEK_LAYOUT_H */
|
||||||
@ -28,15 +28,144 @@
|
|||||||
#include "eek-renderer.h"
|
#include "eek-renderer.h"
|
||||||
#include "src/style.h"
|
#include "src/style.h"
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PROP_0,
|
||||||
|
PROP_PCONTEXT,
|
||||||
|
PROP_LAST
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct _EekRendererPrivate
|
||||||
|
{
|
||||||
|
LevelKeyboard *keyboard; // unowned
|
||||||
|
PangoContext *pcontext; // owned
|
||||||
|
GtkCssProvider *css_provider; // owned
|
||||||
|
GtkStyleContext *view_context; // owned
|
||||||
|
GtkStyleContext *button_context; // TODO: maybe move a copy to each button
|
||||||
|
|
||||||
|
gdouble border_width;
|
||||||
|
|
||||||
|
gdouble allocation_width;
|
||||||
|
gdouble allocation_height;
|
||||||
|
gdouble scale;
|
||||||
|
gint scale_factor; /* the outputs scale factor */
|
||||||
|
gint origin_x;
|
||||||
|
gint origin_y;
|
||||||
|
|
||||||
|
PangoFontDescription *font; // owned reference
|
||||||
|
cairo_surface_t *keyboard_surface;
|
||||||
|
|
||||||
|
} EekRendererPrivate;
|
||||||
|
|
||||||
|
G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
|
||||||
|
|
||||||
/* eek-keyboard-drawing.c */
|
/* eek-keyboard-drawing.c */
|
||||||
static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
|
static void eek_renderer_render_button_label (EekRenderer *self, cairo_t *cr, GtkStyleContext *ctx,
|
||||||
const gchar *label, EekBounds bounds);
|
const struct squeek_button *button);
|
||||||
|
|
||||||
void eek_render_button (EekRenderer *self,
|
static void invalidate (EekRenderer *renderer);
|
||||||
cairo_t *cr, const struct squeek_button *button,
|
static void render_button (EekRenderer *self,
|
||||||
|
cairo_t *cr, EekBounds view_bounds, struct button_place *place,
|
||||||
gboolean pressed, gboolean locked);
|
gboolean pressed, gboolean locked);
|
||||||
|
|
||||||
|
struct _CreateKeyboardSurfaceCallbackData {
|
||||||
|
cairo_t *cr;
|
||||||
|
EekRenderer *renderer;
|
||||||
|
struct squeek_view *view;
|
||||||
|
struct squeek_row *row;
|
||||||
|
};
|
||||||
|
typedef struct _CreateKeyboardSurfaceCallbackData CreateKeyboardSurfaceCallbackData;
|
||||||
|
|
||||||
|
static void
|
||||||
|
create_keyboard_surface_button_callback (struct squeek_button *button,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
CreateKeyboardSurfaceCallbackData *data = user_data;
|
||||||
|
EekBounds bounds = squeek_button_get_bounds(button);
|
||||||
|
|
||||||
|
cairo_save (data->cr);
|
||||||
|
|
||||||
|
cairo_translate (data->cr, bounds.x, bounds.y);
|
||||||
|
cairo_rectangle (data->cr,
|
||||||
|
0.0,
|
||||||
|
0.0,
|
||||||
|
bounds.width + 100,
|
||||||
|
bounds.height + 100);
|
||||||
|
cairo_clip (data->cr);
|
||||||
|
struct button_place place = {
|
||||||
|
.row = data->row,
|
||||||
|
.button = button,
|
||||||
|
};
|
||||||
|
render_button (data->renderer, data->cr, squeek_view_get_bounds(data->view), &place, FALSE, FALSE);
|
||||||
|
|
||||||
|
cairo_restore (data->cr);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
create_keyboard_surface_row_callback (struct squeek_row *row,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
CreateKeyboardSurfaceCallbackData *data = user_data;
|
||||||
|
|
||||||
|
EekBounds bounds = squeek_row_get_bounds(row);
|
||||||
|
|
||||||
|
cairo_save (data->cr);
|
||||||
|
cairo_translate (data->cr, bounds.x, bounds.y);
|
||||||
|
|
||||||
|
gint angle = squeek_row_get_angle (row);
|
||||||
|
cairo_rotate (data->cr, angle * G_PI / 180);
|
||||||
|
|
||||||
|
data->row = row;
|
||||||
|
squeek_row_foreach(row, create_keyboard_surface_button_callback, data);
|
||||||
|
|
||||||
|
cairo_restore (data->cr);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
render_keyboard_surface (EekRenderer *renderer, struct squeek_view *view)
|
||||||
|
{
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
|
||||||
|
GdkRGBA color = {0};
|
||||||
|
gtk_style_context_get_color (priv->view_context, GTK_STATE_FLAG_NORMAL, &color);
|
||||||
|
|
||||||
|
EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
|
||||||
|
|
||||||
|
CreateKeyboardSurfaceCallbackData data = {
|
||||||
|
.cr = cairo_create (priv->keyboard_surface),
|
||||||
|
.renderer = renderer,
|
||||||
|
.view = view,
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Paint the background covering the entire widget area */
|
||||||
|
gtk_render_background (priv->view_context,
|
||||||
|
data.cr,
|
||||||
|
0, 0,
|
||||||
|
priv->allocation_width, priv->allocation_height);
|
||||||
|
gtk_render_frame (priv->view_context,
|
||||||
|
data.cr,
|
||||||
|
0, 0,
|
||||||
|
priv->allocation_width, priv->allocation_height);
|
||||||
|
|
||||||
|
cairo_save (data.cr);
|
||||||
|
cairo_scale (data.cr, priv->scale, priv->scale);
|
||||||
|
cairo_translate (data.cr, bounds.x, bounds.y);
|
||||||
|
|
||||||
|
cairo_set_source_rgba (data.cr,
|
||||||
|
color.red,
|
||||||
|
color.green,
|
||||||
|
color.blue,
|
||||||
|
color.alpha);
|
||||||
|
|
||||||
|
/* draw rows */
|
||||||
|
squeek_view_foreach(level_keyboard_current(priv->keyboard),
|
||||||
|
create_keyboard_surface_row_callback,
|
||||||
|
&data);
|
||||||
|
|
||||||
|
cairo_restore (data.cr);
|
||||||
|
|
||||||
|
cairo_destroy (data.cr);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
render_outline (cairo_t *cr,
|
render_outline (cairo_t *cr,
|
||||||
GtkStyleContext *ctx,
|
GtkStyleContext *ctx,
|
||||||
@ -60,20 +189,47 @@ render_outline (cairo_t *cr,
|
|||||||
position.x, position.y, position.width, position.height);
|
position.x, position.y, position.width, position.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void render_button_in_context(gint scale_factor,
|
static void render_button_in_context(EekRenderer *self,
|
||||||
|
gdouble scale,
|
||||||
|
gint scale_factor,
|
||||||
cairo_t *cr,
|
cairo_t *cr,
|
||||||
GtkStyleContext *ctx,
|
GtkStyleContext *ctx,
|
||||||
const struct squeek_button *button) {
|
EekBounds view_bounds,
|
||||||
/* blank background */
|
struct button_place *place,
|
||||||
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
|
gboolean active) {
|
||||||
cairo_paint (cr);
|
cairo_surface_t *outline_surface = NULL;
|
||||||
|
|
||||||
EekBounds bounds = squeek_button_get_bounds(button);
|
/* render outline */
|
||||||
render_outline (cr, ctx, bounds);
|
EekBounds bounds = squeek_button_get_bounds(place->button);
|
||||||
|
|
||||||
|
{
|
||||||
|
cairo_t *cr;
|
||||||
|
|
||||||
|
// Outline will be drawn on the outside of the button, so the
|
||||||
|
// surface needs to be bigger than the button
|
||||||
|
outline_surface =
|
||||||
|
cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
|
||||||
|
(int)ceil(bounds.width) + 10,
|
||||||
|
(int)ceil(bounds.height) + 10);
|
||||||
|
cr = cairo_create (outline_surface);
|
||||||
|
|
||||||
|
/* blank background */
|
||||||
|
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
|
||||||
|
cairo_paint (cr);
|
||||||
|
|
||||||
|
cairo_save (cr);
|
||||||
|
eek_renderer_apply_transformation_for_button (cr, view_bounds, place, 1.0, FALSE);
|
||||||
|
render_outline (cr, ctx, bounds);
|
||||||
|
cairo_restore (cr);
|
||||||
|
|
||||||
|
cairo_destroy (cr);
|
||||||
|
}
|
||||||
|
cairo_set_source_surface (cr, outline_surface, 0.0, 0.0);
|
||||||
|
cairo_surface_destroy(outline_surface);
|
||||||
cairo_paint (cr);
|
cairo_paint (cr);
|
||||||
|
|
||||||
/* render icon (if any) */
|
/* render icon (if any) */
|
||||||
const char *icon_name = squeek_button_get_icon_name(button);
|
const char *icon_name = squeek_button_get_icon_name(place->button);
|
||||||
|
|
||||||
if (icon_name) {
|
if (icon_name) {
|
||||||
cairo_surface_t *icon_surface =
|
cairo_surface_t *icon_surface =
|
||||||
@ -103,26 +259,25 @@ static void render_button_in_context(gint scale_factor,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
eek_renderer_render_button_label (self, cr, ctx, place->button);
|
||||||
const gchar *label = squeek_button_get_label(button);
|
|
||||||
if (label) {
|
|
||||||
render_button_label (cr, ctx, label, squeek_button_get_bounds(button));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
eek_render_button (EekRenderer *self,
|
render_button (EekRenderer *self,
|
||||||
cairo_t *cr,
|
cairo_t *cr,
|
||||||
const struct squeek_button *button,
|
EekBounds view_bounds,
|
||||||
|
struct button_place *place,
|
||||||
gboolean pressed,
|
gboolean pressed,
|
||||||
gboolean locked)
|
gboolean locked)
|
||||||
{
|
{
|
||||||
GtkStyleContext *ctx = self->button_context;
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
|
|
||||||
|
GtkStyleContext *ctx = priv->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);
|
const char *name = squeek_button_get_name(place->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. */
|
||||||
@ -131,13 +286,13 @@ eek_render_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);
|
||||||
const char *outline_name = squeek_button_get_outline_name(button);
|
const char *outline_name = squeek_button_get_outline_name(place->button);
|
||||||
if (locked) {
|
if (locked) {
|
||||||
gtk_style_context_add_class(ctx, "locked");
|
gtk_style_context_add_class(ctx, "locked");
|
||||||
}
|
}
|
||||||
gtk_style_context_add_class(ctx, outline_name);
|
gtk_style_context_add_class(ctx, outline_name);
|
||||||
|
|
||||||
render_button_in_context(self->scale_factor, cr, ctx, button);
|
render_button_in_context(self, priv->scale, priv->scale_factor, cr, ctx, view_bounds, place, pressed);
|
||||||
|
|
||||||
// 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);
|
||||||
@ -147,17 +302,85 @@ eek_render_button (EekRenderer *self,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
/**
|
||||||
render_button_label (cairo_t *cr,
|
* eek_renderer_apply_transformation_for_key:
|
||||||
GtkStyleContext *ctx,
|
* @self: The renderer used to render the key
|
||||||
const gchar *label,
|
* @cr: The Cairo rendering context used for rendering
|
||||||
EekBounds bounds)
|
* @key: The key to be transformed
|
||||||
|
* @scale: The factor used to scale the key bounds before rendering
|
||||||
|
* @rotate: Whether to rotate the key by the angle defined for the key's
|
||||||
|
* in its section definition
|
||||||
|
*
|
||||||
|
* Applies a transformation, consisting of scaling and rotation, to the
|
||||||
|
* current rendering context using the bounds for the given key. The scale
|
||||||
|
* factor is separate to the normal scale factor for the keyboard as a whole
|
||||||
|
* and is applied cumulatively. It is typically used to render larger than
|
||||||
|
* normal keys for popups.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
eek_renderer_apply_transformation_for_button (cairo_t *cr,
|
||||||
|
EekBounds view_bounds,
|
||||||
|
struct button_place *place,
|
||||||
|
gdouble scale,
|
||||||
|
gboolean rotate)
|
||||||
{
|
{
|
||||||
|
EekBounds bounds, rotated_bounds;
|
||||||
|
gdouble s;
|
||||||
|
|
||||||
|
eek_renderer_get_button_bounds (view_bounds, place, &bounds, FALSE);
|
||||||
|
eek_renderer_get_button_bounds (view_bounds, place, &rotated_bounds, TRUE);
|
||||||
|
|
||||||
|
gint angle = squeek_row_get_angle (place->row);
|
||||||
|
|
||||||
|
cairo_scale (cr, scale, scale);
|
||||||
|
if (rotate) {
|
||||||
|
s = sin (angle * G_PI / 180);
|
||||||
|
if (s < 0)
|
||||||
|
cairo_translate (cr, 0, - bounds.width * s);
|
||||||
|
else
|
||||||
|
cairo_translate (cr, bounds.height * s, 0);
|
||||||
|
cairo_rotate (cr, angle * G_PI / 180);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_renderer_render_button_label (EekRenderer *self,
|
||||||
|
cairo_t *cr,
|
||||||
|
GtkStyleContext *ctx,
|
||||||
|
const struct squeek_button *button)
|
||||||
|
{
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
|
|
||||||
|
const gchar *label = squeek_button_get_label(button);
|
||||||
|
|
||||||
|
if (!label) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
PangoFontDescription *font;
|
PangoFontDescription *font;
|
||||||
gtk_style_context_get(ctx,
|
gdouble scale;
|
||||||
gtk_style_context_get_state(ctx),
|
|
||||||
"font", &font,
|
|
||||||
NULL);
|
if (!priv->font) {
|
||||||
|
const PangoFontDescription *base_font;
|
||||||
|
gdouble size;
|
||||||
|
|
||||||
|
base_font = pango_context_get_font_description (priv->pcontext);
|
||||||
|
// FIXME: Base font size on the same size unit used for button sizing,
|
||||||
|
// and make the default about 1/3 of the current row height
|
||||||
|
size = 30000.0;
|
||||||
|
priv->font = pango_font_description_copy (base_font);
|
||||||
|
pango_font_description_set_size (priv->font, (gint)round(size * 0.6));
|
||||||
|
}
|
||||||
|
|
||||||
|
EekBounds bounds = squeek_button_get_bounds(button);
|
||||||
|
scale = MIN((bounds.width - priv->border_width) / bounds.width,
|
||||||
|
(bounds.height - priv->border_width) / bounds.height);
|
||||||
|
|
||||||
|
font = pango_font_description_copy (priv->font);
|
||||||
|
pango_font_description_set_size (font,
|
||||||
|
(gint)round(pango_font_description_get_size (font) * scale));
|
||||||
|
|
||||||
PangoLayout *layout = pango_cairo_create_layout (cr);
|
PangoLayout *layout = pango_cairo_create_layout (cr);
|
||||||
pango_layout_set_font_description (layout, font);
|
pango_layout_set_font_description (layout, font);
|
||||||
pango_font_description_free (font);
|
pango_font_description_free (font);
|
||||||
@ -167,7 +390,8 @@ render_button_label (cairo_t *cr,
|
|||||||
if (line->resolved_dir == PANGO_DIRECTION_RTL) {
|
if (line->resolved_dir == PANGO_DIRECTION_RTL) {
|
||||||
pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
|
pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
|
||||||
}
|
}
|
||||||
pango_layout_set_width (layout, PANGO_SCALE * bounds.width);
|
pango_layout_set_width (layout,
|
||||||
|
PANGO_SCALE * bounds.width * scale);
|
||||||
|
|
||||||
PangoRectangle extents = { 0, };
|
PangoRectangle extents = { 0, };
|
||||||
pango_layout_get_extents (layout, NULL, &extents);
|
pango_layout_get_extents (layout, NULL, &extents);
|
||||||
@ -191,46 +415,170 @@ render_button_label (cairo_t *cr,
|
|||||||
g_object_unref (layout);
|
g_object_unref (layout);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: Pass just the active modifiers instead of entire submission
|
/*
|
||||||
void
|
* eek_renderer_real_render_key:
|
||||||
eek_renderer_render_keyboard (EekRenderer *self,
|
* @self: The renderer used to render the key
|
||||||
struct submission *submission,
|
* @cr: The Cairo rendering context used for rendering
|
||||||
cairo_t *cr,
|
* @key: The key to be transformed
|
||||||
LevelKeyboard *keyboard)
|
* @scale: The factor used to scale the key bounds before rendering
|
||||||
|
* @rotate: Whether to rotate the key by the angle defined for the key's
|
||||||
|
* in its section definition
|
||||||
|
*
|
||||||
|
* Renders a key separately from the normal keyboard rendering.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
eek_renderer_real_render_button (EekRenderer *self,
|
||||||
|
cairo_t *cr,
|
||||||
|
struct button_place *place,
|
||||||
|
gdouble scale,
|
||||||
|
gboolean rotate)
|
||||||
{
|
{
|
||||||
g_return_if_fail (self->allocation_width > 0.0);
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
g_return_if_fail (self->allocation_height > 0.0);
|
EekBounds bounds;
|
||||||
|
|
||||||
/* Paint the background covering the entire widget area */
|
EekBounds view_bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
|
||||||
gtk_render_background (self->view_context,
|
eek_renderer_get_button_bounds (view_bounds, place, &bounds, rotate);
|
||||||
cr,
|
|
||||||
0, 0,
|
|
||||||
self->allocation_width, self->allocation_height);
|
|
||||||
|
|
||||||
cairo_save(cr);
|
cairo_save (cr);
|
||||||
cairo_translate (cr, self->widget_to_layout.origin_x, self->widget_to_layout.origin_y);
|
/* Because this function is called separately from the keyboard rendering
|
||||||
cairo_scale (cr, self->widget_to_layout.scale, self->widget_to_layout.scale);
|
function, the transformation for the context needs to be set up */
|
||||||
|
cairo_translate (cr, priv->origin_x, priv->origin_y);
|
||||||
|
cairo_scale (cr, priv->scale, priv->scale);
|
||||||
|
cairo_translate (cr, bounds.x, bounds.y);
|
||||||
|
|
||||||
squeek_draw_layout_base_view(keyboard->layout, self, cr);
|
eek_renderer_apply_transformation_for_button (cr, view_bounds, place, scale, rotate);
|
||||||
squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
|
struct squeek_key *key = squeek_button_get_key(place->button);
|
||||||
|
render_button (
|
||||||
|
self, cr, view_bounds, place,
|
||||||
|
squeek_key_is_pressed(key) != 0,
|
||||||
|
squeek_key_is_locked (key) != 0
|
||||||
|
);
|
||||||
cairo_restore (cr);
|
cairo_restore (cr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
eek_renderer_free (EekRenderer *self)
|
eek_renderer_real_render_keyboard (EekRenderer *self,
|
||||||
|
cairo_t *cr)
|
||||||
{
|
{
|
||||||
if (self->pcontext) {
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
g_object_unref (self->pcontext);
|
cairo_pattern_t *source;
|
||||||
self->pcontext = NULL;
|
|
||||||
}
|
|
||||||
g_object_unref(self->css_provider);
|
|
||||||
g_object_unref(self->view_context);
|
|
||||||
g_object_unref(self->button_context);
|
|
||||||
// this is where renderer-specific surfaces would be released
|
|
||||||
|
|
||||||
free(self);
|
g_return_if_fail (priv->keyboard);
|
||||||
|
g_return_if_fail (priv->allocation_width > 0.0);
|
||||||
|
g_return_if_fail (priv->allocation_height > 0.0);
|
||||||
|
|
||||||
|
cairo_save (cr);
|
||||||
|
|
||||||
|
cairo_translate (cr, priv->origin_x, priv->origin_y);
|
||||||
|
|
||||||
|
if (priv->keyboard_surface)
|
||||||
|
cairo_surface_destroy (priv->keyboard_surface);
|
||||||
|
|
||||||
|
priv->keyboard_surface = cairo_surface_create_for_rectangle (
|
||||||
|
cairo_get_target (cr), 0, 0,
|
||||||
|
priv->allocation_width, priv->allocation_height);
|
||||||
|
|
||||||
|
render_keyboard_surface (self, squeek_layout_get_current_view(priv->keyboard->layout));
|
||||||
|
|
||||||
|
cairo_set_source_surface (cr, priv->keyboard_surface, 0.0, 0.0);
|
||||||
|
source = cairo_get_source (cr);
|
||||||
|
cairo_pattern_set_extend (source, CAIRO_EXTEND_PAD);
|
||||||
|
cairo_paint (cr);
|
||||||
|
|
||||||
|
cairo_restore (cr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_renderer_set_property (GObject *object,
|
||||||
|
guint prop_id,
|
||||||
|
const GValue *value,
|
||||||
|
GParamSpec *pspec)
|
||||||
|
{
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (
|
||||||
|
EEK_RENDERER(object));
|
||||||
|
|
||||||
|
switch (prop_id) {
|
||||||
|
case PROP_PCONTEXT:
|
||||||
|
priv->pcontext = g_value_get_object (value);
|
||||||
|
g_object_ref (priv->pcontext);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_renderer_get_property (GObject *object,
|
||||||
|
guint prop_id,
|
||||||
|
GValue *value,
|
||||||
|
GParamSpec *pspec)
|
||||||
|
{
|
||||||
|
switch (prop_id) {
|
||||||
|
default:
|
||||||
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_renderer_dispose (GObject *object)
|
||||||
|
{
|
||||||
|
EekRenderer *self = EEK_RENDERER (object);
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
|
|
||||||
|
if (priv->keyboard) {
|
||||||
|
priv->keyboard = NULL;
|
||||||
|
}
|
||||||
|
if (priv->pcontext) {
|
||||||
|
g_object_unref (priv->pcontext);
|
||||||
|
priv->pcontext = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* this will release all allocated surfaces and font if any */
|
||||||
|
invalidate (EEK_RENDERER(object));
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_renderer_finalize (GObject *object)
|
||||||
|
{
|
||||||
|
EekRenderer *self = EEK_RENDERER(object);
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
|
|
||||||
|
g_object_unref(priv->css_provider);
|
||||||
|
g_object_unref(priv->view_context);
|
||||||
|
g_object_unref(priv->button_context);
|
||||||
|
pango_font_description_free (priv->font);
|
||||||
|
G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eek_renderer_class_init (EekRendererClass *klass)
|
||||||
|
{
|
||||||
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||||
|
GParamSpec *pspec;
|
||||||
|
|
||||||
|
klass->render_button = eek_renderer_real_render_button;
|
||||||
|
klass->render_keyboard = eek_renderer_real_render_keyboard;
|
||||||
|
|
||||||
|
gobject_class->set_property = eek_renderer_set_property;
|
||||||
|
gobject_class->get_property = eek_renderer_get_property;
|
||||||
|
gobject_class->dispose = eek_renderer_dispose;
|
||||||
|
gobject_class->finalize = eek_renderer_finalize;
|
||||||
|
|
||||||
|
pspec = g_param_spec_object ("pango-context",
|
||||||
|
"Pango Context",
|
||||||
|
"Pango Context",
|
||||||
|
PANGO_TYPE_CONTEXT,
|
||||||
|
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
|
||||||
|
g_object_class_install_property (gobject_class,
|
||||||
|
PROP_PCONTEXT,
|
||||||
|
pspec);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static GType new_type(char *name) {
|
static GType new_type(char *name) {
|
||||||
GTypeInfo info = {0};
|
GTypeInfo info = {0};
|
||||||
info.class_size = sizeof(GtkWidgetClass);
|
info.class_size = sizeof(GtkWidgetClass);
|
||||||
@ -241,7 +589,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 +597,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");
|
||||||
@ -258,79 +606,197 @@ static GType button_type(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
renderer_init (EekRenderer *self)
|
eek_renderer_init (EekRenderer *self)
|
||||||
{
|
{
|
||||||
self->pcontext = NULL;
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
|
||||||
self->allocation_width = 0.0;
|
|
||||||
self->allocation_height = 0.0;
|
|
||||||
self->scale_factor = 1;
|
|
||||||
|
|
||||||
self->css_provider = squeek_load_style();
|
priv->keyboard = NULL;
|
||||||
|
priv->pcontext = NULL;
|
||||||
|
priv->border_width = 1.0;
|
||||||
|
priv->allocation_width = 0.0;
|
||||||
|
priv->allocation_height = 0.0;
|
||||||
|
priv->scale = 1.0;
|
||||||
|
priv->scale_factor = 1;
|
||||||
|
priv->font = NULL;
|
||||||
|
priv->keyboard_surface = NULL;
|
||||||
|
|
||||||
|
GtkIconTheme *theme = gtk_icon_theme_get_default ();
|
||||||
|
|
||||||
|
gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
|
||||||
|
|
||||||
|
priv->css_provider = squeek_load_style();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
invalidate (EekRenderer *renderer)
|
||||||
|
{
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
|
||||||
|
if (priv->keyboard_surface) {
|
||||||
|
cairo_surface_destroy (priv->keyboard_surface);
|
||||||
|
priv->keyboard_surface = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EekRenderer *
|
EekRenderer *
|
||||||
eek_renderer_new (LevelKeyboard *keyboard,
|
eek_renderer_new (LevelKeyboard *keyboard,
|
||||||
PangoContext *pcontext)
|
PangoContext *pcontext)
|
||||||
{
|
{
|
||||||
EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
|
EekRenderer *renderer = g_object_new (EEK_TYPE_RENDERER,
|
||||||
renderer_init(renderer);
|
"pango-context", pcontext,
|
||||||
renderer->pcontext = pcontext;
|
NULL);
|
||||||
g_object_ref (renderer->pcontext);
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
priv->keyboard = keyboard;
|
||||||
|
|
||||||
/* Create a style context for the layout */
|
/* Create a style context for the layout */
|
||||||
GtkWidgetPath *path = gtk_widget_path_new();
|
GtkWidgetPath *path = gtk_widget_path_new();
|
||||||
gtk_widget_path_append_type(path, view_type());
|
gtk_widget_path_append_type(path, view_type());
|
||||||
|
|
||||||
renderer->view_context = gtk_style_context_new();
|
priv->view_context = gtk_style_context_new();
|
||||||
gtk_style_context_set_path(renderer->view_context, path);
|
gtk_style_context_set_path(priv->view_context, path);
|
||||||
gtk_widget_path_unref(path);
|
gtk_widget_path_unref(path);
|
||||||
if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
|
if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
|
||||||
gtk_style_context_add_class(renderer->view_context, "wide");
|
gtk_style_context_add_class(priv->view_context, "wide");
|
||||||
}
|
}
|
||||||
gtk_style_context_add_provider (renderer->view_context,
|
gtk_style_context_add_provider (priv->view_context,
|
||||||
GTK_STYLE_PROVIDER(renderer->css_provider),
|
GTK_STYLE_PROVIDER(priv->css_provider),
|
||||||
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
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();
|
||||||
gtk_widget_path_append_type(path, view_type());
|
gtk_widget_path_append_type(path, view_type());
|
||||||
if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
|
if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
|
||||||
gtk_widget_path_iter_add_class(path, -1, "wide");
|
gtk_widget_path_iter_add_class(path, -1, "wide");
|
||||||
}
|
}
|
||||||
gtk_widget_path_append_type(path, button_type());
|
gtk_widget_path_append_type(path, button_type());
|
||||||
renderer->button_context = gtk_style_context_new ();
|
priv->button_context = gtk_style_context_new ();
|
||||||
gtk_style_context_set_path(renderer->button_context, path);
|
gtk_style_context_set_path(priv->button_context, path);
|
||||||
gtk_widget_path_unref(path);
|
gtk_widget_path_unref(path);
|
||||||
gtk_style_context_set_parent(renderer->button_context, renderer->view_context);
|
gtk_style_context_set_parent(priv->button_context, priv->view_context);
|
||||||
gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
|
gtk_style_context_set_state (priv->button_context, GTK_STATE_FLAG_NORMAL);
|
||||||
gtk_style_context_add_provider (renderer->button_context,
|
gtk_style_context_add_provider (priv->button_context,
|
||||||
GTK_STYLE_PROVIDER(renderer->css_provider),
|
GTK_STYLE_PROVIDER(priv->css_provider),
|
||||||
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||||
return renderer;
|
return renderer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
eek_renderer_set_allocation_size (EekRenderer *renderer,
|
eek_renderer_set_allocation_size (EekRenderer *renderer,
|
||||||
struct squeek_layout *layout,
|
|
||||||
gdouble width,
|
gdouble width,
|
||||||
gdouble height)
|
gdouble height)
|
||||||
{
|
{
|
||||||
|
gdouble scale;
|
||||||
|
|
||||||
|
g_return_if_fail (EEK_IS_RENDERER(renderer));
|
||||||
g_return_if_fail (width > 0.0 && height > 0.0);
|
g_return_if_fail (width > 0.0 && height > 0.0);
|
||||||
|
|
||||||
renderer->allocation_width = width;
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
renderer->allocation_height = height;
|
|
||||||
|
|
||||||
renderer->widget_to_layout = squeek_layout_calculate_transformation(
|
priv->allocation_width = width;
|
||||||
layout,
|
priv->allocation_height = height;
|
||||||
renderer->allocation_width, renderer->allocation_height);
|
|
||||||
|
|
||||||
// This is where size-dependent surfaces would be released
|
/* Calculate a scale factor to use when rendering the keyboard into the
|
||||||
|
available space. */
|
||||||
|
EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
|
||||||
|
|
||||||
|
gdouble w = (bounds.x * 2) + bounds.width;
|
||||||
|
gdouble h = (bounds.y * 2) + bounds.height;
|
||||||
|
|
||||||
|
scale = MIN(width / w, height / h);
|
||||||
|
|
||||||
|
priv->scale = scale;
|
||||||
|
/* Set the rendering offset in widget coordinates to center the keyboard */
|
||||||
|
priv->origin_x = (gint)floor((width - (scale * w)) / 2);
|
||||||
|
priv->origin_y = (gint)floor((height - (scale * h)) / 2);
|
||||||
|
invalidate (renderer);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_renderer_get_size (EekRenderer *renderer,
|
||||||
|
gdouble *width,
|
||||||
|
gdouble *height)
|
||||||
|
{
|
||||||
|
g_return_if_fail (EEK_IS_RENDERER(renderer));
|
||||||
|
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
|
||||||
|
EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
|
||||||
|
if (width)
|
||||||
|
*width = bounds.width;
|
||||||
|
if (height)
|
||||||
|
*height = bounds.height;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_renderer_get_button_bounds (EekBounds view_bounds,
|
||||||
|
struct button_place *place,
|
||||||
|
EekBounds *bounds,
|
||||||
|
gboolean rotate)
|
||||||
|
{
|
||||||
|
gint angle = 0;
|
||||||
|
EekPoint points[4], min, max;
|
||||||
|
|
||||||
|
g_return_if_fail (place);
|
||||||
|
g_return_if_fail (bounds != NULL);
|
||||||
|
|
||||||
|
EekBounds button_bounds = squeek_button_get_bounds(place->button);
|
||||||
|
EekBounds row_bounds = squeek_row_get_bounds (place->row);
|
||||||
|
|
||||||
|
if (!rotate) {
|
||||||
|
button_bounds.x += view_bounds.x + row_bounds.x;
|
||||||
|
button_bounds.y += view_bounds.y + row_bounds.y;
|
||||||
|
*bounds = button_bounds;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
points[0].x = button_bounds.x;
|
||||||
|
points[0].y = button_bounds.y;
|
||||||
|
points[1].x = points[0].x + button_bounds.width;
|
||||||
|
points[1].y = points[0].y;
|
||||||
|
points[2].x = points[1].x;
|
||||||
|
points[2].y = points[1].y + button_bounds.height;
|
||||||
|
points[3].x = points[0].x;
|
||||||
|
points[3].y = points[2].y;
|
||||||
|
|
||||||
|
if (rotate) {
|
||||||
|
angle = squeek_row_get_angle (place->row);
|
||||||
|
}
|
||||||
|
|
||||||
|
min = points[2];
|
||||||
|
max = points[0];
|
||||||
|
for (unsigned i = 0; i < G_N_ELEMENTS(points); i++) {
|
||||||
|
eek_point_rotate (&points[i], angle);
|
||||||
|
if (points[i].x < min.x)
|
||||||
|
min.x = points[i].x;
|
||||||
|
if (points[i].x > max.x)
|
||||||
|
max.x = points[i].x;
|
||||||
|
if (points[i].y < min.y)
|
||||||
|
min.y = points[i].y;
|
||||||
|
if (points[i].y > max.y)
|
||||||
|
max.y = points[i].y;
|
||||||
|
}
|
||||||
|
bounds->x = view_bounds.x + row_bounds.x + min.x;
|
||||||
|
bounds->y = view_bounds.y + row_bounds.y + min.y;
|
||||||
|
bounds->width = (max.x - min.x);
|
||||||
|
bounds->height = (max.y - min.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
gdouble
|
||||||
|
eek_renderer_get_scale (EekRenderer *renderer)
|
||||||
|
{
|
||||||
|
g_return_val_if_fail (EEK_IS_RENDERER(renderer), 0);
|
||||||
|
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
|
||||||
|
return priv->scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
|
eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
|
||||||
{
|
{
|
||||||
renderer->scale_factor = scale;
|
g_return_if_fail (EEK_IS_RENDERER(renderer));
|
||||||
|
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
priv->scale_factor = scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
cairo_surface_t *
|
cairo_surface_t *
|
||||||
@ -357,7 +823,86 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
|
|||||||
return surface;
|
return surface;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_renderer_render_button (EekRenderer *renderer,
|
||||||
|
cairo_t *cr,
|
||||||
|
struct button_place *place,
|
||||||
|
gdouble scale,
|
||||||
|
gboolean rotate)
|
||||||
|
{
|
||||||
|
g_return_if_fail (EEK_IS_RENDERER(renderer));
|
||||||
|
g_return_if_fail (place);
|
||||||
|
g_return_if_fail (scale >= 0.0);
|
||||||
|
|
||||||
|
EEK_RENDERER_GET_CLASS(renderer)->
|
||||||
|
render_button (renderer, cr, place, scale, rotate);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eek_renderer_render_keyboard (EekRenderer *renderer,
|
||||||
|
cairo_t *cr)
|
||||||
|
{
|
||||||
|
g_return_if_fail (EEK_IS_RENDERER(renderer));
|
||||||
|
EEK_RENDERER_GET_CLASS(renderer)->render_keyboard (renderer, cr);
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
sign (EekPoint *p1, EekPoint *p2, EekPoint *p3)
|
||||||
|
{
|
||||||
|
// FIXME: what is this actually checking?
|
||||||
|
return (p1->x - p3->x) * (p2->y - p3->y) -
|
||||||
|
(p2->x - p3->x) * (p1->y - p3->y);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t
|
||||||
|
eek_are_bounds_inside (EekBounds bounds, EekPoint point, EekPoint origin, int32_t angle)
|
||||||
|
{
|
||||||
|
EekPoint points[4];
|
||||||
|
gboolean b1, b2, b3;
|
||||||
|
|
||||||
|
points[0].x = bounds.x;
|
||||||
|
points[0].y = bounds.y;
|
||||||
|
points[1].x = points[0].x + bounds.width;
|
||||||
|
points[1].y = points[0].y;
|
||||||
|
points[2].x = points[1].x;
|
||||||
|
points[2].y = points[1].y + bounds.height;
|
||||||
|
points[3].x = points[0].x;
|
||||||
|
points[3].y = points[2].y;
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < G_N_ELEMENTS(points); i++) {
|
||||||
|
eek_point_rotate (&points[i], angle);
|
||||||
|
points[i].x += origin.x;
|
||||||
|
points[i].y += origin.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
b1 = sign (&point, &points[0], &points[1]) < 0.0;
|
||||||
|
b2 = sign (&point, &points[1], &points[2]) < 0.0;
|
||||||
|
b3 = sign (&point, &points[2], &points[0]) < 0.0;
|
||||||
|
|
||||||
|
if (b1 == b2 && b2 == b3) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
b1 = sign (&point, &points[2], &points[3]) < 0.0;
|
||||||
|
b2 = sign (&point, &points[3], &points[0]) < 0.0;
|
||||||
|
b3 = sign (&point, &points[0], &points[2]) < 0.0;
|
||||||
|
|
||||||
|
if (b1 == b2 && b2 == b3) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
struct transformation
|
struct transformation
|
||||||
eek_renderer_get_transformation (EekRenderer *renderer) {
|
eek_renderer_get_transformation (EekRenderer *renderer) {
|
||||||
return renderer->widget_to_layout;
|
struct transformation failed = {0};
|
||||||
|
g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);
|
||||||
|
|
||||||
|
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
|
||||||
|
struct transformation ret = {
|
||||||
|
.origin_x = priv->origin_x,
|
||||||
|
.origin_y = priv->origin_y,
|
||||||
|
.scale = priv->scale,
|
||||||
|
};
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,49 +25,75 @@
|
|||||||
#include <pango/pangocairo.h>
|
#include <pango/pangocairo.h>
|
||||||
|
|
||||||
#include "eek-types.h"
|
#include "eek-types.h"
|
||||||
#include "src/submission.h"
|
#include "src/layout.h"
|
||||||
|
|
||||||
struct squeek_layout;
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
/// Renders LevelKayboards
|
#define EEK_TYPE_RENDERER (eek_renderer_get_type())
|
||||||
/// It cannot adjust styles at runtime.
|
G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
|
||||||
typedef struct EekRenderer
|
|
||||||
|
struct _EekRendererClass
|
||||||
{
|
{
|
||||||
PangoContext *pcontext; // owned
|
GObjectClass parent_class;
|
||||||
GtkCssProvider *css_provider; // owned
|
|
||||||
GtkStyleContext *view_context; // owned
|
|
||||||
GtkStyleContext *button_context; // TODO: maybe move a copy to each button
|
|
||||||
/// Style class for rendering the view and button CSS.
|
|
||||||
gchar *extra_style; // owned
|
|
||||||
|
|
||||||
// Mutable state
|
void (* render_button) (EekRenderer *self,
|
||||||
/// Background extents
|
cairo_t *cr,
|
||||||
gdouble allocation_width;
|
struct button_place *place,
|
||||||
gdouble allocation_height;
|
gdouble scale,
|
||||||
gint scale_factor; /* the outputs scale factor */
|
gboolean rotate);
|
||||||
/// Coords transformation
|
|
||||||
struct transformation widget_to_layout;
|
|
||||||
} EekRenderer;
|
|
||||||
|
|
||||||
|
void (* render_keyboard) (EekRenderer *self,
|
||||||
|
cairo_t *cr);
|
||||||
|
|
||||||
|
cairo_surface_t *(* get_icon_surface) (EekRenderer *self,
|
||||||
|
const gchar *icon_name,
|
||||||
|
gint size,
|
||||||
|
gint scale);
|
||||||
|
|
||||||
|
/*< private >*/
|
||||||
|
/* padding */
|
||||||
|
gpointer pdummy[23];
|
||||||
|
};
|
||||||
|
|
||||||
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
|
void eek_renderer_set_allocation_size
|
||||||
(EekRenderer *renderer, struct squeek_layout *layout,
|
(EekRenderer *renderer,
|
||||||
gdouble width,
|
gdouble width,
|
||||||
gdouble height);
|
gdouble height);
|
||||||
|
void eek_renderer_get_size (EekRenderer *renderer,
|
||||||
|
gdouble *width,
|
||||||
|
gdouble *height);
|
||||||
|
void eek_renderer_get_button_bounds (EekBounds view_bounds,
|
||||||
|
struct button_place *button,
|
||||||
|
EekBounds *bounds,
|
||||||
|
gboolean rotate);
|
||||||
|
|
||||||
|
gdouble eek_renderer_get_scale (EekRenderer *renderer);
|
||||||
void eek_renderer_set_scale_factor (EekRenderer *renderer,
|
void eek_renderer_set_scale_factor (EekRenderer *renderer,
|
||||||
gint scale);
|
gint scale);
|
||||||
|
|
||||||
|
void eek_renderer_render_button (EekRenderer *renderer,
|
||||||
|
cairo_t *cr,
|
||||||
|
struct button_place *place,
|
||||||
|
gdouble scale,
|
||||||
|
gboolean rotate);
|
||||||
|
|
||||||
cairo_surface_t *eek_renderer_get_icon_surface(const gchar *icon_name,
|
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 submission *submission,
|
void eek_renderer_render_keyboard (EekRenderer *renderer,
|
||||||
cairo_t *cr, LevelKeyboard *keyboard);
|
cairo_t *cr);
|
||||||
void
|
void eek_renderer_set_border_width (EekRenderer *renderer,
|
||||||
eek_renderer_free (EekRenderer *self);
|
gdouble border_width);
|
||||||
|
void eek_renderer_apply_transformation_for_button
|
||||||
|
(cairo_t *cr,
|
||||||
|
EekBounds view_bounds,
|
||||||
|
struct button_place *place,
|
||||||
|
gdouble scale,
|
||||||
|
gboolean rotate);
|
||||||
|
|
||||||
struct transformation
|
struct transformation
|
||||||
eek_renderer_get_transformation (EekRenderer *renderer);
|
eek_renderer_get_transformation (EekRenderer *renderer);
|
||||||
|
|||||||
@ -38,7 +38,6 @@ G_BEGIN_DECLS
|
|||||||
typedef struct _EekBounds EekBounds;
|
typedef struct _EekBounds EekBounds;
|
||||||
|
|
||||||
typedef struct _EekboardContextService EekboardContextService;
|
typedef struct _EekboardContextService EekboardContextService;
|
||||||
typedef struct _ServerContextService ServerContextService;
|
|
||||||
typedef struct _LevelKeyboard LevelKeyboard;
|
typedef struct _LevelKeyboard LevelKeyboard;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -89,14 +88,5 @@ struct transformation {
|
|||||||
gdouble origin_y;
|
gdouble origin_y;
|
||||||
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 */
|
||||||
|
|||||||
40
eek/eek-xml-layout.c
Normal file
40
eek/eek-xml-layout.c
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2011 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SECTION:eek-xml-layout
|
||||||
|
* @short_description: Layout engine which loads layout information from XML
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include "eek-keyboard.h"
|
||||||
|
#include "src/keyboard.h"
|
||||||
|
#include "src/layout.h"
|
||||||
|
|
||||||
|
#include "eek-xml-layout.h"
|
||||||
|
|
||||||
|
LevelKeyboard *
|
||||||
|
eek_xml_layout_real_create_keyboard (const char *keyboard_type,
|
||||||
|
EekboardContextService *manager,
|
||||||
|
enum squeek_arrangement_kind t)
|
||||||
|
{
|
||||||
|
struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
|
||||||
|
squeek_layout_place_contents(layout);
|
||||||
|
return level_keyboard_new(manager, layout);
|
||||||
|
}
|
||||||
36
eek/eek-xml-layout.h
Normal file
36
eek/eek-xml-layout.h
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2011 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
|
||||||
|
#error "Only <eek/eek.h> can be included directly."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef EEK_XML_LAYOUT_H
|
||||||
|
#define EEK_XML_LAYOUT_H 1
|
||||||
|
|
||||||
|
#include "eek-types.h"
|
||||||
|
#include "src/layout.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
LevelKeyboard *
|
||||||
|
eek_xml_layout_real_create_keyboard (const char *keyboard_type,
|
||||||
|
EekboardContextService *manager,
|
||||||
|
enum squeek_arrangement_kind t);
|
||||||
|
G_END_DECLS
|
||||||
|
#endif /* EEK_XML_LAYOUT_H */
|
||||||
@ -23,6 +23,7 @@
|
|||||||
#define __EEK_H_INSIDE__ 1
|
#define __EEK_H_INSIDE__ 1
|
||||||
|
|
||||||
#include "eek-keyboard.h"
|
#include "eek-keyboard.h"
|
||||||
|
#include "eek-layout.h"
|
||||||
|
|
||||||
void eek_init (void);
|
void eek_init (void);
|
||||||
|
|
||||||
|
|||||||
8
eek/keymap.h
Normal file
8
eek/keymap.h
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#include <gdk/gdk.h>
|
||||||
|
#include <xkbcommon/xkbcommon.h>
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
squeek_keymap_get_entries_for_keyval (struct xkb_keymap *xkb_keymap,
|
||||||
|
guint keyval,
|
||||||
|
GdkKeymapKey **keys,
|
||||||
|
guint *n_keys);
|
||||||
@ -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);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
8
eek/meson.build
Normal file
8
eek/meson.build
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
gnome = import('gnome')
|
||||||
|
|
||||||
|
enum_headers = [
|
||||||
|
'eek-types.h',
|
||||||
|
]
|
||||||
|
|
||||||
|
enums = gnome.mkenums_simple('eek-enumtypes', sources: enum_headers)
|
||||||
|
|
||||||
@ -16,15 +16,31 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SECTION:eekboard-context-service
|
||||||
|
* @short_description: base server implementation of eekboard input
|
||||||
|
* context service
|
||||||
|
*
|
||||||
|
* The #EekboardService class provides a base server side
|
||||||
|
* implementation of eekboard input context service.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <fcntl.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#define _XOPEN_SOURCE 500
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
#include <sys/random.h> // TODO: this is Linux-specific
|
||||||
|
#include <xkbcommon/xkbcommon.h>
|
||||||
|
|
||||||
#include <gio/gio.h>
|
#include <gio/gio.h>
|
||||||
|
|
||||||
|
#include "eekboard/key-emitter.h"
|
||||||
#include "wayland.h"
|
#include "wayland.h"
|
||||||
|
|
||||||
#include "eek/eek-keyboard.h"
|
#include "eek/eek-xml-layout.h"
|
||||||
#include "src/server-context-service.h"
|
#include "src/server-context-service.h"
|
||||||
|
|
||||||
#include "eekboard/eekboard-context-service.h"
|
#include "eekboard/eekboard-context-service.h"
|
||||||
@ -32,42 +48,102 @@
|
|||||||
enum {
|
enum {
|
||||||
PROP_0, // Magic: without this, keyboard is not useable in g_object_notify
|
PROP_0, // Magic: without this, keyboard is not useable in g_object_notify
|
||||||
PROP_KEYBOARD,
|
PROP_KEYBOARD,
|
||||||
|
PROP_VISIBLE,
|
||||||
PROP_LAST
|
PROP_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
ENABLED,
|
||||||
|
DISABLED,
|
||||||
DESTROYED,
|
DESTROYED,
|
||||||
LAST_SIGNAL
|
LAST_SIGNAL
|
||||||
};
|
};
|
||||||
|
|
||||||
static guint signals[LAST_SIGNAL] = { 0, };
|
static guint signals[LAST_SIGNAL] = { 0, };
|
||||||
|
|
||||||
/**
|
#define EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(obj) \
|
||||||
* EekboardContextService:
|
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServicePrivate))
|
||||||
*
|
|
||||||
* Handles layout state, gsettings, and virtual-keyboard.
|
struct _EekboardContextServicePrivate {
|
||||||
*
|
gboolean enabled;
|
||||||
* TODO: Restrict to managing keyboard layouts, and maybe button repeats,
|
gboolean visible;
|
||||||
* 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
|
|
||||||
|
|
||||||
LevelKeyboard *keyboard; // currently used keyboard
|
LevelKeyboard *keyboard; // currently used keyboard
|
||||||
GSettings *settings; // Owned reference
|
GHashTable *keyboard_hash; // a table of available keyboards, per layout
|
||||||
|
|
||||||
// Maybe TODO: it's used only for fetching layout type.
|
GSettings *settings;
|
||||||
// Maybe let UI push the type to this structure?
|
uint32_t hint;
|
||||||
ServerContextService *ui; // unowned reference
|
uint32_t purpose;
|
||||||
/// Needed for keymap changes after keyboard updates
|
|
||||||
struct submission *submission; // unowned
|
|
||||||
};
|
};
|
||||||
|
|
||||||
G_DEFINE_TYPE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
|
G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
|
||||||
|
|
||||||
|
static LevelKeyboard *
|
||||||
|
eekboard_context_service_real_create_keyboard (EekboardContextService *self,
|
||||||
|
const gchar *keyboard_type,
|
||||||
|
enum squeek_arrangement_kind t)
|
||||||
|
{
|
||||||
|
LevelKeyboard *keyboard = eek_xml_layout_real_create_keyboard(keyboard_type, self, t);
|
||||||
|
if (!keyboard) {
|
||||||
|
g_error("Failed to create a keyboard");
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_context_service_real_show_keyboard (EekboardContextService *self)
|
||||||
|
{
|
||||||
|
self->priv->visible = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_context_service_real_hide_keyboard (EekboardContextService *self)
|
||||||
|
{
|
||||||
|
self->priv->visible = FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eekboard_context_service_set_property (GObject *object,
|
eekboard_context_service_set_property (GObject *object,
|
||||||
@ -75,8 +151,17 @@ eekboard_context_service_set_property (GObject *object,
|
|||||||
const GValue *value,
|
const GValue *value,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
(void)value;
|
EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
|
||||||
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
|
case PROP_KEYBOARD:
|
||||||
|
if (context->priv->keyboard)
|
||||||
|
g_object_unref (context->priv->keyboard);
|
||||||
|
context->priv->keyboard = g_value_get_object (value);
|
||||||
|
break;
|
||||||
|
case PROP_VISIBLE:
|
||||||
|
context->priv->visible = g_value_get_boolean (value);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
break;
|
break;
|
||||||
@ -93,7 +178,10 @@ eekboard_context_service_get_property (GObject *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;
|
||||||
|
case PROP_VISIBLE:
|
||||||
|
g_value_set_boolean (value, context->priv->visible);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
@ -104,6 +192,13 @@ eekboard_context_service_get_property (GObject *object,
|
|||||||
static void
|
static void
|
||||||
eekboard_context_service_dispose (GObject *object)
|
eekboard_context_service_dispose (GObject *object)
|
||||||
{
|
{
|
||||||
|
EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
|
||||||
|
|
||||||
|
if (context->priv->keyboard_hash) {
|
||||||
|
g_hash_table_destroy (context->priv->keyboard_hash);
|
||||||
|
context->priv->keyboard_hash = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
G_OBJECT_CLASS (eekboard_context_service_parent_class)->
|
G_OBJECT_CLASS (eekboard_context_service_parent_class)->
|
||||||
dispose (object);
|
dispose (object);
|
||||||
}
|
}
|
||||||
@ -111,58 +206,42 @@ eekboard_context_service_dispose (GObject *object)
|
|||||||
static void
|
static void
|
||||||
settings_get_layout(GSettings *settings, char **type, char **layout)
|
settings_get_layout(GSettings *settings, char **type, char **layout)
|
||||||
{
|
{
|
||||||
if (!settings) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
GVariant *inputs = g_settings_get_value(settings, "sources");
|
GVariant *inputs = g_settings_get_value(settings, "sources");
|
||||||
if (g_variant_n_children(inputs) == 0) {
|
// current layout is always first
|
||||||
g_warning("No system layout present");
|
g_variant_get_child(inputs, 0, "(ss)", type, layout);
|
||||||
*type = NULL;
|
|
||||||
*layout = NULL;
|
|
||||||
} else {
|
|
||||||
// current layout is always first
|
|
||||||
g_variant_get_child(inputs, 0, "(ss)", type, layout);
|
|
||||||
}
|
|
||||||
g_variant_unref(inputs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state, uint32_t timestamp) {
|
eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
|
||||||
gchar *layout_name = state->overlay_name;
|
{
|
||||||
|
g_autofree gchar *keyboard_type = NULL;
|
||||||
|
g_autofree gchar *keyboard_layout = NULL;
|
||||||
|
settings_get_layout(context->priv->settings, &keyboard_type, &keyboard_layout);
|
||||||
|
|
||||||
if (layout_name == NULL) {
|
if (!keyboard_type) {
|
||||||
layout_name = state->layout_name;
|
keyboard_type = g_strdup("us");
|
||||||
|
}
|
||||||
|
if (!keyboard_layout) {
|
||||||
|
keyboard_layout = g_strdup("undefined");
|
||||||
|
}
|
||||||
|
|
||||||
switch (state->purpose) {
|
EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
|
||||||
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) {
|
switch (priv->purpose) {
|
||||||
layout_name = "us";
|
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
|
||||||
}
|
case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
|
||||||
|
keyboard_layout = g_strdup("number");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
// generic part follows
|
// generic part follows
|
||||||
struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
|
LevelKeyboard *keyboard = eekboard_context_service_real_create_keyboard(context, keyboard_layout, t);
|
||||||
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.
|
|
||||||
// TODO: Update submission on change event
|
|
||||||
if (context->submission) {
|
|
||||||
submission_use_layout(context->submission, keyboard->layout, timestamp);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update UI
|
|
||||||
g_object_notify (G_OBJECT(context), "keyboard");
|
g_object_notify (G_OBJECT(context), "keyboard");
|
||||||
|
|
||||||
// replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
|
// replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
|
||||||
@ -171,23 +250,8 @@ eekboard_context_service_use_layout(EekboardContextService *context, struct sque
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void eekboard_context_service_update_settings_layout(EekboardContextService *context) {
|
static void update_layout_and_type(EekboardContextService *context) {
|
||||||
g_autofree gchar *keyboard_layout = NULL;
|
eekboard_context_service_update_layout(context, server_context_service_get_layout_type(context));
|
||||||
g_autofree gchar *keyboard_type = NULL;
|
|
||||||
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
|
static gboolean
|
||||||
@ -198,14 +262,21 @@ settings_handle_layout_changed(GSettings *s,
|
|||||||
(void)keys;
|
(void)keys;
|
||||||
(void)n_keys;
|
(void)n_keys;
|
||||||
EekboardContextService *context = user_data;
|
EekboardContextService *context = user_data;
|
||||||
eekboard_context_service_update_settings_layout(context);
|
update_layout_and_type(context);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eekboard_context_service_constructed (GObject *object)
|
eekboard_context_service_constructed (GObject *object)
|
||||||
{
|
{
|
||||||
(void)object;
|
EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object);
|
||||||
|
context->virtual_keyboard = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(
|
||||||
|
squeek_wayland->virtual_keyboard_manager,
|
||||||
|
squeek_wayland->seat);
|
||||||
|
if (!context->virtual_keyboard) {
|
||||||
|
g_error("Programmer error: Failed to receive a virtual keyboard instance");
|
||||||
|
}
|
||||||
|
update_layout_and_type(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -214,10 +285,48 @@ 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;
|
||||||
|
|
||||||
|
klass->show_keyboard = eekboard_context_service_real_show_keyboard;
|
||||||
|
klass->hide_keyboard = eekboard_context_service_real_hide_keyboard;
|
||||||
|
|
||||||
gobject_class->constructed = eekboard_context_service_constructed;
|
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 = eekboard_context_service_get_property;
|
||||||
gobject_class->dispose = eekboard_context_service_dispose;
|
gobject_class->dispose = eekboard_context_service_dispose;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardContextService::enabled:
|
||||||
|
* @context: an #EekboardContextService
|
||||||
|
*
|
||||||
|
* Emitted when @context is enabled.
|
||||||
|
*/
|
||||||
|
signals[ENABLED] =
|
||||||
|
g_signal_new (I_("enabled"),
|
||||||
|
G_TYPE_FROM_CLASS(gobject_class),
|
||||||
|
G_SIGNAL_RUN_LAST,
|
||||||
|
G_STRUCT_OFFSET(EekboardContextServiceClass, enabled),
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
g_cclosure_marshal_VOID__VOID,
|
||||||
|
G_TYPE_NONE,
|
||||||
|
0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardContextService::disabled:
|
||||||
|
* @context: an #EekboardContextService
|
||||||
|
*
|
||||||
|
* Emitted when @context is enabled.
|
||||||
|
*/
|
||||||
|
signals[DISABLED] =
|
||||||
|
g_signal_new (I_("disabled"),
|
||||||
|
G_TYPE_FROM_CLASS(gobject_class),
|
||||||
|
G_SIGNAL_RUN_LAST,
|
||||||
|
G_STRUCT_OFFSET(EekboardContextServiceClass, disabled),
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
g_cclosure_marshal_VOID__VOID,
|
||||||
|
G_TYPE_NONE,
|
||||||
|
0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EekboardContextService::destroyed:
|
* EekboardContextService::destroyed:
|
||||||
* @context: an #EekboardContextService
|
* @context: an #EekboardContextService
|
||||||
@ -228,7 +337,7 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
|
|||||||
g_signal_new (I_("destroyed"),
|
g_signal_new (I_("destroyed"),
|
||||||
G_TYPE_FROM_CLASS(gobject_class),
|
G_TYPE_FROM_CLASS(gobject_class),
|
||||||
G_SIGNAL_RUN_LAST,
|
G_SIGNAL_RUN_LAST,
|
||||||
0,
|
G_STRUCT_OFFSET(EekboardContextServiceClass, destroyed),
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
g_cclosure_marshal_VOID__VOID,
|
g_cclosure_marshal_VOID__VOID,
|
||||||
@ -243,39 +352,100 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
|
|||||||
pspec = g_param_spec_pointer("keyboard",
|
pspec = g_param_spec_pointer("keyboard",
|
||||||
"Keyboard",
|
"Keyboard",
|
||||||
"Keyboard",
|
"Keyboard",
|
||||||
G_PARAM_READABLE);
|
G_PARAM_READWRITE);
|
||||||
g_object_class_install_property (gobject_class,
|
g_object_class_install_property (gobject_class,
|
||||||
PROP_KEYBOARD,
|
PROP_KEYBOARD,
|
||||||
pspec);
|
pspec);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardContextService:visible:
|
||||||
|
*
|
||||||
|
* Flag to indicate if keyboard is visible or not.
|
||||||
|
*/
|
||||||
|
pspec = g_param_spec_boolean ("visible",
|
||||||
|
"Visible",
|
||||||
|
"Visible",
|
||||||
|
FALSE,
|
||||||
|
G_PARAM_READWRITE);
|
||||||
|
g_object_class_install_property (gobject_class,
|
||||||
|
PROP_VISIBLE,
|
||||||
|
pspec);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eekboard_context_service_init (EekboardContextService *self)
|
eekboard_context_service_init (EekboardContextService *self)
|
||||||
{
|
{
|
||||||
const char *schema_name = "org.gnome.desktop.input-sources";
|
self->priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(self);
|
||||||
GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
|
|
||||||
g_autoptr(GSettingsSchema) schema = NULL;
|
|
||||||
|
|
||||||
if (!ssrc) {
|
self->priv->keyboard_hash =
|
||||||
g_warning("No gsettings schemas installed. Layout switching unavailable.");
|
g_hash_table_new_full (g_direct_hash,
|
||||||
return;
|
g_direct_equal,
|
||||||
|
NULL,
|
||||||
|
(GDestroyNotify)g_object_unref);
|
||||||
|
|
||||||
|
self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources");
|
||||||
|
gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
|
||||||
|
G_CALLBACK(settings_handle_layout_changed),
|
||||||
|
self);
|
||||||
|
if (conn_id == 0) {
|
||||||
|
g_warning ("Could not connect to gsettings updates, layout"
|
||||||
|
" changing unavailable");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
schema = g_settings_schema_source_lookup(ssrc, schema_name, TRUE);
|
/**
|
||||||
if (schema) {
|
* eekboard_context_service_enable:
|
||||||
// Not referencing the found schema directly,
|
* @context: an #EekboardContextService
|
||||||
// because it's not clear how...
|
*
|
||||||
self->settings = g_settings_new (schema_name);
|
* Enable @context. This function is called when @context is pushed
|
||||||
gulong conn_id = g_signal_connect(self->settings, "change-event",
|
* by eekboard_service_push_context().
|
||||||
G_CALLBACK(settings_handle_layout_changed),
|
*/
|
||||||
self);
|
void
|
||||||
if (conn_id == 0) {
|
eekboard_context_service_enable (EekboardContextService *context)
|
||||||
g_warning ("Could not connect to gsettings updates, "
|
{
|
||||||
"automatic layout changing unavailable");
|
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
||||||
}
|
|
||||||
} else {
|
if (!context->priv->enabled) {
|
||||||
g_warning("Gsettings schema %s is not installed on the system. "
|
context->priv->enabled = TRUE;
|
||||||
"Layout switching unavailable", schema_name);
|
g_signal_emit (context, signals[ENABLED], 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* eekboard_context_service_disable:
|
||||||
|
* @context: an #EekboardContextService
|
||||||
|
*
|
||||||
|
* Disable @context. This function is called when @context is pushed
|
||||||
|
* by eekboard_service_pop_context().
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
eekboard_context_service_disable (EekboardContextService *context)
|
||||||
|
{
|
||||||
|
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
||||||
|
|
||||||
|
if (context->priv->enabled) {
|
||||||
|
context->priv->enabled = FALSE;
|
||||||
|
g_signal_emit (context, signals[DISABLED], 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eekboard_context_service_show_keyboard (EekboardContextService *context)
|
||||||
|
{
|
||||||
|
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
||||||
|
|
||||||
|
if (!context->priv->visible) {
|
||||||
|
EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->show_keyboard (context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eekboard_context_service_hide_keyboard (EekboardContextService *context)
|
||||||
|
{
|
||||||
|
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
||||||
|
|
||||||
|
if (context->priv->visible) {
|
||||||
|
EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->hide_keyboard (context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -289,6 +459,10 @@ void
|
|||||||
eekboard_context_service_destroy (EekboardContextService *context)
|
eekboard_context_service_destroy (EekboardContextService *context)
|
||||||
{
|
{
|
||||||
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
|
||||||
|
|
||||||
|
if (context->priv->enabled) {
|
||||||
|
eekboard_context_service_disable (context);
|
||||||
|
}
|
||||||
g_signal_emit (context, signals[DESTROYED], 0);
|
g_signal_emit (context, signals[DESTROYED], 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -302,53 +476,25 @@ eekboard_context_service_destroy (EekboardContextService *context)
|
|||||||
LevelKeyboard *
|
LevelKeyboard *
|
||||||
eekboard_context_service_get_keyboard (EekboardContextService *context)
|
eekboard_context_service_get_keyboard (EekboardContextService *context)
|
||||||
{
|
{
|
||||||
return context->keyboard;
|
return context->priv->keyboard;
|
||||||
|
}
|
||||||
|
|
||||||
|
void eekboard_context_service_set_keymap(EekboardContextService *context,
|
||||||
|
const LevelKeyboard *keyboard)
|
||||||
|
{
|
||||||
|
zwp_virtual_keyboard_v1_keymap(context->virtual_keyboard,
|
||||||
|
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
|
||||||
|
keyboard->keymap_fd, keyboard->keymap_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
|
void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
|
||||||
uint32_t hint, uint32_t purpose)
|
uint32_t hint, uint32_t purpose)
|
||||||
{
|
{
|
||||||
if (context->layout->hint != hint || context->layout->purpose != purpose) {
|
EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
|
||||||
context->layout->hint = hint;
|
|
||||||
context->layout->purpose = purpose;
|
if (priv->hint != hint || priv->purpose != purpose) {
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
priv->hint = hint;
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
priv->purpose = purpose;
|
||||||
|
update_layout_and_type(context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
|
|
||||||
if (g_strcmp0(context->layout->overlay_name, name)) {
|
|
||||||
g_free(context->layout->overlay_name);
|
|
||||||
context->layout->overlay_name = g_strdup(name);
|
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const char*
|
|
||||||
eekboard_context_service_get_overlay(EekboardContextService *context) {
|
|
||||||
return context->layout->overlay_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
|
|
||||||
{
|
|
||||||
EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
|
|
||||||
context->layout = state;
|
|
||||||
eekboard_context_service_update_settings_layout(context);
|
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
|
||||||
eekboard_context_service_use_layout(context, context->layout, time);
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
|
|
||||||
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
|
|
||||||
context->submission = submission;
|
|
||||||
if (context->submission) {
|
|
||||||
uint32_t time = gdk_event_get_time(NULL);
|
|
||||||
submission_use_layout(context->submission, context->keyboard->layout, time);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
|
|
||||||
context->ui = ui;
|
|
||||||
}
|
|
||||||
|
|||||||
@ -22,8 +22,7 @@
|
|||||||
#ifndef EEKBOARD_CONTEXT_SERVICE_H
|
#ifndef EEKBOARD_CONTEXT_SERVICE_H
|
||||||
#define EEKBOARD_CONTEXT_SERVICE_H 1
|
#define EEKBOARD_CONTEXT_SERVICE_H 1
|
||||||
|
|
||||||
#include "src/submission.h"
|
#include <eek/eek.h>
|
||||||
#include "src/layout.h"
|
|
||||||
|
|
||||||
#include "virtual-keyboard-unstable-v1-client-protocol.h"
|
#include "virtual-keyboard-unstable-v1-client-protocol.h"
|
||||||
#include "text-input-unstable-v3-client-protocol.h"
|
#include "text-input-unstable-v3-client-protocol.h"
|
||||||
@ -34,12 +33,69 @@ G_BEGIN_DECLS
|
|||||||
#define EEKBOARD_CONTEXT_SERVICE_INTERFACE "org.fedorahosted.Eekboard.Context"
|
#define EEKBOARD_CONTEXT_SERVICE_INTERFACE "org.fedorahosted.Eekboard.Context"
|
||||||
|
|
||||||
#define EEKBOARD_TYPE_CONTEXT_SERVICE (eekboard_context_service_get_type())
|
#define EEKBOARD_TYPE_CONTEXT_SERVICE (eekboard_context_service_get_type())
|
||||||
|
#define EEKBOARD_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextService))
|
||||||
|
#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))
|
||||||
|
|
||||||
G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD, CONTEXT_SERVICE, GObject)
|
|
||||||
|
|
||||||
EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
|
typedef struct _EekboardContextServiceClass EekboardContextServiceClass;
|
||||||
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
|
typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
|
||||||
void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
|
|
||||||
|
/**
|
||||||
|
* EekboardContextService:
|
||||||
|
*
|
||||||
|
* 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;
|
||||||
|
|
||||||
|
EekboardContextServicePrivate *priv;
|
||||||
|
|
||||||
|
struct zwp_virtual_keyboard_v1 *virtual_keyboard;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardContextServiceClass:
|
||||||
|
* @create_keyboard: virtual function for create a keyboard from string
|
||||||
|
* @show_keyboard: virtual function for show a keyboard
|
||||||
|
* @hide_keyboard: virtual function for hide a keyboard
|
||||||
|
* @enabled: class handler for #EekboardContextService::enabled signal
|
||||||
|
* @disabled: class handler for #EekboardContextService::disabled signal
|
||||||
|
*/
|
||||||
|
struct _EekboardContextServiceClass {
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< public >*/
|
||||||
|
struct squeek_view *(*create_keyboard) (EekboardContextService *self,
|
||||||
|
const gchar *keyboard_type);
|
||||||
|
void (*show_keyboard) (EekboardContextService *self);
|
||||||
|
void (*hide_keyboard) (EekboardContextService *self);
|
||||||
|
|
||||||
|
/* signals */
|
||||||
|
void (*enabled) (EekboardContextService *self);
|
||||||
|
void (*disabled) (EekboardContextService *self);
|
||||||
|
void (*destroyed) (EekboardContextService *self);
|
||||||
|
|
||||||
|
/*< private >*/
|
||||||
|
/* padding */
|
||||||
|
gpointer pdummy[24];
|
||||||
|
};
|
||||||
|
|
||||||
|
GType eekboard_context_service_get_type
|
||||||
|
(void) G_GNUC_CONST;
|
||||||
|
void eekboard_context_service_enable (EekboardContextService *context);
|
||||||
|
void eekboard_context_service_disable (EekboardContextService *context);
|
||||||
|
void eekboard_context_service_show_keyboard
|
||||||
|
(EekboardContextService *context);
|
||||||
|
void eekboard_context_service_hide_keyboard
|
||||||
|
(EekboardContextService *context);
|
||||||
void eekboard_context_service_destroy (EekboardContextService *context);
|
void eekboard_context_service_destroy (EekboardContextService *context);
|
||||||
LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
|
LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
|
||||||
|
|
||||||
@ -50,6 +106,6 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *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);
|
eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t);
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
#endif /* EEKBOARD_CONTEXT_SERVICE_H */
|
#endif /* EEKBOARD_CONTEXT_SERVICE_H */
|
||||||
|
|||||||
310
eekboard/eekboard-service.c
Normal file
310
eekboard/eekboard-service.c
Normal file
@ -0,0 +1,310 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2010-2011 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SECTION:eekboard-service
|
||||||
|
* @short_description: base implementation of eekboard service
|
||||||
|
*
|
||||||
|
* Provides a dbus object, and contains the context.
|
||||||
|
*
|
||||||
|
* The #EekboardService class provides a base server side
|
||||||
|
* implementation of eekboard service.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include "sm.puri.OSK0.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include <gio/gio.h>
|
||||||
|
|
||||||
|
#include "eekboard/eekboard-service.h"
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PROP_0,
|
||||||
|
PROP_OBJECT_PATH,
|
||||||
|
PROP_CONNECTION,
|
||||||
|
PROP_LAST
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
DESTROYED,
|
||||||
|
LAST_SIGNAL
|
||||||
|
};
|
||||||
|
|
||||||
|
static guint signals[LAST_SIGNAL] = { 0, };
|
||||||
|
|
||||||
|
typedef struct _EekboardServicePrivate
|
||||||
|
{
|
||||||
|
GDBusConnection *connection;
|
||||||
|
SmPuriOSK0 *dbus_interface;
|
||||||
|
GDBusNodeInfo *introspection_data;
|
||||||
|
guint registration_id;
|
||||||
|
char *object_path;
|
||||||
|
|
||||||
|
EekboardContextService *context; // unowned reference
|
||||||
|
} EekboardServicePrivate;
|
||||||
|
|
||||||
|
G_DEFINE_TYPE_WITH_PRIVATE (EekboardService, eekboard_service, G_TYPE_OBJECT)
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_set_property (GObject *object,
|
||||||
|
guint prop_id,
|
||||||
|
const GValue *value,
|
||||||
|
GParamSpec *pspec)
|
||||||
|
{
|
||||||
|
EekboardService *service = EEKBOARD_SERVICE(object);
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
GDBusConnection *connection;
|
||||||
|
|
||||||
|
switch (prop_id) {
|
||||||
|
case PROP_OBJECT_PATH:
|
||||||
|
if (priv->object_path)
|
||||||
|
g_free (priv->object_path);
|
||||||
|
priv->object_path = g_value_dup_string (value);
|
||||||
|
break;
|
||||||
|
case PROP_CONNECTION:
|
||||||
|
connection = g_value_get_object (value);
|
||||||
|
if (priv->connection)
|
||||||
|
g_object_unref (priv->connection);
|
||||||
|
priv->connection = g_object_ref (connection);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_get_property (GObject *object,
|
||||||
|
guint prop_id,
|
||||||
|
GValue *value,
|
||||||
|
GParamSpec *pspec)
|
||||||
|
{
|
||||||
|
EekboardService *service = EEKBOARD_SERVICE(object);
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
|
||||||
|
switch (prop_id) {
|
||||||
|
case PROP_OBJECT_PATH:
|
||||||
|
g_value_set_string (value, priv->object_path);
|
||||||
|
break;
|
||||||
|
case PROP_CONNECTION:
|
||||||
|
g_value_set_object (value, priv->connection);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_dispose (GObject *object)
|
||||||
|
{
|
||||||
|
EekboardService *service = EEKBOARD_SERVICE(object);
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
|
||||||
|
if (priv->connection) {
|
||||||
|
if (priv->registration_id > 0) {
|
||||||
|
g_dbus_connection_unregister_object (priv->connection,
|
||||||
|
priv->registration_id);
|
||||||
|
priv->registration_id = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_unref (priv->connection);
|
||||||
|
priv->connection = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priv->introspection_data) {
|
||||||
|
g_dbus_node_info_unref (priv->introspection_data);
|
||||||
|
priv->introspection_data = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priv->context) {
|
||||||
|
g_signal_handlers_disconnect_by_data (priv->context, service);
|
||||||
|
priv->context = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (eekboard_service_parent_class)->dispose (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_finalize (GObject *object)
|
||||||
|
{
|
||||||
|
EekboardService *service = EEKBOARD_SERVICE(object);
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
|
||||||
|
g_free (priv->object_path);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (eekboard_service_parent_class)->finalize (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
|
||||||
|
gboolean arg_visible, gpointer user_data) {
|
||||||
|
EekboardService *service = user_data;
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
|
||||||
|
if (priv->context) {
|
||||||
|
if (arg_visible) {
|
||||||
|
eekboard_context_service_show_keyboard (priv->context);
|
||||||
|
} else {
|
||||||
|
eekboard_context_service_hide_keyboard (priv->context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sm_puri_osk0_complete_set_visible(object, invocation);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void on_visible(EekboardService *service,
|
||||||
|
GParamSpec *pspec,
|
||||||
|
EekboardContextService *context)
|
||||||
|
{
|
||||||
|
gboolean visible;
|
||||||
|
EekboardServicePrivate *priv;
|
||||||
|
|
||||||
|
g_return_if_fail (EEKBOARD_IS_SERVICE (service));
|
||||||
|
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE (context));
|
||||||
|
|
||||||
|
priv = eekboard_service_get_instance_private (service);
|
||||||
|
g_object_get (context, "visible", &visible, NULL);
|
||||||
|
|
||||||
|
sm_puri_osk0_set_visible(priv->dbus_interface, visible);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_constructed (GObject *object)
|
||||||
|
{
|
||||||
|
EekboardService *service = EEKBOARD_SERVICE(object);
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
|
||||||
|
priv->dbus_interface = sm_puri_osk0_skeleton_new();
|
||||||
|
g_signal_connect(priv->dbus_interface, "handle-set-visible",
|
||||||
|
G_CALLBACK(handle_set_visible), service);
|
||||||
|
|
||||||
|
if (priv->connection && priv->object_path) {
|
||||||
|
GError *error = NULL;
|
||||||
|
|
||||||
|
if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(priv->dbus_interface),
|
||||||
|
priv->connection,
|
||||||
|
priv->object_path,
|
||||||
|
&error)) {
|
||||||
|
g_warning("Error registering dbus object: %s\n", error->message);
|
||||||
|
g_clear_error(&error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_class_init (EekboardServiceClass *klass)
|
||||||
|
{
|
||||||
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||||
|
GParamSpec *pspec;
|
||||||
|
|
||||||
|
klass->create_context = NULL;
|
||||||
|
|
||||||
|
gobject_class->constructed = eekboard_service_constructed;
|
||||||
|
gobject_class->set_property = eekboard_service_set_property;
|
||||||
|
gobject_class->get_property = eekboard_service_get_property;
|
||||||
|
gobject_class->dispose = eekboard_service_dispose;
|
||||||
|
gobject_class->finalize = eekboard_service_finalize;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardService::destroyed:
|
||||||
|
* @service: an #EekboardService
|
||||||
|
*
|
||||||
|
* The ::destroyed signal is emitted when the service is vanished.
|
||||||
|
*/
|
||||||
|
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);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardService:object-path:
|
||||||
|
*
|
||||||
|
* D-Bus object path.
|
||||||
|
*/
|
||||||
|
pspec = g_param_spec_string ("object-path",
|
||||||
|
"Object-path",
|
||||||
|
"Object-path",
|
||||||
|
NULL,
|
||||||
|
G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
|
||||||
|
g_object_class_install_property (gobject_class,
|
||||||
|
PROP_OBJECT_PATH,
|
||||||
|
pspec);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardService:connection:
|
||||||
|
*
|
||||||
|
* D-Bus connection.
|
||||||
|
*/
|
||||||
|
pspec = g_param_spec_object ("connection",
|
||||||
|
"Connection",
|
||||||
|
"Connection",
|
||||||
|
G_TYPE_DBUS_CONNECTION,
|
||||||
|
G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
|
||||||
|
g_object_class_install_property (gobject_class,
|
||||||
|
PROP_CONNECTION,
|
||||||
|
pspec);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
eekboard_service_init (EekboardService *self)
|
||||||
|
{
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (self);
|
||||||
|
|
||||||
|
priv->context = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* eekboard_service_new:
|
||||||
|
* @connection: a #GDBusConnection
|
||||||
|
* @object_path: object path
|
||||||
|
*/
|
||||||
|
EekboardService *
|
||||||
|
eekboard_service_new (GDBusConnection *connection,
|
||||||
|
const gchar *object_path)
|
||||||
|
{
|
||||||
|
return g_object_new (EEKBOARD_TYPE_SERVICE,
|
||||||
|
"object-path", object_path,
|
||||||
|
"connection", connection,
|
||||||
|
NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
eekboard_service_set_context(EekboardService *service,
|
||||||
|
EekboardContextService *context)
|
||||||
|
{
|
||||||
|
EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
|
||||||
|
|
||||||
|
g_return_if_fail (!priv->context);
|
||||||
|
|
||||||
|
priv->context = context;
|
||||||
|
|
||||||
|
g_signal_connect_swapped (priv->context,
|
||||||
|
"notify::visible",
|
||||||
|
G_CALLBACK(on_visible),
|
||||||
|
service);
|
||||||
|
}
|
||||||
55
eekboard/eekboard-service.h
Normal file
55
eekboard/eekboard-service.h
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2010-2011 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#ifndef EEKBOARD_SERVICE_H
|
||||||
|
#define EEKBOARD_SERVICE_H 1
|
||||||
|
|
||||||
|
#define __EEKBOARD_SERVICE_H_INSIDE__ 1
|
||||||
|
|
||||||
|
#include "eekboard/eekboard-context-service.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
#define EEKBOARD_SERVICE_PATH "/sm/puri/OSK0"
|
||||||
|
#define EEKBOARD_SERVICE_INTERFACE "sm.puri.OSK0"
|
||||||
|
|
||||||
|
#define EEKBOARD_TYPE_SERVICE (eekboard_service_get_type())
|
||||||
|
G_DECLARE_DERIVABLE_TYPE (EekboardService, eekboard_service, EEKBOARD, SERVICE, GObject)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EekboardServiceClass:
|
||||||
|
* @create_context: virtual function for creating a context
|
||||||
|
*/
|
||||||
|
struct _EekboardServiceClass {
|
||||||
|
/*< private >*/
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
/*< public >*/
|
||||||
|
EekboardContextService *(*create_context) (EekboardService *self);
|
||||||
|
|
||||||
|
/*< private >*/
|
||||||
|
/* padding */
|
||||||
|
gpointer pdummy[24];
|
||||||
|
};
|
||||||
|
|
||||||
|
GType eekboard_service_get_type (void) G_GNUC_CONST;
|
||||||
|
EekboardService * eekboard_service_new (GDBusConnection *connection,
|
||||||
|
const gchar *object_path);
|
||||||
|
void eekboard_service_set_context(EekboardService *service,
|
||||||
|
EekboardContextService *context);
|
||||||
|
G_END_DECLS
|
||||||
|
#endif /* EEKBOARD_SERVICE_H */
|
||||||
136
eekboard/key-emitter.c
Normal file
136
eekboard/key-emitter.c
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
|
||||||
|
* Copyright (C) 2011 Red Hat, Inc.
|
||||||
|
* Copyright (C) 2019 Purism, SPC
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* This file is responsible for managing keycode data and emitting keycodes. */
|
||||||
|
|
||||||
|
#include "eekboard/key-emitter.h"
|
||||||
|
|
||||||
|
#include <gdk/gdk.h>
|
||||||
|
#include <X11/XKBlib.h>
|
||||||
|
|
||||||
|
#include "eekboard/eekboard-context-service.h"
|
||||||
|
|
||||||
|
// TODO: decide whether it's this struct that carries the keyboard around in key-emitter or if the whole manager should be dragged around
|
||||||
|
// if this is the carrier, then it should be made part of the manager
|
||||||
|
// hint: check which fields need to be persisted between keypresses; which between keyboards
|
||||||
|
typedef struct {
|
||||||
|
struct zwp_virtual_keyboard_v1 *virtual_keyboard; // unowned copy
|
||||||
|
struct xkb_keymap *keymap; // unowned copy
|
||||||
|
XkbDescRec *xkb;
|
||||||
|
guint modifier_keycodes[8];
|
||||||
|
guint modifier_indices[MOD_IDX_LAST];
|
||||||
|
guint group;
|
||||||
|
} SeatEmitter;
|
||||||
|
|
||||||
|
|
||||||
|
int send_virtual_keyboard_key(
|
||||||
|
struct zwp_virtual_keyboard_v1 *keyboard,
|
||||||
|
unsigned int keycode,
|
||||||
|
unsigned is_press,
|
||||||
|
uint32_t timestamp
|
||||||
|
) {
|
||||||
|
zwp_virtual_keyboard_v1_key(keyboard, timestamp, keycode, (unsigned)is_press);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Finds the first key code for each modifier and saves it in modifier_keycodes */
|
||||||
|
static void
|
||||||
|
update_modifier_info (SeatEmitter *client)
|
||||||
|
{
|
||||||
|
client->modifier_indices[MOD_IDX_SHIFT] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_SHIFT);
|
||||||
|
client->modifier_indices[MOD_IDX_CAPS] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_CAPS);
|
||||||
|
client->modifier_indices[MOD_IDX_CTRL] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_CTRL);
|
||||||
|
client->modifier_indices[MOD_IDX_ALT] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_ALT);
|
||||||
|
client->modifier_indices[MOD_IDX_NUM] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_NUM);
|
||||||
|
client->modifier_indices[MOD_IDX_MOD3] = xkb_keymap_mod_get_index(client->keymap, "Mod3");
|
||||||
|
client->modifier_indices[MOD_IDX_LOGO] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_LOGO);
|
||||||
|
client->modifier_indices[MOD_IDX_ALTGR] = xkb_keymap_mod_get_index(client->keymap, "Mod5");
|
||||||
|
client->modifier_indices[MOD_IDX_NUMLK] = xkb_keymap_mod_get_index(client->keymap, "NumLock");
|
||||||
|
client->modifier_indices[MOD_IDX_ALSO_ALT] = xkb_keymap_mod_get_index(client->keymap, "Alt");
|
||||||
|
client->modifier_indices[MOD_IDX_LVL3] = xkb_keymap_mod_get_index(client->keymap, "LevelThree");
|
||||||
|
client->modifier_indices[MOD_IDX_LALT] = xkb_keymap_mod_get_index(client->keymap, "LAlt");
|
||||||
|
client->modifier_indices[MOD_IDX_RALT] = xkb_keymap_mod_get_index(client->keymap, "RAlt");
|
||||||
|
client->modifier_indices[MOD_IDX_RCONTROL] = xkb_keymap_mod_get_index(client->keymap, "RControl");
|
||||||
|
client->modifier_indices[MOD_IDX_LCONTROL] = xkb_keymap_mod_get_index(client->keymap, "LControl");
|
||||||
|
client->modifier_indices[MOD_IDX_SCROLLLK] = xkb_keymap_mod_get_index(client->keymap, "ScrollLock");
|
||||||
|
client->modifier_indices[MOD_IDX_LVL5] = xkb_keymap_mod_get_index(client->keymap, "LevelFive");
|
||||||
|
client->modifier_indices[MOD_IDX_ALSO_ALTGR] = xkb_keymap_mod_get_index(client->keymap, "AltGr");
|
||||||
|
client->modifier_indices[MOD_IDX_META] = xkb_keymap_mod_get_index(client->keymap, "Meta");
|
||||||
|
client->modifier_indices[MOD_IDX_SUPER] = xkb_keymap_mod_get_index(client->keymap, "Super");
|
||||||
|
client->modifier_indices[MOD_IDX_HYPER] = xkb_keymap_mod_get_index(client->keymap, "Hyper");
|
||||||
|
|
||||||
|
/*
|
||||||
|
for (xkb_mod_index_t i = 0;
|
||||||
|
i < xkb_keymap_num_mods(client->keymap);
|
||||||
|
i++) {
|
||||||
|
g_log("squeek", G_LOG_LEVEL_DEBUG, "%s", xkb_keymap_mod_get_name(client->keymap, i));
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
send_fake_key (SeatEmitter *emitter,
|
||||||
|
LevelKeyboard *keyboard,
|
||||||
|
guint keycode,
|
||||||
|
gboolean pressed,
|
||||||
|
uint32_t timestamp)
|
||||||
|
{
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, 0, 0, 0, 0);
|
||||||
|
send_virtual_keyboard_key (emitter->virtual_keyboard, keycode - 8, (unsigned)pressed, timestamp);
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, 0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
emit_key_activated (EekboardContextService *manager,
|
||||||
|
LevelKeyboard *keyboard,
|
||||||
|
guint keycode,
|
||||||
|
gboolean pressed,
|
||||||
|
uint32_t timestamp)
|
||||||
|
{
|
||||||
|
/* FIXME: figure out how to deal with Client after key presses go through
|
||||||
|
if (g_strcmp0 (eek_symbol_get_name (symbol), "cycle-keyboard") == 0) {
|
||||||
|
client->keyboards_head = g_slist_next (client->keyboards_head);
|
||||||
|
if (client->keyboards_head == NULL)
|
||||||
|
client->keyboards_head = client->keyboards;
|
||||||
|
eekboard_context_set_keyboard (client->context,
|
||||||
|
GPOINTER_TO_UINT(client->keyboards_head->data),
|
||||||
|
NULL);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (g_strcmp0 (eek_symbol_get_name (symbol), "preferences") == 0) {
|
||||||
|
gchar *argv[2];
|
||||||
|
GError *error;
|
||||||
|
|
||||||
|
argv[0] = g_build_filename (LIBEXECDIR, "eekboard-setup", NULL);
|
||||||
|
argv[1] = NULL;
|
||||||
|
|
||||||
|
error = NULL;
|
||||||
|
if (!g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error)) {
|
||||||
|
g_warning ("can't spawn %s: %s", argv[0], error->message);
|
||||||
|
g_error_free (error);
|
||||||
|
}
|
||||||
|
g_free (argv[0]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
SeatEmitter emitter = {0};
|
||||||
|
emitter.virtual_keyboard = manager->virtual_keyboard;
|
||||||
|
update_modifier_info (&emitter);
|
||||||
|
send_fake_key (&emitter, keyboard, keycode, pressed, timestamp);
|
||||||
|
}
|
||||||
45
eekboard/key-emitter.h
Normal file
45
eekboard/key-emitter.h
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
#ifndef KEYEMITTER_H
|
||||||
|
#define KEYEMITTER_H
|
||||||
|
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <glib.h>
|
||||||
|
|
||||||
|
#include "eek/eek.h"
|
||||||
|
|
||||||
|
#include "virtual-keyboard-unstable-v1-client-protocol.h"
|
||||||
|
|
||||||
|
/// Indices obtained by xkb_keymap_mod_get_name
|
||||||
|
enum mod_indices {
|
||||||
|
MOD_IDX_SHIFT,
|
||||||
|
MOD_IDX_CAPS,
|
||||||
|
MOD_IDX_CTRL,
|
||||||
|
MOD_IDX_ALT,
|
||||||
|
MOD_IDX_NUM,
|
||||||
|
MOD_IDX_MOD3,
|
||||||
|
MOD_IDX_LOGO,
|
||||||
|
MOD_IDX_ALTGR,
|
||||||
|
MOD_IDX_NUMLK, // Caution, not sure which is the right one
|
||||||
|
MOD_IDX_ALSO_ALT, // Not sure why, alt emits the first alt on my setup
|
||||||
|
MOD_IDX_LVL3,
|
||||||
|
|
||||||
|
// Not sure if the next 4 are used at all
|
||||||
|
MOD_IDX_LALT,
|
||||||
|
MOD_IDX_RALT,
|
||||||
|
MOD_IDX_RCONTROL,
|
||||||
|
MOD_IDX_LCONTROL,
|
||||||
|
|
||||||
|
MOD_IDX_SCROLLLK,
|
||||||
|
MOD_IDX_LVL5,
|
||||||
|
MOD_IDX_ALSO_ALTGR, // Not used on my layout
|
||||||
|
MOD_IDX_META,
|
||||||
|
MOD_IDX_SUPER,
|
||||||
|
MOD_IDX_HYPER,
|
||||||
|
|
||||||
|
MOD_IDX_LAST,
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
emit_key_activated (EekboardContextService *manager, LevelKeyboard *keyboard,
|
||||||
|
guint keycode,
|
||||||
|
gboolean pressed, uint32_t timestamp);
|
||||||
|
#endif // KEYEMITTER_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),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
42
meson.build
42
meson.build
@ -1,7 +1,7 @@
|
|||||||
project(
|
project(
|
||||||
'squeekboard',
|
'squeekboard',
|
||||||
'c', 'rust',
|
'c', 'rust',
|
||||||
version: '1.10.0',
|
version: '1.4.0',
|
||||||
license: 'GPLv3',
|
license: 'GPLv3',
|
||||||
meson_version: '>=0.51.0',
|
meson_version: '>=0.51.0',
|
||||||
default_options: [
|
default_options: [
|
||||||
@ -19,16 +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',
|
|
||||||
'-Winit-self',
|
|
||||||
'-Wmaybe-uninitialized',
|
|
||||||
'-Wold-style-definition',
|
|
||||||
'-Wredundant-decls',
|
|
||||||
'-Wstrict-prototypes',
|
|
||||||
'-Wunused-function',
|
|
||||||
],
|
],
|
||||||
language: 'c'
|
language: 'c'
|
||||||
)
|
)
|
||||||
@ -50,9 +40,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
prefix = get_option('prefix')
|
prefix = get_option('prefix')
|
||||||
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
|
||||||
@ -71,38 +59,12 @@ summary = [
|
|||||||
]
|
]
|
||||||
message('\n'.join(summary))
|
message('\n'.join(summary))
|
||||||
|
|
||||||
# Rust deps are changing, depending on compile flags. Cargo can't handle it alone.
|
|
||||||
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.sh')
|
cargo_build = find_program('cargo_build.sh')
|
||||||
|
|
||||||
subdir('data')
|
subdir('data')
|
||||||
subdir('protocols')
|
subdir('protocols')
|
||||||
|
subdir('eek')
|
||||||
subdir('src')
|
subdir('src')
|
||||||
subdir('tools')
|
|
||||||
subdir('tests')
|
subdir('tests')
|
||||||
|
|||||||
@ -6,7 +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')
|
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
|
|
||||||
<name>squeekboard</name>
|
|
||||||
<shortdesc>A Wayland virtual keyboard</shortdesc>
|
|
||||||
<description>A virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.</description>
|
|
||||||
<homepage rdf:resource="https://source.puri.sm/Librem5/squeekboard" />
|
|
||||||
<bug-database rdf:resource="https://source.puri.sm/Librem5/squeekboard/issues" />
|
|
||||||
<os>Linux</os>
|
|
||||||
<license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
|
|
||||||
<maintainer>
|
|
||||||
<foaf:Person>
|
|
||||||
<foaf:name>Dorota Czaplejewicz</foaf:name>
|
|
||||||
<foaf:mbox rdf:resource="mailto:dorota.czaplejewicz@puri.sm" />
|
|
||||||
</foaf:Person>
|
|
||||||
</maintainer>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@ -6,15 +6,12 @@ use std::ffi::CString;
|
|||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub struct KeySym(pub String);
|
pub struct KeySym(pub String);
|
||||||
|
|
||||||
/// Use to switch views
|
/// Use to switch layouts
|
||||||
type View = String;
|
type Level = String;
|
||||||
|
|
||||||
/// Use to send modified keypresses
|
/// Use to send modified keypresses
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub enum Modifier {
|
pub enum Modifier {
|
||||||
/// Control and Alt are the only modifiers
|
|
||||||
/// which doesn't interfere with levels,
|
|
||||||
/// so it's simple to implement as levels are deprecated in squeekboard.
|
|
||||||
Control,
|
Control,
|
||||||
Alt,
|
Alt,
|
||||||
}
|
}
|
||||||
@ -23,40 +20,21 @@ pub enum Modifier {
|
|||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub enum Action {
|
pub enum Action {
|
||||||
/// Switch to this view
|
/// Switch to this view
|
||||||
SetView(View),
|
SetLevel(Level),
|
||||||
/// Switch to a view and latch
|
/// Switch to a view and latch
|
||||||
LockView {
|
LockLevel {
|
||||||
lock: View,
|
lock: Level,
|
||||||
/// When unlocked by pressing it or emitting a key
|
/// When unlocked by pressing it or emitting a key
|
||||||
unlock: View,
|
unlock: Level,
|
||||||
},
|
},
|
||||||
/// Hold this modifier for as long as the button is pressed
|
/// Set this modifier TODO: release?
|
||||||
ApplyModifier(Modifier),
|
SetModifier(Modifier),
|
||||||
/// Submit some text
|
/// Submit some text
|
||||||
Submit {
|
Submit {
|
||||||
/// Text to submit with input-method.
|
/// Text to submit with input-method
|
||||||
/// If None, then keys are to be submitted instead.
|
|
||||||
text: Option<CString>,
|
text: Option<CString>,
|
||||||
/// The key events this symbol submits when submitting text is not possible
|
/// The key events this symbol submits when submitting text is not possible
|
||||||
keys: Vec<KeySym>,
|
keys: Vec<KeySym>,
|
||||||
},
|
},
|
||||||
/// Erase a position behind the cursor
|
|
||||||
Erase,
|
|
||||||
ShowPreferences,
|
ShowPreferences,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Action {
|
|
||||||
pub fn is_locked(&self, view_name: &str) -> bool {
|
|
||||||
match self {
|
|
||||||
Action::LockView { lock, unlock: _ } => lock == view_name,
|
|
||||||
_ => false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn is_active(&self, view_name: &str) -> bool {
|
|
||||||
match self {
|
|
||||||
Action::SetView(view) => view == view_name,
|
|
||||||
Action::LockView { lock, unlock: _ } => lock == view_name,
|
|
||||||
_ => false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
547
src/data.rs
547
src/data.rs
@ -1,7 +1,5 @@
|
|||||||
/**! The parsing of the data files for layouts */
|
/**! The parsing of the data files for 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::env;
|
||||||
@ -15,24 +13,22 @@ use std::vec::Vec;
|
|||||||
|
|
||||||
use xkbcommon::xkb;
|
use xkbcommon::xkb;
|
||||||
|
|
||||||
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::ArrangementKind;
|
use ::layout::ArrangementKind;
|
||||||
use ::logging;
|
|
||||||
use ::resources;
|
use ::resources;
|
||||||
use ::util::c::as_str;
|
use ::util::c::as_str;
|
||||||
use ::util::hash_map_map;
|
use ::util::hash_map_map;
|
||||||
use ::xdg;
|
use ::xdg;
|
||||||
|
|
||||||
// traits, derives
|
// traits, derives
|
||||||
use serde::Deserialize;
|
|
||||||
use std::io::BufReader;
|
use std::io::BufReader;
|
||||||
use std::iter::FromIterator;
|
use std::iter::FromIterator;
|
||||||
use ::logging::Warn;
|
use serde::Deserialize;
|
||||||
|
use util::WarningHandler;
|
||||||
|
|
||||||
|
|
||||||
/// Gathers stuff defined in C or called by C
|
/// Gathers stuff defined in C or called by C
|
||||||
pub mod c {
|
pub mod c {
|
||||||
@ -155,10 +151,18 @@ fn list_layout_sources(
|
|||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct PrintWarnings;
|
||||||
|
|
||||||
|
impl WarningHandler for PrintWarnings {
|
||||||
|
fn handle(&mut self, warning: &str) {
|
||||||
|
println!("{}", warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn load_layout_data(source: DataSource)
|
fn load_layout_data(source: DataSource)
|
||||||
-> Result<::layout::LayoutData, LoadError>
|
-> Result<::layout::LayoutData, LoadError>
|
||||||
{
|
{
|
||||||
let handler = logging::Print {};
|
let handler = PrintWarnings{};
|
||||||
match source {
|
match source {
|
||||||
DataSource::File(path) => {
|
DataSource::File(path) => {
|
||||||
Layout::from_file(path.clone())
|
Layout::from_file(path.clone())
|
||||||
@ -191,21 +195,16 @@ fn load_layout_data_with_fallback(
|
|||||||
(
|
(
|
||||||
LoadError::BadData(Error::Missing(e)),
|
LoadError::BadData(Error::Missing(e)),
|
||||||
DataSource::File(file)
|
DataSource::File(file)
|
||||||
) => log_print!(
|
) => eprintln!( // TODO: print in debug logging level
|
||||||
logging::Level::Debug,
|
|
||||||
"Tried file {:?}, but it's missing: {}",
|
"Tried file {:?}, but it's missing: {}",
|
||||||
file, e
|
file, e
|
||||||
),
|
),
|
||||||
(e, source) => log_print!(
|
(e, source) => eprintln!(
|
||||||
logging::Level::Warning,
|
|
||||||
"Failed to load layout from {}: {}, skipping",
|
"Failed to load layout from {}: {}, skipping",
|
||||||
source, e
|
source, e
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
Ok(layout) => {
|
Ok(layout) => return (kind, layout),
|
||||||
log_print!(logging::Level::Info, "Loaded layout {}", source);
|
|
||||||
return (kind, layout);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -216,20 +215,20 @@ fn load_layout_data_with_fallback(
|
|||||||
#[derive(Debug, Deserialize, PartialEq)]
|
#[derive(Debug, Deserialize, PartialEq)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
pub struct Layout {
|
pub struct Layout {
|
||||||
#[serde(default)]
|
bounds: Bounds,
|
||||||
margins: Margins,
|
|
||||||
views: HashMap<String, Vec<ButtonIds>>,
|
views: HashMap<String, Vec<ButtonIds>>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
buttons: HashMap<String, ButtonMeta>,
|
buttons: HashMap<String, ButtonMeta>,
|
||||||
outlines: HashMap<String, Outline>
|
outlines: HashMap<String, Outline>
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize, PartialEq, Default)]
|
#[derive(Debug, Clone, Deserialize, PartialEq)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
struct Margins {
|
struct Bounds {
|
||||||
top: f64,
|
x: f64,
|
||||||
bottom: f64,
|
y: f64,
|
||||||
side: f64,
|
width: f64,
|
||||||
|
height: f64,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Buttons are embedded in a single string
|
/// Buttons are embedded in a single string
|
||||||
@ -240,20 +239,14 @@ type ButtonIds = String;
|
|||||||
#[derive(Debug, Default, Deserialize, PartialEq)]
|
#[derive(Debug, Default, Deserialize, PartialEq)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
struct ButtonMeta {
|
struct ButtonMeta {
|
||||||
// TODO: structure (action, keysym, text, modifier) as an enum
|
/// Special action to perform on activation. Conflicts with keysym, text.
|
||||||
// to detect conflicts and missing values at compile time
|
|
||||||
/// Special action to perform on activation.
|
|
||||||
/// Conflicts with keysym, text, modifier.
|
|
||||||
action: Option<Action>,
|
action: Option<Action>,
|
||||||
/// The name of the XKB keysym to emit on activation.
|
/// The name of the XKB keysym to emit on activation.
|
||||||
/// Conflicts with action, text, modifier.
|
/// Conflicts with action, text
|
||||||
keysym: Option<String>,
|
keysym: Option<String>,
|
||||||
/// The text to submit on activation. Will be derived from ID if not present
|
/// The text to submit on activation. Will be derived from ID if not present
|
||||||
/// Conflicts with action, keysym, modifier.
|
/// Conflicts with action, keysym
|
||||||
text: Option<String>,
|
text: Option<String>,
|
||||||
/// The modifier to apply while the key is locked
|
|
||||||
/// Conflicts with action, keysym, text
|
|
||||||
modifier: Option<Modifier>,
|
|
||||||
/// If not present, will be derived from text or the button ID
|
/// If not present, will be derived from text or the button ID
|
||||||
label: Option<String>,
|
label: Option<String>,
|
||||||
/// Conflicts with label
|
/// Conflicts with label
|
||||||
@ -271,30 +264,12 @@ enum Action {
|
|||||||
SetView(String),
|
SetView(String),
|
||||||
#[serde(rename="show_prefs")]
|
#[serde(rename="show_prefs")]
|
||||||
ShowPrefs,
|
ShowPrefs,
|
||||||
/// Remove last character
|
|
||||||
#[serde(rename="erase")]
|
|
||||||
Erase,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Deserialize)]
|
|
||||||
#[serde(deny_unknown_fields)]
|
|
||||||
enum Modifier {
|
|
||||||
Control,
|
|
||||||
Shift,
|
|
||||||
Lock,
|
|
||||||
#[serde(alias="Mod1")]
|
|
||||||
Alt,
|
|
||||||
Mod2,
|
|
||||||
Mod3,
|
|
||||||
Mod4,
|
|
||||||
Mod5,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize, PartialEq)]
|
#[derive(Debug, Clone, Deserialize, PartialEq)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
struct Outline {
|
struct Outline {
|
||||||
width: f64,
|
bounds: Bounds,
|
||||||
height: f64,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Errors encountered loading the layout into yaml
|
/// Errors encountered loading the layout into yaml
|
||||||
@ -328,20 +303,6 @@ impl From<io::Error> for Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_offsets<'a, I: 'a, T, F: 'a>(iterator: I, get_size: F)
|
|
||||||
-> impl Iterator<Item=(f64, T)> + 'a
|
|
||||||
where I: Iterator<Item=T>,
|
|
||||||
F: Fn(&T) -> f64,
|
|
||||||
{
|
|
||||||
let mut offset = 0.0;
|
|
||||||
iterator.map(move |item| {
|
|
||||||
let size = get_size(&item);
|
|
||||||
let value = (offset, item);
|
|
||||||
offset += size;
|
|
||||||
value
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Layout {
|
impl Layout {
|
||||||
pub fn from_resource(name: &str) -> Result<Layout, LoadError> {
|
pub fn from_resource(name: &str) -> Result<Layout, LoadError> {
|
||||||
let data = resources::get_keyboard(name)
|
let data = resources::get_keyboard(name)
|
||||||
@ -359,7 +320,7 @@ impl Layout {
|
|||||||
serde_yaml::from_reader(infile).map_err(Error::Yaml)
|
serde_yaml::from_reader(infile).map_err(Error::Yaml)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn build<H: logging::Handler>(self, mut warning_handler: H)
|
pub fn build<H: WarningHandler>(self, mut warning_handler: H)
|
||||||
-> (Result<::layout::LayoutData, FormattingError>, H)
|
-> (Result<::layout::LayoutData, FormattingError>, H)
|
||||||
{
|
{
|
||||||
let button_names = self.views.values()
|
let button_names = self.views.values()
|
||||||
@ -382,45 +343,53 @@ 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()
|
||||||
|
},
|
||||||
|
_ => Vec::new(),
|
||||||
|
};
|
||||||
|
(
|
||||||
|
name.into(),
|
||||||
|
KeyState {
|
||||||
|
pressed: PressType::Released,
|
||||||
|
locked: false,
|
||||||
|
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,
|
||||||
};
|
};
|
||||||
@ -433,67 +402,43 @@ impl Layout {
|
|||||||
)}
|
)}
|
||||||
);
|
);
|
||||||
|
|
||||||
let views: Vec<_> = self.views.iter()
|
let views = HashMap::from_iter(
|
||||||
.map(|(name, view)| {
|
self.views.iter().map(|(name, view)| {(
|
||||||
let rows = view.iter().map(|row| {
|
name.clone(),
|
||||||
let buttons = row.split_ascii_whitespace()
|
Box::new(::layout::View {
|
||||||
.map(|name| {
|
bounds: ::layout::c::Bounds {
|
||||||
Box::new(create_button(
|
x: self.bounds.x,
|
||||||
&self.buttons,
|
y: self.bounds.y,
|
||||||
&self.outlines,
|
width: self.bounds.width,
|
||||||
name,
|
height: self.bounds.height,
|
||||||
button_states_cache.get(name.into())
|
|
||||||
.expect("Button state not created")
|
|
||||||
.clone(),
|
|
||||||
&mut warning_handler,
|
|
||||||
))
|
|
||||||
});
|
|
||||||
layout::Row::new(
|
|
||||||
add_offsets(
|
|
||||||
buttons,
|
|
||||||
|button| button.size.width,
|
|
||||||
).collect()
|
|
||||||
)
|
|
||||||
});
|
|
||||||
let rows = add_offsets(rows, |row| row.get_size().height)
|
|
||||||
.collect();
|
|
||||||
(
|
|
||||||
name.clone(),
|
|
||||||
layout::View::new(rows)
|
|
||||||
)
|
|
||||||
}).collect();
|
|
||||||
|
|
||||||
// Center views on the same point.
|
|
||||||
let views = {
|
|
||||||
let total_size = layout::View::calculate_super_size(
|
|
||||||
views.iter().map(|(_name, view)| view).collect()
|
|
||||||
);
|
|
||||||
|
|
||||||
HashMap::from_iter(views.into_iter().map(|(name, view)| (
|
|
||||||
name,
|
|
||||||
(
|
|
||||||
layout::c::Point {
|
|
||||||
x: (total_size.width - view.get_size().width) / 2.0,
|
|
||||||
y: (total_size.height - view.get_size().height) / 2.0,
|
|
||||||
},
|
},
|
||||||
view,
|
rows: view.iter().map(|row| {
|
||||||
),
|
Box::new(::layout::Row {
|
||||||
)))
|
angle: 0,
|
||||||
};
|
bounds: None,
|
||||||
|
buttons: row.split_ascii_whitespace().map(|name| {
|
||||||
|
Box::new(create_button(
|
||||||
|
&self.buttons,
|
||||||
|
&self.outlines,
|
||||||
|
name,
|
||||||
|
button_states_cache.get(name.into())
|
||||||
|
.expect("Button state not created")
|
||||||
|
.clone(),
|
||||||
|
&mut warning_handler,
|
||||||
|
))
|
||||||
|
}).collect(),
|
||||||
|
})
|
||||||
|
}).collect(),
|
||||||
|
})
|
||||||
|
)})
|
||||||
|
);
|
||||||
|
|
||||||
(
|
(
|
||||||
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
|
|
||||||
margins: layout::Margins {
|
|
||||||
top: self.margins.top,
|
|
||||||
left: self.margins.side,
|
|
||||||
bottom: self.margins.bottom,
|
|
||||||
right: self.margins.side,
|
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
warning_handler,
|
warning_handler,
|
||||||
@ -501,7 +446,7 @@ impl Layout {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_action<H: logging::Handler>(
|
fn create_action<H: WarningHandler>(
|
||||||
button_info: &HashMap<String, ButtonMeta>,
|
button_info: &HashMap<String, ButtonMeta>,
|
||||||
name: &str,
|
name: &str,
|
||||||
view_names: Vec<&String>,
|
view_names: Vec<&String>,
|
||||||
@ -519,35 +464,27 @@ fn create_action<H: logging::Handler>(
|
|||||||
Action(Action),
|
Action(Action),
|
||||||
Text(String),
|
Text(String),
|
||||||
Keysym(String),
|
Keysym(String),
|
||||||
Modifier(Modifier),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let submission = match (
|
let submission = match (
|
||||||
&symbol_meta.action,
|
&symbol_meta.action,
|
||||||
&symbol_meta.keysym,
|
&symbol_meta.keysym,
|
||||||
&symbol_meta.text,
|
&symbol_meta.text
|
||||||
&symbol_meta.modifier,
|
|
||||||
) {
|
) {
|
||||||
(Some(action), None, None, None) => SubmitData::Action(action.clone()),
|
(Some(action), None, None) => SubmitData::Action(action.clone()),
|
||||||
(None, Some(keysym), None, None) => SubmitData::Keysym(keysym.clone()),
|
(None, Some(keysym), None) => SubmitData::Keysym(keysym.clone()),
|
||||||
(None, None, Some(text), None) => SubmitData::Text(text.clone()),
|
(None, None, Some(text)) => SubmitData::Text(text.clone()),
|
||||||
(None, None, None, Some(modifier)) => {
|
(None, None, None) => SubmitData::Text(name.into()),
|
||||||
SubmitData::Modifier(modifier.clone())
|
|
||||||
},
|
|
||||||
(None, None, None, None) => SubmitData::Text(name.into()),
|
|
||||||
_ => {
|
_ => {
|
||||||
warning_handler.handle(
|
warning_handler.handle(&format!(
|
||||||
logging::Level::Warning,
|
"Button {} has more than one of (action, keysym, text)",
|
||||||
&format!(
|
name
|
||||||
"Button {} has more than one of (action, keysym, text, modifier)",
|
));
|
||||||
name,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
SubmitData::Text("".into())
|
SubmitData::Text("".into())
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
fn filter_view_name<H: logging::Handler>(
|
fn filter_view_name<H: WarningHandler>(
|
||||||
button_name: &str,
|
button_name: &str,
|
||||||
view_name: String,
|
view_name: String,
|
||||||
view_names: &Vec<&String>,
|
view_names: &Vec<&String>,
|
||||||
@ -556,13 +493,10 @@ fn create_action<H: logging::Handler>(
|
|||||||
if view_names.contains(&&view_name) {
|
if view_names.contains(&&view_name) {
|
||||||
view_name
|
view_name
|
||||||
} else {
|
} else {
|
||||||
warning_handler.handle(
|
warning_handler.handle(&format!("Button {} switches to missing view {}",
|
||||||
logging::Level::Warning,
|
button_name,
|
||||||
&format!("Button {} switches to missing view {}",
|
view_name,
|
||||||
button_name,
|
));
|
||||||
view_name,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
"base".into()
|
"base".into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -570,7 +504,7 @@ fn create_action<H: logging::Handler>(
|
|||||||
match submission {
|
match submission {
|
||||||
SubmitData::Action(
|
SubmitData::Action(
|
||||||
Action::SetView(view_name)
|
Action::SetView(view_name)
|
||||||
) => ::action::Action::SetView(
|
) => ::action::Action::SetLevel(
|
||||||
filter_view_name(
|
filter_view_name(
|
||||||
name, view_name.clone(), &view_names,
|
name, view_name.clone(), &view_names,
|
||||||
warning_handler,
|
warning_handler,
|
||||||
@ -578,7 +512,7 @@ fn create_action<H: logging::Handler>(
|
|||||||
),
|
),
|
||||||
SubmitData::Action(Action::Locking {
|
SubmitData::Action(Action::Locking {
|
||||||
lock_view, unlock_view
|
lock_view, unlock_view
|
||||||
}) => ::action::Action::LockView {
|
}) => ::action::Action::LockLevel {
|
||||||
lock: filter_view_name(
|
lock: filter_view_name(
|
||||||
name,
|
name,
|
||||||
lock_view.clone(),
|
lock_view.clone(),
|
||||||
@ -595,31 +529,33 @@ fn create_action<H: logging::Handler>(
|
|||||||
SubmitData::Action(
|
SubmitData::Action(
|
||||||
Action::ShowPrefs
|
Action::ShowPrefs
|
||||||
) => ::action::Action::ShowPreferences,
|
) => ::action::Action::ShowPreferences,
|
||||||
SubmitData::Action(Action::Erase) => action::Action::Erase,
|
|
||||||
SubmitData::Keysym(keysym) => ::action::Action::Submit {
|
SubmitData::Keysym(keysym) => ::action::Action::Submit {
|
||||||
text: None,
|
text: None,
|
||||||
keys: vec!(::action::KeySym(
|
keys: vec!(::action::KeySym(
|
||||||
match keysym_valid(keysym.as_str()) {
|
match keysym_valid(keysym.as_str()) {
|
||||||
true => keysym.clone(),
|
true => keysym.clone(),
|
||||||
false => {
|
false => {
|
||||||
warning_handler.handle(
|
warning_handler.handle(&format!(
|
||||||
logging::Level::Warning,
|
"Keysym name invalid: {}",
|
||||||
&format!(
|
keysym,
|
||||||
"Keysym name invalid: {}",
|
));
|
||||||
keysym,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
"space".into() // placeholder
|
"space".into() // placeholder
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
)),
|
)),
|
||||||
},
|
},
|
||||||
SubmitData::Text(text) => ::action::Action::Submit {
|
SubmitData::Text(text) => ::action::Action::Submit {
|
||||||
text: CString::new(text.clone()).or_warn(
|
text: {
|
||||||
warning_handler,
|
CString::new(text.clone())
|
||||||
logging::Problem::Warning,
|
.map_err(|e| {
|
||||||
&format!("Text {} contains problems", text),
|
warning_handler.handle(&format!(
|
||||||
),
|
"Text {} contains problems: {:?}",
|
||||||
|
text,
|
||||||
|
e
|
||||||
|
));
|
||||||
|
e
|
||||||
|
}).ok()
|
||||||
|
},
|
||||||
keys: text.chars().map(|codepoint| {
|
keys: text.chars().map(|codepoint| {
|
||||||
let codepoint_string = codepoint.to_string();
|
let codepoint_string = codepoint.to_string();
|
||||||
::action::KeySym(match keysym_valid(codepoint_string.as_str()) {
|
::action::KeySym(match keysym_valid(codepoint_string.as_str()) {
|
||||||
@ -627,33 +563,13 @@ fn create_action<H: logging::Handler>(
|
|||||||
false => format!("U{:04X}", codepoint as u32),
|
false => format!("U{:04X}", codepoint as u32),
|
||||||
})
|
})
|
||||||
}).collect(),
|
}).collect(),
|
||||||
},
|
}
|
||||||
SubmitData::Modifier(modifier) => match modifier {
|
|
||||||
Modifier::Control => action::Action::ApplyModifier(
|
|
||||||
action::Modifier::Control,
|
|
||||||
),
|
|
||||||
Modifier::Alt => action::Action::ApplyModifier(
|
|
||||||
action::Modifier::Alt,
|
|
||||||
),
|
|
||||||
unsupported_modifier => {
|
|
||||||
warning_handler.handle(
|
|
||||||
logging::Level::Bug,
|
|
||||||
&format!(
|
|
||||||
"Modifier {:?} unsupported", unsupported_modifier,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
action::Action::Submit {
|
|
||||||
text: None,
|
|
||||||
keys: Vec::new(),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// TODO: Since this will receive user-provided data,
|
/// TODO: Since this will receive user-provided data,
|
||||||
/// all .expect() on them should be turned into soft fails
|
/// all .expect() on them should be turned into soft fails
|
||||||
fn create_button<H: logging::Handler>(
|
fn create_button<H: WarningHandler>(
|
||||||
button_info: &HashMap<String, ButtonMeta>,
|
button_info: &HashMap<String, ButtonMeta>,
|
||||||
outlines: &HashMap<String, Outline>,
|
outlines: &HashMap<String, Outline>,
|
||||||
name: &str,
|
name: &str,
|
||||||
@ -677,11 +593,14 @@ fn create_button<H: logging::Handler>(
|
|||||||
} else if let Some(text) = &button_meta.text {
|
} else if let Some(text) = &button_meta.text {
|
||||||
::layout::Label::Text(
|
::layout::Label::Text(
|
||||||
CString::new(text.as_str())
|
CString::new(text.as_str())
|
||||||
.or_warn(
|
.unwrap_or_else(|e| {
|
||||||
warning_handler,
|
warning_handler.handle(&format!(
|
||||||
logging::Problem::Warning,
|
"Text {} is invalid: {}",
|
||||||
&format!("Text {} is invalid", text),
|
text,
|
||||||
).unwrap_or_else(|| CString::new("").unwrap())
|
e,
|
||||||
|
));
|
||||||
|
CString::new("").unwrap()
|
||||||
|
})
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
::layout::Label::Text(cname.clone())
|
::layout::Label::Text(cname.clone())
|
||||||
@ -692,10 +611,7 @@ fn create_button<H: logging::Handler>(
|
|||||||
if outlines.contains_key(outline) {
|
if outlines.contains_key(outline) {
|
||||||
outline.clone()
|
outline.clone()
|
||||||
} else {
|
} else {
|
||||||
warning_handler.handle(
|
warning_handler.handle(&format!("Outline named {} does not exist! Using default for button {}", outline, name));
|
||||||
logging::Level::Warning,
|
|
||||||
&format!("Outline named {} does not exist! Using default for button {}", outline, name)
|
|
||||||
);
|
|
||||||
"default".into()
|
"default".into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -704,63 +620,50 @@ fn create_button<H: logging::Handler>(
|
|||||||
|
|
||||||
let outline = outlines.get(&outline_name)
|
let outline = outlines.get(&outline_name)
|
||||||
.map(|outline| (*outline).clone())
|
.map(|outline| (*outline).clone())
|
||||||
.or_warn(
|
.unwrap_or_else(|| {
|
||||||
warning_handler,
|
warning_handler.handle(
|
||||||
logging::Problem::Warning,
|
&format!("No default outline defined! Using 1x1!")
|
||||||
"No default outline defined! Using 1x1!",
|
);
|
||||||
).unwrap_or(Outline { width: 1f64, height: 1f64 });
|
Outline {
|
||||||
|
bounds: Bounds { x: 0f64, y: 0f64, width: 1f64, height: 1f64 },
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
layout::Button {
|
::layout::Button {
|
||||||
name: cname,
|
name: cname,
|
||||||
outline_name: CString::new(outline_name).expect("Bad outline"),
|
outline_name: CString::new(outline_name).expect("Bad outline"),
|
||||||
// TODO: do layout before creating buttons
|
// TODO: do layout before creating buttons
|
||||||
size: layout::Size {
|
bounds: ::layout::c::Bounds {
|
||||||
width: outline.width,
|
x: outline.bounds.x,
|
||||||
height: outline.height,
|
y: outline.bounds.y,
|
||||||
|
width: outline.bounds.width,
|
||||||
|
height: outline.bounds.height,
|
||||||
},
|
},
|
||||||
label: label,
|
label: label,
|
||||||
state: state,
|
state: state,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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::error::Error as ErrorTrait;
|
||||||
|
|
||||||
use ::logging::ProblemPanic;
|
struct PanicWarn;
|
||||||
|
|
||||||
const THIS_FILE: &str = file!();
|
impl WarningHandler for PanicWarn {
|
||||||
|
fn handle(&mut self, warning: &str) {
|
||||||
fn path_from_root(file: &'static str) -> PathBuf {
|
panic!("{}", warning);
|
||||||
PathBuf::from(THIS_FILE)
|
}
|
||||||
.parent().unwrap()
|
|
||||||
.parent().unwrap()
|
|
||||||
.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 },
|
bounds: Bounds { x: 0f64, y: 0f64, width: 0f64, height: 0f64 },
|
||||||
views: hashmap!(
|
views: hashmap!(
|
||||||
"base".into() => vec!("test".into()),
|
"base".into() => vec!("test".into()),
|
||||||
),
|
),
|
||||||
@ -770,13 +673,16 @@ mod tests {
|
|||||||
keysym: None,
|
keysym: None,
|
||||||
action: None,
|
action: None,
|
||||||
text: None,
|
text: None,
|
||||||
modifier: None,
|
|
||||||
label: Some("test".into()),
|
label: Some("test".into()),
|
||||||
outline: None,
|
outline: None,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
outlines: hashmap!{
|
outlines: hashmap!{
|
||||||
"default".into() => Outline { width: 0f64, height: 0f64 },
|
"default".into() => Outline {
|
||||||
|
bounds: Bounds {
|
||||||
|
x: 0f64, y: 0f64, width: 0f64, height: 0f64
|
||||||
|
},
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -785,14 +691,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);
|
||||||
@ -804,13 +709,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 {
|
||||||
@ -823,14 +728,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(PanicWarn).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
out.views["base"].1
|
out.views["base"]
|
||||||
.get_rows()[0].1
|
.rows[0]
|
||||||
.get_buttons()[0].1
|
.buttons[0]
|
||||||
.label,
|
.label,
|
||||||
::layout::Label::Text(CString::new("test").unwrap())
|
::layout::Label::Text(CString::new("test").unwrap())
|
||||||
);
|
);
|
||||||
@ -838,14 +743,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(PanicWarn).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
out.views["base"].1
|
out.views["base"]
|
||||||
.get_rows()[0].1
|
.rows[0]
|
||||||
.get_buttons()[0].1
|
.buttons[0]
|
||||||
.label,
|
.label,
|
||||||
::layout::Label::Text(CString::new("test").unwrap())
|
::layout::Label::Text(CString::new("test").unwrap())
|
||||||
);
|
);
|
||||||
@ -854,41 +759,24 @@ 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(PanicWarn).0
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
out.views["base"].1
|
out.views["base"]
|
||||||
.get_rows()[0].1
|
.rows[0]
|
||||||
.get_buttons()[0].1
|
.buttons[0]
|
||||||
.state.borrow()
|
.state.borrow()
|
||||||
.keycodes.len(),
|
.keycodes.len(),
|
||||||
2
|
2
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Test if erase yields a useable keycode
|
|
||||||
#[test]
|
|
||||||
fn test_layout_erase() {
|
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_erase.yaml"))
|
|
||||||
.unwrap()
|
|
||||||
.build(ProblemPanic).0
|
|
||||||
.unwrap();
|
|
||||||
assert_eq!(
|
|
||||||
out.views["base"].1
|
|
||||||
.get_rows()[0].1
|
|
||||||
.get_buttons()[0].1
|
|
||||||
.state.borrow()
|
|
||||||
.keycodes.len(),
|
|
||||||
1
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parsing_fallback() {
|
fn parsing_fallback() {
|
||||||
assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
|
assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
|
||||||
.map(|layout| layout.build(ProblemPanic).0.unwrap())
|
.map(|layout| layout.build(PanicWarn).0.unwrap())
|
||||||
.is_ok()
|
.is_ok()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -930,14 +818,13 @@ mod tests {
|
|||||||
keysym: None,
|
keysym: None,
|
||||||
text: None,
|
text: None,
|
||||||
action: None,
|
action: None,
|
||||||
modifier: None,
|
|
||||||
label: Some("test".into()),
|
label: Some("test".into()),
|
||||||
outline: None,
|
outline: None,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
".",
|
".",
|
||||||
Vec::new(),
|
Vec::new(),
|
||||||
&mut ProblemPanic,
|
&mut PanicWarn,
|
||||||
),
|
),
|
||||||
::action::Action::Submit {
|
::action::Action::Submit {
|
||||||
text: Some(CString::new(".").unwrap()),
|
text: Some(CString::new(".").unwrap()),
|
||||||
@ -945,52 +832,4 @@ mod tests {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_layout_margins() {
|
|
||||||
let out = Layout::from_file(path_from_root("tests/layout_margins.yaml"))
|
|
||||||
.unwrap()
|
|
||||||
.build(ProblemPanic).0
|
|
||||||
.unwrap();
|
|
||||||
assert_eq!(
|
|
||||||
out.margins,
|
|
||||||
layout::Margins {
|
|
||||||
top: 1.0,
|
|
||||||
bottom: 3.0,
|
|
||||||
left: 2.0,
|
|
||||||
right: 2.0,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[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"],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
124
src/dbus.c
124
src/dbus.c
@ -1,124 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
|
||||||
* Copyright (C) 2010-2011 Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include "dbus.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <gio/gio.h>
|
|
||||||
|
|
||||||
void
|
|
||||||
dbus_handler_destroy(DBusHandler *service)
|
|
||||||
{
|
|
||||||
g_free (service->object_path);
|
|
||||||
|
|
||||||
if (service->connection) {
|
|
||||||
if (service->registration_id > 0) {
|
|
||||||
g_dbus_connection_unregister_object (service->connection,
|
|
||||||
service->registration_id);
|
|
||||||
service->registration_id = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_object_unref (service->connection);
|
|
||||||
service->connection = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (service->introspection_data) {
|
|
||||||
g_dbus_node_info_unref (service->introspection_data);
|
|
||||||
service->introspection_data = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (service->context) {
|
|
||||||
g_signal_handlers_disconnect_by_data (service->context, service);
|
|
||||||
service->context = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
free(service);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
|
|
||||||
gboolean arg_visible, gpointer user_data) {
|
|
||||||
DBusHandler *service = user_data;
|
|
||||||
|
|
||||||
if (service->context) {
|
|
||||||
if (arg_visible) {
|
|
||||||
server_context_service_show_keyboard (service->context);
|
|
||||||
} else {
|
|
||||||
server_context_service_hide_keyboard (service->context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sm_puri_osk0_complete_set_visible(object, invocation);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void on_visible(DBusHandler *service,
|
|
||||||
GParamSpec *pspec,
|
|
||||||
ServerContextService *context)
|
|
||||||
{
|
|
||||||
(void)pspec;
|
|
||||||
gboolean visible;
|
|
||||||
|
|
||||||
g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (context));
|
|
||||||
|
|
||||||
g_object_get (context, "visible", &visible, NULL);
|
|
||||||
|
|
||||||
sm_puri_osk0_set_visible(service->dbus_interface, visible);
|
|
||||||
}
|
|
||||||
|
|
||||||
DBusHandler *
|
|
||||||
dbus_handler_new (GDBusConnection *connection,
|
|
||||||
const gchar *object_path)
|
|
||||||
{
|
|
||||||
DBusHandler *self = calloc(1, sizeof(DBusHandler));
|
|
||||||
self->object_path = g_strdup(object_path);
|
|
||||||
self->connection = connection;
|
|
||||||
|
|
||||||
self->dbus_interface = sm_puri_osk0_skeleton_new();
|
|
||||||
g_signal_connect(self->dbus_interface, "handle-set-visible",
|
|
||||||
G_CALLBACK(handle_set_visible), self);
|
|
||||||
|
|
||||||
if (self->connection && self->object_path) {
|
|
||||||
GError *error = NULL;
|
|
||||||
|
|
||||||
if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(self->dbus_interface),
|
|
||||||
self->connection,
|
|
||||||
self->object_path,
|
|
||||||
&error)) {
|
|
||||||
g_warning("Error registering dbus object: %s\n", error->message);
|
|
||||||
g_clear_error(&error);
|
|
||||||
// TODO: return an error
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
dbus_handler_set_ui_context(DBusHandler *service,
|
|
||||||
ServerContextService *context)
|
|
||||||
{
|
|
||||||
g_return_if_fail (!service->context);
|
|
||||||
|
|
||||||
service->context = context;
|
|
||||||
|
|
||||||
g_signal_connect_swapped (service->context,
|
|
||||||
"notify::visible",
|
|
||||||
G_CALLBACK(on_visible),
|
|
||||||
service);
|
|
||||||
}
|
|
||||||
48
src/dbus.h
48
src/dbus.h
@ -1,48 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
|
||||||
* Copyright (C) 2010-2011 Red Hat, Inc.
|
|
||||||
* Copyright (C) 2019-2020 Purism, SPC
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#ifndef DBUS_H_
|
|
||||||
#define DBUS_H_ 1
|
|
||||||
|
|
||||||
#include "server-context-service.h"
|
|
||||||
|
|
||||||
#include "sm.puri.OSK0.h"
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
#define DBUS_SERVICE_PATH "/sm/puri/OSK0"
|
|
||||||
#define DBUS_SERVICE_INTERFACE "sm.puri.OSK0"
|
|
||||||
|
|
||||||
typedef struct _DBusHandler
|
|
||||||
{
|
|
||||||
GDBusConnection *connection;
|
|
||||||
SmPuriOSK0 *dbus_interface;
|
|
||||||
GDBusNodeInfo *introspection_data;
|
|
||||||
guint registration_id;
|
|
||||||
char *object_path;
|
|
||||||
|
|
||||||
ServerContextService *context; // unowned reference
|
|
||||||
} DBusHandler;
|
|
||||||
|
|
||||||
DBusHandler * dbus_handler_new (GDBusConnection *connection,
|
|
||||||
const gchar *object_path);
|
|
||||||
void dbus_handler_set_ui_context(DBusHandler *service,
|
|
||||||
ServerContextService *context);
|
|
||||||
void dbus_handler_destroy(DBusHandler*);
|
|
||||||
G_END_DECLS
|
|
||||||
#endif /* DBUS_H_ */
|
|
||||||
127
src/drawing.rs
127
src/drawing.rs
@ -1,127 +0,0 @@
|
|||||||
/*! Drawing the UI */
|
|
||||||
|
|
||||||
use cairo;
|
|
||||||
use std::cell::RefCell;
|
|
||||||
|
|
||||||
use ::action::Action;
|
|
||||||
use ::keyboard;
|
|
||||||
use ::layout::{ Button, Layout };
|
|
||||||
use ::layout::c::{ EekGtkKeyboard, Point };
|
|
||||||
use ::submission::Submission;
|
|
||||||
|
|
||||||
use glib::translate::FromGlibPtrNone;
|
|
||||||
use gtk::WidgetExt;
|
|
||||||
|
|
||||||
mod c {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
use cairo_sys;
|
|
||||||
use std::os::raw::c_void;
|
|
||||||
|
|
||||||
// This is constructed only in C, no need for warnings
|
|
||||||
#[allow(dead_code)]
|
|
||||||
#[repr(transparent)]
|
|
||||||
#[derive(Clone, Copy)]
|
|
||||||
pub struct EekRenderer(*const c_void);
|
|
||||||
|
|
||||||
#[no_mangle]
|
|
||||||
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)]
|
|
||||||
pub fn eek_render_button(
|
|
||||||
renderer: EekRenderer,
|
|
||||||
cr: *mut cairo_sys::cairo_t,
|
|
||||||
button: *const Button,
|
|
||||||
pressed: u64,
|
|
||||||
locked: u64,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Draws all buttons that are not in the base state
|
|
||||||
#[no_mangle]
|
|
||||||
pub extern "C"
|
|
||||||
fn squeek_layout_draw_all_changed(
|
|
||||||
layout: *mut Layout,
|
|
||||||
renderer: EekRenderer,
|
|
||||||
cr: *mut cairo_sys::cairo_t,
|
|
||||||
submission: *const Submission,
|
|
||||||
) {
|
|
||||||
let layout = unsafe { &mut *layout };
|
|
||||||
let submission = unsafe { &*submission };
|
|
||||||
let cr = unsafe { cairo::Context::from_raw_none(cr) };
|
|
||||||
let active_modifiers = submission.get_active_modifiers();
|
|
||||||
|
|
||||||
layout.foreach_visible_button(|offset, button| {
|
|
||||||
let state = RefCell::borrow(&button.state).clone();
|
|
||||||
let active_mod = match &state.action {
|
|
||||||
Action::ApplyModifier(m) => active_modifiers.contains(m),
|
|
||||||
_ => false,
|
|
||||||
};
|
|
||||||
let locked = state.action.is_active(&layout.current_view)
|
|
||||||
| active_mod;
|
|
||||||
if state.pressed == keyboard::PressType::Pressed || locked {
|
|
||||||
render_button_at_position(
|
|
||||||
renderer, &cr,
|
|
||||||
offset,
|
|
||||||
button.as_ref(),
|
|
||||||
state.pressed, locked,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[no_mangle]
|
|
||||||
pub extern "C"
|
|
||||||
fn squeek_draw_layout_base_view(
|
|
||||||
layout: *mut Layout,
|
|
||||||
renderer: EekRenderer,
|
|
||||||
cr: *mut cairo_sys::cairo_t,
|
|
||||||
) {
|
|
||||||
let layout = unsafe { &mut *layout };
|
|
||||||
let cr = unsafe { cairo::Context::from_raw_none(cr) };
|
|
||||||
|
|
||||||
layout.foreach_visible_button(|offset, button| {
|
|
||||||
render_button_at_position(
|
|
||||||
renderer, &cr,
|
|
||||||
offset,
|
|
||||||
button.as_ref(),
|
|
||||||
keyboard::PressType::Released, false,
|
|
||||||
);
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Renders a button at a position (button's own bounds ignored)
|
|
||||||
pub fn render_button_at_position(
|
|
||||||
renderer: c::EekRenderer,
|
|
||||||
cr: &cairo::Context,
|
|
||||||
position: Point,
|
|
||||||
button: &Button,
|
|
||||||
pressed: keyboard::PressType,
|
|
||||||
locked: bool,
|
|
||||||
) {
|
|
||||||
cr.save();
|
|
||||||
cr.translate(position.x, position.y);
|
|
||||||
cr.rectangle(
|
|
||||||
0.0, 0.0,
|
|
||||||
button.size.width, button.size.height
|
|
||||||
);
|
|
||||||
cr.clip();
|
|
||||||
unsafe {
|
|
||||||
c::eek_render_button(
|
|
||||||
renderer,
|
|
||||||
cairo::Context::to_raw_none(&cr),
|
|
||||||
button as *const Button,
|
|
||||||
pressed as u64,
|
|
||||||
locked as u64,
|
|
||||||
)
|
|
||||||
};
|
|
||||||
cr.restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn queue_redraw(keyboard: EekGtkKeyboard) {
|
|
||||||
let widget = unsafe { gtk::Widget::from_glib_none(keyboard.0) };
|
|
||||||
widget.queue_draw();
|
|
||||||
}
|
|
||||||
@ -1,17 +1,9 @@
|
|||||||
#include "submission.h"
|
#include "imservice.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
struct imservice;
|
#include "eekboard/eekboard-context-service.h"
|
||||||
|
|
||||||
void imservice_handle_input_method_activate(void *data, struct zwp_input_method_v2 *input_method);
|
|
||||||
void imservice_handle_input_method_deactivate(void *data, struct zwp_input_method_v2 *input_method);
|
|
||||||
void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *input_method,
|
|
||||||
const char *text, uint32_t cursor, uint32_t anchor);
|
|
||||||
void imservice_handle_done(void *data, struct zwp_input_method_v2 *input_method);
|
|
||||||
void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose);
|
|
||||||
void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause);
|
|
||||||
void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method);
|
|
||||||
|
|
||||||
static const struct zwp_input_method_v2_listener input_method_listener = {
|
static const struct zwp_input_method_v2_listener input_method_listener = {
|
||||||
.activate = imservice_handle_input_method_activate,
|
.activate = imservice_handle_input_method_activate,
|
||||||
@ -19,51 +11,29 @@ static const struct zwp_input_method_v2_listener input_method_listener = {
|
|||||||
.surrounding_text = imservice_handle_surrounding_text,
|
.surrounding_text = imservice_handle_surrounding_text,
|
||||||
.text_change_cause = imservice_handle_text_change_cause,
|
.text_change_cause = imservice_handle_text_change_cause,
|
||||||
.content_type = imservice_handle_content_type,
|
.content_type = imservice_handle_content_type,
|
||||||
.done = imservice_handle_done,
|
.done = imservice_handle_commit_state,
|
||||||
.unavailable = imservice_handle_unavailable,
|
.unavailable = imservice_handle_unavailable,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
|
struct imservice* get_imservice(EekboardContextService *context,
|
||||||
struct zwp_virtual_keyboard_manager_v1 *vkmanager,
|
struct zwp_input_method_manager_v2 *manager,
|
||||||
struct wl_seat *seat,
|
struct wl_seat *seat) {
|
||||||
EekboardContextService *state) {
|
struct zwp_input_method_v2 *im = zwp_input_method_manager_v2_get_input_method(manager, seat);
|
||||||
struct zwp_input_method_v2 *im = NULL;
|
struct imservice *imservice = imservice_new(im, context);
|
||||||
if (immanager) {
|
|
||||||
im = zwp_input_method_manager_v2_get_input_method(immanager, seat);
|
|
||||||
}
|
|
||||||
struct zwp_virtual_keyboard_v1 *vk = NULL;
|
|
||||||
if (vkmanager) {
|
|
||||||
vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat);
|
|
||||||
}
|
|
||||||
return submission_new(im, vk, state);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Un-inlined
|
/* Add a listener, passing the imservice instance to make it available to
|
||||||
struct zwp_input_method_v2 *imservice_manager_get_input_method(struct zwp_input_method_manager_v2 *manager,
|
callbacks. */
|
||||||
struct wl_seat *seat) {
|
|
||||||
return zwp_input_method_manager_v2_get_input_method(manager, seat);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Un-inlined to let Rust link to it
|
|
||||||
void imservice_connect_listeners(struct zwp_input_method_v2 *im, struct imservice* imservice) {
|
|
||||||
zwp_input_method_v2_add_listener(im, &input_method_listener, imservice);
|
zwp_input_method_v2_add_listener(im, &input_method_listener, imservice);
|
||||||
|
|
||||||
|
return imservice;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void imservice_make_visible(EekboardContextService *context) {
|
||||||
eek_input_method_commit_string(struct zwp_input_method_v2 *zwp_input_method_v2, const char *text)
|
eekboard_context_service_show_keyboard (context);
|
||||||
{
|
|
||||||
zwp_input_method_v2_commit_string(zwp_input_method_v2, text);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void imservice_try_hide(EekboardContextService *context) {
|
||||||
eek_input_method_delete_surrounding_text(struct zwp_input_method_v2 *zwp_input_method_v2, uint32_t before_length, uint32_t after_length) {
|
eekboard_context_service_hide_keyboard (context);
|
||||||
zwp_input_method_v2_delete_surrounding_text(zwp_input_method_v2, before_length, after_length);
|
|
||||||
};
|
|
||||||
|
|
||||||
void
|
|
||||||
eek_input_method_commit(struct zwp_input_method_v2 *zwp_input_method_v2, uint32_t serial)
|
|
||||||
{
|
|
||||||
zwp_input_method_v2_commit(zwp_input_method_v2, serial);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Declared explicitly because _destroy is inline,
|
/// Declared explicitly because _destroy is inline,
|
||||||
|
|||||||
@ -0,0 +1,25 @@
|
|||||||
|
#ifndef __IMSERVICE_H
|
||||||
|
#define __IMSERVICE_H
|
||||||
|
|
||||||
|
#include "input-method-unstable-v2-client-protocol.h"
|
||||||
|
#include "eek/eek-types.h"
|
||||||
|
|
||||||
|
struct imservice;
|
||||||
|
|
||||||
|
struct imservice* get_imservice(EekboardContextService *context,
|
||||||
|
struct zwp_input_method_manager_v2 *manager,
|
||||||
|
struct wl_seat *seat);
|
||||||
|
|
||||||
|
// Defined in Rust
|
||||||
|
struct imservice* imservice_new(struct zwp_input_method_v2 *im,
|
||||||
|
EekboardContextService *context);
|
||||||
|
void imservice_handle_input_method_activate(void *data, struct zwp_input_method_v2 *input_method);
|
||||||
|
void imservice_handle_input_method_deactivate(void *data, struct zwp_input_method_v2 *input_method);
|
||||||
|
void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *input_method,
|
||||||
|
const char *text, uint32_t cursor, uint32_t anchor);
|
||||||
|
void imservice_handle_commit_state(void *data, struct zwp_input_method_v2 *input_method);
|
||||||
|
void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose);
|
||||||
|
void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause);
|
||||||
|
void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
228
src/imservice.rs
228
src/imservice.rs
@ -1,55 +1,58 @@
|
|||||||
/*! Manages zwp_input_method_v2 protocol.
|
|
||||||
*
|
|
||||||
* Library module.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::boxed::Box;
|
use std::boxed::Box;
|
||||||
use std::ffi::CString;
|
use std::ffi::CString;
|
||||||
use std::fmt;
|
|
||||||
use std::num::Wrapping;
|
use std::num::Wrapping;
|
||||||
use std::string::String;
|
use std::string::String;
|
||||||
|
|
||||||
use ::logging;
|
|
||||||
use ::util::c::into_cstring;
|
use ::util::c::into_cstring;
|
||||||
|
|
||||||
// Traits
|
// Traits
|
||||||
use std::convert::TryFrom;
|
use std::convert::TryFrom;
|
||||||
use ::logging::Warn;
|
|
||||||
|
|
||||||
|
|
||||||
/// Gathers stuff defined in C or called by C
|
/// Gathers stuff defined in C or called by C
|
||||||
pub mod c {
|
pub mod c {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
use std::os::raw::{c_char, c_void};
|
use std::os::raw::{c_char, c_void};
|
||||||
|
|
||||||
pub use ::submission::c::UIManager;
|
|
||||||
pub use ::submission::c::StateManager;
|
|
||||||
|
|
||||||
// The following defined in C
|
// The following defined in C
|
||||||
|
|
||||||
/// struct zwp_input_method_v2*
|
/// struct zwp_input_method_v2*
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
pub struct InputMethod(*const c_void);
|
pub struct InputMethod(*const c_void);
|
||||||
|
|
||||||
|
/// EekboardContextService*
|
||||||
|
#[repr(transparent)]
|
||||||
|
pub struct UIManager(*const c_void);
|
||||||
|
|
||||||
#[no_mangle]
|
#[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
|
fn eekboard_context_service_set_hint_purpose(imservice: *const UIManager, hint: u32, purpose: u32);
|
||||||
pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
|
fn eekboard_context_service_show_keyboard(imservice: *const UIManager);
|
||||||
pub fn eek_input_method_commit_string(im: *mut InputMethod, text: *const c_char);
|
fn eekboard_context_service_hide_keyboard(imservice: *const UIManager);
|
||||||
pub fn eek_input_method_delete_surrounding_text(im: *mut InputMethod, before: u32, after: u32);
|
|
||||||
pub fn eek_input_method_commit(im: *mut InputMethod, serial: u32);
|
|
||||||
fn eekboard_context_service_set_hint_purpose(state: *const StateManager, hint: u32, purpose: u32);
|
|
||||||
fn server_context_service_show_keyboard(imservice: *const UIManager);
|
|
||||||
fn server_context_service_hide_keyboard(imservice: *const UIManager);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
|
// The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C"
|
||||||
|
fn imservice_new(im: *const InputMethod, ui_manager: *const UIManager) -> *mut IMService {
|
||||||
|
Box::<IMService>::into_raw(Box::new(
|
||||||
|
IMService {
|
||||||
|
im: im,
|
||||||
|
ui_manager: ui_manager,
|
||||||
|
pending: IMProtocolState::default(),
|
||||||
|
current: IMProtocolState::default(),
|
||||||
|
preedit_string: String::new(),
|
||||||
|
serial: Wrapping(0u32),
|
||||||
|
}
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: is unsafe needed here?
|
// TODO: is unsafe needed here?
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_input_method_activate(imservice: *mut IMService,
|
fn imservice_handle_input_method_activate(imservice: *mut IMService,
|
||||||
im: *const InputMethod)
|
im: *const InputMethod)
|
||||||
{
|
{
|
||||||
@ -62,7 +65,7 @@ pub mod c {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_input_method_deactivate(imservice: *mut IMService,
|
fn imservice_handle_input_method_deactivate(imservice: *mut IMService,
|
||||||
im: *const InputMethod)
|
im: *const InputMethod)
|
||||||
{
|
{
|
||||||
@ -74,7 +77,7 @@ pub mod c {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_surrounding_text(imservice: *mut IMService,
|
fn imservice_handle_surrounding_text(imservice: *mut IMService,
|
||||||
im: *const InputMethod,
|
im: *const InputMethod,
|
||||||
text: *const c_char, cursor: u32, _anchor: u32)
|
text: *const c_char, cursor: u32, _anchor: u32)
|
||||||
@ -90,7 +93,7 @@ pub mod c {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_content_type(imservice: *mut IMService,
|
fn imservice_handle_content_type(imservice: *mut IMService,
|
||||||
im: *const InputMethod,
|
im: *const InputMethod,
|
||||||
hint: u32, purpose: u32)
|
hint: u32, purpose: u32)
|
||||||
@ -98,27 +101,23 @@ pub mod c {
|
|||||||
let imservice = check_imservice(imservice, im).unwrap();
|
let imservice = check_imservice(imservice, im).unwrap();
|
||||||
imservice.pending = IMProtocolState {
|
imservice.pending = IMProtocolState {
|
||||||
content_hint: {
|
content_hint: {
|
||||||
ContentHint::from_bits(hint)
|
ContentHint::from_bits(hint).unwrap_or_else(|| {
|
||||||
.or_print(
|
eprintln!("Warning: received invalid hint flags");
|
||||||
logging::Problem::Warning,
|
ContentHint::NONE
|
||||||
"Received invalid hint flags",
|
})
|
||||||
)
|
|
||||||
.unwrap_or(ContentHint::NONE)
|
|
||||||
},
|
},
|
||||||
content_purpose: {
|
content_purpose: {
|
||||||
ContentPurpose::try_from(purpose)
|
ContentPurpose::try_from(purpose).unwrap_or_else(|_e| {
|
||||||
.or_print(
|
eprintln!("Warning: Received invalid purpose value");
|
||||||
logging::Problem::Warning,
|
ContentPurpose::Normal
|
||||||
"Received invalid purpose value",
|
})
|
||||||
)
|
|
||||||
.unwrap_or(ContentPurpose::Normal)
|
|
||||||
},
|
},
|
||||||
..imservice.pending.clone()
|
..imservice.pending.clone()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_text_change_cause(imservice: *mut IMService,
|
fn imservice_handle_text_change_cause(imservice: *mut IMService,
|
||||||
im: *const InputMethod,
|
im: *const InputMethod,
|
||||||
cause: u32)
|
cause: u32)
|
||||||
@ -126,68 +125,56 @@ pub mod c {
|
|||||||
let imservice = check_imservice(imservice, im).unwrap();
|
let imservice = check_imservice(imservice, im).unwrap();
|
||||||
imservice.pending = IMProtocolState {
|
imservice.pending = IMProtocolState {
|
||||||
text_change_cause: {
|
text_change_cause: {
|
||||||
ChangeCause::try_from(cause)
|
ChangeCause::try_from(cause).unwrap_or_else(|_e| {
|
||||||
.or_print(
|
eprintln!("Warning: received invalid cause value");
|
||||||
logging::Problem::Warning,
|
ChangeCause::InputMethod
|
||||||
"Received invalid cause value",
|
})
|
||||||
)
|
|
||||||
.unwrap_or(ChangeCause::InputMethod)
|
|
||||||
},
|
},
|
||||||
..imservice.pending.clone()
|
..imservice.pending.clone()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_done(imservice: *mut IMService,
|
fn imservice_handle_commit_state(imservice: *mut IMService,
|
||||||
im: *const InputMethod)
|
im: *const InputMethod)
|
||||||
{
|
{
|
||||||
let imservice = check_imservice(imservice, im).unwrap();
|
let imservice = check_imservice(imservice, im).unwrap();
|
||||||
let active_changed = imservice.current.active ^ imservice.pending.active;
|
let active_changed = imservice.current.active ^ imservice.pending.active;
|
||||||
|
|
||||||
|
imservice.serial += Wrapping(1u32);
|
||||||
imservice.current = imservice.pending.clone();
|
imservice.current = imservice.pending.clone();
|
||||||
imservice.pending = IMProtocolState {
|
imservice.pending = IMProtocolState {
|
||||||
active: imservice.current.active,
|
active: imservice.current.active,
|
||||||
..IMProtocolState::default()
|
..IMProtocolState::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
if active_changed {
|
if active_changed {
|
||||||
if imservice.current.active {
|
if imservice.current.active {
|
||||||
if let Some(ui) = imservice.ui_manager {
|
eekboard_context_service_show_keyboard(imservice.ui_manager);
|
||||||
unsafe { server_context_service_show_keyboard(ui); }
|
eekboard_context_service_set_hint_purpose(
|
||||||
}
|
imservice.ui_manager,
|
||||||
unsafe {
|
imservice.current.content_hint.bits(),
|
||||||
eekboard_context_service_set_hint_purpose(
|
imservice.current.content_purpose.clone() as u32);
|
||||||
imservice.state_manager,
|
|
||||||
imservice.current.content_hint.bits(),
|
|
||||||
imservice.current.content_purpose.clone() as u32,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if let Some(ui) = imservice.ui_manager {
|
eekboard_context_service_hide_keyboard(imservice.ui_manager);
|
||||||
unsafe { server_context_service_hide_keyboard(ui); }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: this is really untested
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_unavailable(imservice: *mut IMService,
|
fn imservice_handle_unavailable(imservice: *mut IMService,
|
||||||
im: *mut InputMethod)
|
im: *mut InputMethod)
|
||||||
{
|
{
|
||||||
let imservice = check_imservice(imservice, im).unwrap();
|
let imservice = check_imservice(imservice, im).unwrap();
|
||||||
unsafe { imservice_destroy_im(im); }
|
imservice_destroy_im(im);
|
||||||
|
|
||||||
// no need to care about proper double-buffering,
|
// no need to care about proper double-buffering,
|
||||||
// the keyboard is already decommissioned
|
// the keyboard is already decommissioned
|
||||||
imservice.current.active = false;
|
imservice.current.active = false;
|
||||||
|
|
||||||
if let Some(ui) = imservice.ui_manager {
|
eekboard_context_service_hide_keyboard(imservice.ui_manager);
|
||||||
unsafe { server_context_service_hide_keyboard(ui); }
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME: destroy and deallocate
|
// FIXME: destroy and deallocate
|
||||||
|
|
||||||
@ -259,17 +246,10 @@ pub enum ContentPurpose {
|
|||||||
Terminal = 13,
|
Terminal = 13,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Utilities from ::logging need a printable error type
|
|
||||||
pub struct UnrecognizedValue;
|
|
||||||
|
|
||||||
impl fmt::Display for UnrecognizedValue {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
write!(f, "Unrecognized value")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<u32> for ContentPurpose {
|
impl TryFrom<u32> for ContentPurpose {
|
||||||
type Error = UnrecognizedValue;
|
// There's only one way to fail: number not in protocol,
|
||||||
|
// so no special error type is needed
|
||||||
|
type Error = ();
|
||||||
fn try_from(num: u32) -> Result<Self, Self::Error> {
|
fn try_from(num: u32) -> Result<Self, Self::Error> {
|
||||||
use self::ContentPurpose::*;
|
use self::ContentPurpose::*;
|
||||||
match num {
|
match num {
|
||||||
@ -287,7 +267,7 @@ impl TryFrom<u32> for ContentPurpose {
|
|||||||
11 => Ok(Time),
|
11 => Ok(Time),
|
||||||
12 => Ok(Datetime),
|
12 => Ok(Datetime),
|
||||||
13 => Ok(Terminal),
|
13 => Ok(Terminal),
|
||||||
_ => Err(UnrecognizedValue),
|
_ => Err(()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -300,12 +280,14 @@ pub enum ChangeCause {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<u32> for ChangeCause {
|
impl TryFrom<u32> for ChangeCause {
|
||||||
type Error = UnrecognizedValue;
|
// There's only one way to fail: number not in protocol,
|
||||||
|
// so no special error type is needed
|
||||||
|
type Error = ();
|
||||||
fn try_from(num: u32) -> Result<Self, Self::Error> {
|
fn try_from(num: u32) -> Result<Self, Self::Error> {
|
||||||
match num {
|
match num {
|
||||||
0 => Ok(ChangeCause::InputMethod),
|
0 => Ok(ChangeCause::InputMethod),
|
||||||
1 => Ok(ChangeCause::Other),
|
1 => Ok(ChangeCause::Other),
|
||||||
_ => Err(UnrecognizedValue)
|
_ => Err(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -336,92 +318,12 @@ impl Default for IMProtocolState {
|
|||||||
|
|
||||||
pub struct IMService {
|
pub struct IMService {
|
||||||
/// Owned reference (still created and destroyed in C)
|
/// Owned reference (still created and destroyed in C)
|
||||||
pub im: *mut c::InputMethod,
|
pub im: *const 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,
|
ui_manager: *const c::UIManager,
|
||||||
/// 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?
|
||||||
preedit_string: String,
|
preedit_string: String,
|
||||||
serial: Wrapping<u32>,
|
serial: Wrapping<u32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum SubmitError {
|
|
||||||
/// The input method had not been activated
|
|
||||||
NotActive,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl IMService {
|
|
||||||
pub fn new(
|
|
||||||
im: *mut c::InputMethod,
|
|
||||||
state_manager: *const c::StateManager,
|
|
||||||
) -> Box<IMService> {
|
|
||||||
// IMService will be referenced to by C,
|
|
||||||
// so it needs to stay in the same place in memory via Box
|
|
||||||
let imservice = Box::new(IMService {
|
|
||||||
im,
|
|
||||||
ui_manager: None,
|
|
||||||
state_manager,
|
|
||||||
pending: IMProtocolState::default(),
|
|
||||||
current: IMProtocolState::default(),
|
|
||||||
preedit_string: String::new(),
|
|
||||||
serial: Wrapping(0u32),
|
|
||||||
});
|
|
||||||
unsafe {
|
|
||||||
c::imservice_connect_listeners(
|
|
||||||
im,
|
|
||||||
imservice.as_ref() as *const IMService,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
imservice
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> {
|
|
||||||
match self.current.active {
|
|
||||||
true => {
|
|
||||||
unsafe {
|
|
||||||
c::eek_input_method_commit_string(self.im, text.as_ptr())
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
},
|
|
||||||
false => Err(SubmitError::NotActive),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete_surrounding_text(
|
|
||||||
&self,
|
|
||||||
before: u32, after: u32,
|
|
||||||
) -> Result<(), SubmitError> {
|
|
||||||
match self.current.active {
|
|
||||||
true => {
|
|
||||||
unsafe {
|
|
||||||
c::eek_input_method_delete_surrounding_text(
|
|
||||||
self.im,
|
|
||||||
before, after,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
},
|
|
||||||
false => Err(SubmitError::NotActive),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn commit(&mut self) -> Result<(), SubmitError> {
|
|
||||||
match self.current.active {
|
|
||||||
true => {
|
|
||||||
unsafe {
|
|
||||||
c::eek_input_method_commit(self.im, self.serial.0)
|
|
||||||
}
|
|
||||||
self.serial += Wrapping(1u32);
|
|
||||||
Ok(())
|
|
||||||
},
|
|
||||||
false => Err(SubmitError::NotActive),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_active(&self) -> bool {
|
|
||||||
self.current.active
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
12
src/keyboard.h
Normal file
12
src/keyboard.h
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#ifndef __KEYBOARD_H
|
||||||
|
#define __KEYBOARD_H
|
||||||
|
|
||||||
|
#include "inttypes.h"
|
||||||
|
#include "stdbool.h"
|
||||||
|
#include "virtual-keyboard-unstable-v1-client-protocol.h"
|
||||||
|
|
||||||
|
struct squeek_key;
|
||||||
|
|
||||||
|
uint32_t squeek_key_is_pressed(struct squeek_key *key);
|
||||||
|
uint32_t squeek_key_is_locked(struct squeek_key *key);
|
||||||
|
#endif
|
||||||
304
src/keyboard.rs
304
src/keyboard.rs
@ -1,96 +1,61 @@
|
|||||||
/*! State of the emulated keyboard and keys.
|
/*! State of the emulated keyboard and keys.
|
||||||
* Regards the keyboard as if it was composed of switches. */
|
* Regards the keyboard as if it was composed of switches. */
|
||||||
|
|
||||||
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::string::FromUtf8Error;
|
use std::string::FromUtf8Error;
|
||||||
|
|
||||||
use ::action::Action;
|
use ::action::Action;
|
||||||
use ::util;
|
|
||||||
|
|
||||||
// Traits
|
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use std::iter::{ FromIterator, IntoIterator };
|
use std::iter::{ FromIterator, IntoIterator };
|
||||||
|
use ::util::CloneOwned;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
/// Gathers stuff defined in C or called by C
|
||||||
|
pub mod c {
|
||||||
|
use super::*;
|
||||||
|
use ::util::c;
|
||||||
|
|
||||||
|
pub type CKeyState = c::Wrapped<KeyState>;
|
||||||
|
|
||||||
|
// The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C"
|
||||||
|
fn squeek_key_is_pressed(key: CKeyState) -> u32 {
|
||||||
|
//let key = unsafe { Rc::from_raw(key.0) };
|
||||||
|
return key.clone_owned().pressed as u32;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C"
|
||||||
|
fn squeek_key_is_locked(key: CKeyState) -> u32 {
|
||||||
|
return key.clone_owned().locked as u32;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
pub enum PressType {
|
pub enum PressType {
|
||||||
Released = 0,
|
Released = 0,
|
||||||
Pressed = 1,
|
Pressed = 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The extended, unambiguous layout-keycode
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct KeyCode {
|
|
||||||
pub code: u32,
|
|
||||||
pub keymap_idx: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
bitflags!{
|
|
||||||
/// Map to `virtual_keyboard.modifiers` modifiers values
|
|
||||||
/// From https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Keyboard_State
|
|
||||||
pub struct Modifiers: u8 {
|
|
||||||
const SHIFT = 0x1;
|
|
||||||
const LOCK = 0x2;
|
|
||||||
const CONTROL = 0x4;
|
|
||||||
/// Alt
|
|
||||||
const MOD1 = 0x8;
|
|
||||||
const MOD2 = 0x10;
|
|
||||||
const MOD3 = 0x20;
|
|
||||||
/// Meta
|
|
||||||
const MOD4 = 0x40;
|
|
||||||
/// AltGr
|
|
||||||
const MOD5 = 0x80;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// When the submitted actions of keys need to be tracked,
|
|
||||||
/// they need a stable, comparable ID
|
|
||||||
#[derive(Clone, PartialEq)]
|
|
||||||
pub struct KeyStateId(*const KeyState);
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct KeyState {
|
pub struct KeyState {
|
||||||
pub pressed: PressType,
|
pub pressed: PressType,
|
||||||
/// A cache of raw keycodes derived from Action::Submit given a keymap
|
pub locked: bool,
|
||||||
pub keycodes: Vec<KeyCode>,
|
/// A cache of raw keycodes derived from Action::Sumbit given a keymap
|
||||||
|
pub keycodes: Vec<u32>,
|
||||||
/// Static description of what the key does when pressed or released
|
/// Static description of what the key does when pressed or released
|
||||||
pub action: Action,
|
pub action: Action,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl KeyState {
|
|
||||||
#[must_use]
|
|
||||||
pub fn into_released(self) -> KeyState {
|
|
||||||
KeyState {
|
|
||||||
pressed: PressType::Released,
|
|
||||||
..self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn into_pressed(self) -> KeyState {
|
|
||||||
KeyState {
|
|
||||||
pressed: PressType::Pressed,
|
|
||||||
..self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// KeyStates instances are the unique identifiers of pressed keys,
|
|
||||||
/// and the actions submitted with them.
|
|
||||||
pub fn get_id(keystate: &Rc<RefCell<KeyState>>) -> KeyStateId {
|
|
||||||
KeyStateId(keystate.as_ptr() as *const 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 +63,14 @@ 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> {
|
||||||
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())
|
||||||
.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 +95,9 @@ impl From<io::Error> for FormattingError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Index is the key code, String is the occupant.
|
/// Generates a de-facto single level keymap. TODO: actually drop second level
|
||||||
/// Starts all empty.
|
pub fn generate_keymap(
|
||||||
/// https://gitlab.freedesktop.org/xorg/xserver/-/issues/260
|
keystates: &HashMap::<String, KeyState>
|
||||||
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.
|
|
||||||
/// Key codes must not repeat and must remain between 9 and 255.
|
|
||||||
fn generate_keymap(
|
|
||||||
symbolmap: &SingleKeyMap,
|
|
||||||
) -> Result<String, FormattingError> {
|
) -> Result<String, FormattingError> {
|
||||||
let mut buf: Vec<u8> = Vec::new();
|
let mut buf: Vec<u8> = Vec::new();
|
||||||
writeln!(
|
writeln!(
|
||||||
@ -191,80 +108,61 @@ 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:
|
if let Action::Submit { text: _, keys } = &state.action {
|
||||||
// - use levels to cram multiple characters into one key
|
if let 0 = keys.len() { eprintln!("Key {} has no keysyms", name); };
|
||||||
// - swap layouts on key presses
|
for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) {
|
||||||
for (_name, keycode) in &pairs {
|
write!(
|
||||||
write!(
|
buf,
|
||||||
buf,
|
"
|
||||||
"
|
<{}> = {};",
|
||||||
<I{}> = {0};",
|
named_keysym.0,
|
||||||
keycode,
|
keycode,
|
||||||
)?;
|
)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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\";"
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
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 +177,24 @@ 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),
|
||||||
|
locked: false,
|
||||||
|
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 +207,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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
66
src/layout.h
66
src/layout.h
@ -5,26 +5,34 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include "eek/eek-element.h"
|
#include "eek/eek-element.h"
|
||||||
#include "eek/eek-gtk-keyboard.h"
|
#include "eek/eek-gtk-keyboard.h"
|
||||||
#include "eek/eek-renderer.h"
|
|
||||||
#include "eek/eek-types.h"
|
#include "eek/eek-types.h"
|
||||||
#include "src/submission.h"
|
#include "src/keyboard.h"
|
||||||
#include "virtual-keyboard-unstable-v1-client-protocol.h"
|
#include "virtual-keyboard-unstable-v1-client-protocol.h"
|
||||||
#include "text-input-unstable-v3-client-protocol.h"
|
|
||||||
|
|
||||||
enum squeek_arrangement_kind {
|
enum squeek_arrangement_kind {
|
||||||
ARRANGEMENT_KIND_BASE = 0,
|
ARRANGEMENT_KIND_BASE = 0,
|
||||||
ARRANGEMENT_KIND_WIDE = 1,
|
ARRANGEMENT_KIND_WIDE = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct squeek_layout_state {
|
struct squeek_button;
|
||||||
enum squeek_arrangement_kind arrangement;
|
struct squeek_row;
|
||||||
enum zwp_text_input_v3_content_purpose purpose;
|
struct squeek_view;
|
||||||
enum zwp_text_input_v3_content_hint hint;
|
struct squeek_layout;
|
||||||
char *layout_name;
|
|
||||||
char *overlay_name;
|
/// Represents the path to the button within a view
|
||||||
|
struct button_place {
|
||||||
|
const struct squeek_row *row;
|
||||||
|
const struct squeek_button *button;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct squeek_layout;
|
int32_t squeek_row_get_angle(const struct squeek_row*);
|
||||||
|
|
||||||
|
EekBounds squeek_row_get_bounds(const struct squeek_row*);
|
||||||
|
|
||||||
|
typedef void (*ButtonCallback) (struct squeek_button *button, gpointer user_data);
|
||||||
|
void squeek_row_foreach(struct squeek_row*,
|
||||||
|
ButtonCallback callback,
|
||||||
|
gpointer user_data);
|
||||||
|
|
||||||
EekBounds squeek_button_get_bounds(const struct squeek_button*);
|
EekBounds squeek_button_get_bounds(const struct squeek_button*);
|
||||||
const char *squeek_button_get_label(const struct squeek_button*);
|
const char *squeek_button_get_label(const struct squeek_button*);
|
||||||
@ -32,36 +40,40 @@ 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_name(const struct squeek_button*);
|
||||||
const char *squeek_button_get_outline_name(const struct squeek_button*);
|
const char *squeek_button_get_outline_name(const struct squeek_button*);
|
||||||
|
|
||||||
|
struct squeek_key *squeek_button_get_key(const struct squeek_button*);
|
||||||
|
uint32_t *squeek_button_has_key(const struct squeek_button* button,
|
||||||
|
const struct squeek_key *key);
|
||||||
void squeek_button_print(const struct squeek_button* button);
|
void squeek_button_print(const struct squeek_button* button);
|
||||||
|
|
||||||
struct transformation squeek_layout_calculate_transformation(
|
|
||||||
const struct squeek_layout *layout,
|
EekBounds squeek_view_get_bounds(const struct squeek_view*);
|
||||||
double allocation_width, double allocation_size);
|
|
||||||
|
typedef void (*RowCallback) (struct squeek_row *row, gpointer user_data);
|
||||||
|
void squeek_view_foreach(struct squeek_view*,
|
||||||
|
RowCallback callback,
|
||||||
|
gpointer user_data);
|
||||||
|
|
||||||
|
void
|
||||||
|
squeek_layout_place_contents(struct squeek_layout*);
|
||||||
|
struct squeek_view *squeek_layout_get_current_view(struct squeek_layout*);
|
||||||
|
|
||||||
struct squeek_layout *squeek_load_layout(const char *name, uint32_t type);
|
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*);
|
||||||
|
|
||||||
void squeek_layout_release(struct squeek_layout *layout,
|
void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
|
||||||
struct submission *submission,
|
|
||||||
struct transformation widget_to_layout,
|
struct transformation widget_to_layout,
|
||||||
uint32_t timestamp,
|
uint32_t timestamp,
|
||||||
EekboardContextService *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 zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp);
|
||||||
struct submission *submission,
|
void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
|
||||||
uint32_t timestamp);
|
|
||||||
void squeek_layout_depress(struct squeek_layout *layout,
|
|
||||||
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, EekGtkKeyboard *ui_keyboard);
|
uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
|
||||||
void squeek_layout_drag(struct squeek_layout *layout,
|
void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
|
||||||
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, EekGtkKeyboard *ui_keyboard);
|
||||||
EekGtkKeyboard *ui_keyboard);
|
void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekGtkKeyboard *ui_keyboard);
|
||||||
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);
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
1350
src/layout.rs
1350
src/layout.rs
File diff suppressed because it is too large
Load Diff
12
src/lib.rs
12
src/lib.rs
@ -1,8 +1,5 @@
|
|||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate bitflags;
|
extern crate bitflags;
|
||||||
extern crate cairo;
|
|
||||||
extern crate cairo_sys;
|
|
||||||
extern crate gdk;
|
|
||||||
extern crate gio;
|
extern crate gio;
|
||||||
extern crate glib;
|
extern crate glib;
|
||||||
extern crate glib_sys;
|
extern crate glib_sys;
|
||||||
@ -15,26 +12,19 @@ extern crate regex;
|
|||||||
extern crate serde;
|
extern crate serde;
|
||||||
extern crate xkbcommon;
|
extern crate xkbcommon;
|
||||||
|
|
||||||
#[macro_use]
|
|
||||||
mod logging;
|
|
||||||
|
|
||||||
mod action;
|
mod action;
|
||||||
pub mod data;
|
pub mod data;
|
||||||
mod drawing;
|
|
||||||
pub mod float_ord;
|
pub mod float_ord;
|
||||||
pub mod imservice;
|
pub mod imservice;
|
||||||
mod keyboard;
|
mod keyboard;
|
||||||
mod layout;
|
mod layout;
|
||||||
mod locale;
|
mod locale;
|
||||||
mod locale_config;
|
mod locale_config;
|
||||||
mod manager;
|
|
||||||
mod outputs;
|
mod outputs;
|
||||||
mod popover;
|
mod popover;
|
||||||
mod resources;
|
mod resources;
|
||||||
mod style;
|
|
||||||
mod submission;
|
mod submission;
|
||||||
|
mod style;
|
||||||
pub mod tests;
|
pub mod tests;
|
||||||
pub mod util;
|
pub mod util;
|
||||||
mod ui_manager;
|
|
||||||
mod vkeyboard;
|
|
||||||
mod xdg;
|
mod xdg;
|
||||||
|
|||||||
@ -1,106 +1,21 @@
|
|||||||
/*! Locale-specific functions.
|
/*! Locale-specific functions */
|
||||||
*
|
|
||||||
* This file is intended as a library:
|
|
||||||
* it must pass errors upwards
|
|
||||||
* and panicking is allowed only when
|
|
||||||
* this code encounters an internal inconsistency.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::ffi::{ CStr, CString };
|
use std::ffi::CString;
|
||||||
use std::fmt;
|
|
||||||
use std::os::raw::c_char;
|
|
||||||
use std::ptr;
|
|
||||||
use std::str::Utf8Error;
|
|
||||||
|
|
||||||
mod c {
|
mod c {
|
||||||
use super::*;
|
use std::os::raw::c_char;
|
||||||
use std::os::raw::c_void;
|
|
||||||
|
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
pub type c_int = i32;
|
pub type c_int = i32;
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
|
||||||
#[repr(C)]
|
|
||||||
pub struct GnomeXkbInfo(*const c_void);
|
|
||||||
|
|
||||||
#[no_mangle]
|
#[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;
|
||||||
// from gnome-desktop3
|
|
||||||
pub fn gnome_xkb_info_new() -> GnomeXkbInfo;
|
|
||||||
pub fn gnome_xkb_info_get_layout_info (
|
|
||||||
info: GnomeXkbInfo,
|
|
||||||
id: *const c_char,
|
|
||||||
display_name: *mut *const c_char,
|
|
||||||
short_name: *const *const c_char,
|
|
||||||
xkb_layout: *const *const c_char,
|
|
||||||
xkb_variant: *const *const c_char
|
|
||||||
) -> c_int;
|
|
||||||
pub fn g_object_unref(o: GnomeXkbInfo);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum Error {
|
|
||||||
StringConversion(Utf8Error),
|
|
||||||
NoInfo,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for Error {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
fmt::Debug::fmt(&self, f)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct XkbInfo(c::GnomeXkbInfo);
|
|
||||||
|
|
||||||
impl XkbInfo {
|
|
||||||
pub fn new() -> XkbInfo {
|
|
||||||
XkbInfo(unsafe { c::gnome_xkb_info_new() })
|
|
||||||
}
|
|
||||||
pub fn get_display_name(&self, id: &str) -> Result<String, Error> {
|
|
||||||
let id = cstring_safe(id);
|
|
||||||
let id_ref = id.as_ptr();
|
|
||||||
let mut display_name: *const c_char = ptr::null();
|
|
||||||
let found = unsafe {
|
|
||||||
c::gnome_xkb_info_get_layout_info(
|
|
||||||
self.0,
|
|
||||||
id_ref,
|
|
||||||
&mut display_name as *mut *const c_char,
|
|
||||||
ptr::null(), ptr::null(), ptr::null(),
|
|
||||||
)
|
|
||||||
};
|
|
||||||
if found != 0 && !display_name.is_null() {
|
|
||||||
let display_name = unsafe { CStr::from_ptr(display_name) };
|
|
||||||
display_name.to_str()
|
|
||||||
.map(str::to_string)
|
|
||||||
.map_err(Error::StringConversion)
|
|
||||||
} else {
|
|
||||||
Err(Error::NoInfo)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for XkbInfo {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
unsafe { c::g_object_unref(self.0) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
|
||||||
pub struct Translation<'a>(pub &'a str);
|
|
||||||
|
|
||||||
impl<'a> Translation<'a> {
|
|
||||||
pub fn to_owned(&'a self) -> OwnedTranslation {
|
|
||||||
OwnedTranslation(self.0.to_owned())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
|
||||||
pub struct OwnedTranslation(pub String);
|
|
||||||
|
|
||||||
fn cstring_safe(s: &str) -> CString {
|
fn cstring_safe(s: &str) -> CString {
|
||||||
CString::new(s)
|
CString::new(s)
|
||||||
.unwrap_or(CString::new("").unwrap())
|
.unwrap_or(CString::new("").unwrap())
|
||||||
|
|||||||
@ -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>;
|
||||||
|
|
||||||
|
|||||||
201
src/logging.rs
201
src/logging.rs
@ -1,201 +0,0 @@
|
|||||||
/*! Logging library.
|
|
||||||
*
|
|
||||||
* This is probably the only part of squeekboard
|
|
||||||
* that should be doing any direct printing.
|
|
||||||
*
|
|
||||||
* There are several approaches to logging,
|
|
||||||
* in the order of increasing flexibility and/or purity:
|
|
||||||
*
|
|
||||||
* 1. `println!` directly
|
|
||||||
*
|
|
||||||
* It can't be easily replaced by a different solution
|
|
||||||
*
|
|
||||||
* 2. simple `log!` macro
|
|
||||||
*
|
|
||||||
* Replacing the destination at runtime other than globally would be awkward,
|
|
||||||
* so no easy way to suppress errors for things that don't matter,
|
|
||||||
* but formatting is still easy.
|
|
||||||
*
|
|
||||||
* 3. logging to a mutable destination type
|
|
||||||
*
|
|
||||||
* Can be easily replaced, but logging `Result` types,
|
|
||||||
* which should be done by calling a method on the result,
|
|
||||||
* can't be formatted directly.
|
|
||||||
* Cannot be parallelized.
|
|
||||||
*
|
|
||||||
* 4. logging to an immutable destination type
|
|
||||||
*
|
|
||||||
* Same as above, except it can be parallelized.
|
|
||||||
* Logs being outputs, they get returned
|
|
||||||
* instead of being misleadingly passed back through arguments.
|
|
||||||
* It seems more difficult to pass the logger around,
|
|
||||||
* but this may be a solved problem from the area of functional programming.
|
|
||||||
*
|
|
||||||
* This library generally aims at the approach in 3.
|
|
||||||
* */
|
|
||||||
|
|
||||||
use std::fmt::Display;
|
|
||||||
|
|
||||||
/// Levels are not in order.
|
|
||||||
pub enum Level {
|
|
||||||
// Levels for reporting violated constraints
|
|
||||||
/// The program violated a self-imposed constraint,
|
|
||||||
/// ended up in an inconsistent state, and cannot recover.
|
|
||||||
/// Handlers must not actually panic. (should they?)
|
|
||||||
Panic,
|
|
||||||
/// The program violated a self-imposed constraint,
|
|
||||||
/// ended up in an inconsistent state, but some state can be recovered.
|
|
||||||
Bug,
|
|
||||||
/// Invalid data given by an external source,
|
|
||||||
/// some state of the program must be dropped.
|
|
||||||
Error,
|
|
||||||
// Still violated constraints, but harmless
|
|
||||||
/// Invalid data given by an external source, parts of data are ignored.
|
|
||||||
/// No previous program state needs to be dropped.
|
|
||||||
Warning,
|
|
||||||
/// External source not in an expected state,
|
|
||||||
/// but not violating any protocols (including no relevant protocol).
|
|
||||||
Surprise,
|
|
||||||
// Informational
|
|
||||||
/// A change in internal state that results in a change of behaviour
|
|
||||||
/// that a user can observe, and a tinkerer might find useful.
|
|
||||||
/// E.g. selection of external sources, like loading user's UI files,
|
|
||||||
/// language switch, overrides.
|
|
||||||
Info,
|
|
||||||
/// Information useful for application developer only.
|
|
||||||
/// Should be limited to information gotten from external sources,
|
|
||||||
/// and more tricky parts of internal state.
|
|
||||||
Debug,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Level {
|
|
||||||
fn as_str(&self) -> &'static str {
|
|
||||||
match self {
|
|
||||||
Level::Panic => "Panic",
|
|
||||||
Level::Bug => "Bug",
|
|
||||||
Level::Error => "Error",
|
|
||||||
Level::Warning => "Warning",
|
|
||||||
Level::Surprise => "Surprise",
|
|
||||||
Level::Info => "Info",
|
|
||||||
Level::Debug => "Debug",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Problem> for Level {
|
|
||||||
fn from(problem: Problem) -> Level {
|
|
||||||
use self::Level::*;
|
|
||||||
match problem {
|
|
||||||
Problem::Panic => Panic,
|
|
||||||
Problem::Bug => Bug,
|
|
||||||
Problem::Error => Error,
|
|
||||||
Problem::Warning => Warning,
|
|
||||||
Problem::Surprise => Surprise,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Only levels which indicate problems
|
|
||||||
/// To use with `Result::Err` handlers,
|
|
||||||
/// which are needed only when something went off the optimal path.
|
|
||||||
/// A separate type ensures that `Err`
|
|
||||||
/// can't end up misclassified as a benign event like `Info`.
|
|
||||||
pub enum Problem {
|
|
||||||
Panic,
|
|
||||||
Bug,
|
|
||||||
Error,
|
|
||||||
Warning,
|
|
||||||
Surprise,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Sugar for approach 2
|
|
||||||
// TODO: avoid, deprecate.
|
|
||||||
// Handler instances should be long lived, not one per call.
|
|
||||||
macro_rules! log_print {
|
|
||||||
($level:expr, $($arg:tt)*) => (::logging::print($level, &format!($($arg)*)))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Approach 2
|
|
||||||
pub fn print(level: Level, message: &str) {
|
|
||||||
Print{}.handle(level, message)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Sugar for logging errors in results.
|
|
||||||
pub trait Warn where Self: Sized {
|
|
||||||
type Value;
|
|
||||||
/// Approach 2.
|
|
||||||
fn or_print(self, level: Problem, message: &str) -> Option<Self::Value> {
|
|
||||||
self.or_warn(&mut Print {}, level.into(), message)
|
|
||||||
}
|
|
||||||
/// Approach 3.
|
|
||||||
fn or_warn<H: Handler>(
|
|
||||||
self,
|
|
||||||
handler: &mut H,
|
|
||||||
level: Problem,
|
|
||||||
message: &str,
|
|
||||||
) -> Option<Self::Value>;
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T, E: Display> Warn for Result<T, E> {
|
|
||||||
type Value = T;
|
|
||||||
fn or_warn<H: Handler>(
|
|
||||||
self,
|
|
||||||
handler: &mut H,
|
|
||||||
level: Problem,
|
|
||||||
message: &str,
|
|
||||||
) -> Option<T> {
|
|
||||||
self.map_err(|e| {
|
|
||||||
handler.handle(level.into(), &format!("{}: {}", message, e));
|
|
||||||
e
|
|
||||||
}).ok()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T> Warn for Option<T> {
|
|
||||||
type Value = T;
|
|
||||||
fn or_warn<H: Handler>(
|
|
||||||
self,
|
|
||||||
handler: &mut H,
|
|
||||||
level: Problem,
|
|
||||||
message: &str,
|
|
||||||
) -> Option<T> {
|
|
||||||
self.or_else(|| {
|
|
||||||
handler.handle(level.into(), message);
|
|
||||||
None
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A mutable handler for text warnings.
|
|
||||||
/// Approach 3.
|
|
||||||
pub trait Handler {
|
|
||||||
/// Handle a log message
|
|
||||||
fn handle(&mut self, level: Level, message: &str);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Prints info to stdout, everything else to stderr
|
|
||||||
pub struct Print;
|
|
||||||
|
|
||||||
impl Handler for Print {
|
|
||||||
fn handle(&mut self, level: Level, message: &str) {
|
|
||||||
match level {
|
|
||||||
Level::Info => println!("Info: {}", message),
|
|
||||||
l => eprintln!("{}: {}", l.as_str(), message),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Warning handler that will panic
|
|
||||||
/// at any warning, error, surprise, bug, or panic.
|
|
||||||
/// Don't use except in tests
|
|
||||||
pub struct ProblemPanic;
|
|
||||||
|
|
||||||
impl Handler for ProblemPanic {
|
|
||||||
fn handle(&mut self, level: Level, message: &str) {
|
|
||||||
use self::Level::*;
|
|
||||||
match level {
|
|
||||||
Panic | Bug | Error | Warning | Surprise => panic!("{}", message),
|
|
||||||
l => Print{}.handle(l, message),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
/*! Procedures relating to the management of the switching of layouts */
|
|
||||||
use ::util;
|
|
||||||
|
|
||||||
pub mod c {
|
|
||||||
use std::os::raw::{c_char, c_void};
|
|
||||||
|
|
||||||
/// EekboardContextService*
|
|
||||||
#[repr(transparent)]
|
|
||||||
#[derive(Clone, Copy)]
|
|
||||||
pub struct Manager(*const c_void);
|
|
||||||
|
|
||||||
#[no_mangle]
|
|
||||||
extern "C" {
|
|
||||||
pub fn eekboard_context_service_set_overlay(
|
|
||||||
manager: Manager,
|
|
||||||
name: *const c_char,
|
|
||||||
);
|
|
||||||
|
|
||||||
pub fn eekboard_context_service_get_overlay(
|
|
||||||
manager: Manager,
|
|
||||||
) -> *const c_char;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns the overlay name.
|
|
||||||
/// The result lifetime is "as long as the C copy lives"
|
|
||||||
pub fn get_overlay(manager: c::Manager) -> Option<String> {
|
|
||||||
let raw_str = unsafe {
|
|
||||||
c::eekboard_context_service_get_overlay(manager)
|
|
||||||
};
|
|
||||||
// this string is generated from Rust, should never be invalid
|
|
||||||
util::c::as_str(&raw_str).unwrap()
|
|
||||||
.map(String::from)
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user