From c467e17bfc5b97ac0b81dd7f73f5d185cb7f1422 Mon Sep 17 00:00:00 2001
From: Antoni Aloy Torrens <aaloytorrens@gmail.com>
Date: Wed, 28 Sep 2022 09:58:50 +0200
Subject: [PATCH] main/postmarketos-ui-lxqt: various fixes and usability
 improvements (MR 3259)

Co-developed-by: Jakob Hauser <jahau@rocketmail.com>
Co-developed-by: Pablo Correa Gomez <ablocorrea@hotmail.com>

[ci:skip-build]: Already built successfully in CI.
---
 .../10_onboard.gschema.override               | 14 +++++++
 main/postmarketos-ui-lxqt/APKBUILD            | 42 +++++++++++++++++--
 main/postmarketos-ui-lxqt/lxqt-tablet.sh      |  3 ++
 .../onboard-autostart.desktop                 |  6 +++
 .../unclutter-xfixes.desktop                  |  5 +++
 5 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 main/postmarketos-ui-lxqt/10_onboard.gschema.override
 create mode 100644 main/postmarketos-ui-lxqt/lxqt-tablet.sh
 create mode 100644 main/postmarketos-ui-lxqt/onboard-autostart.desktop
 create mode 100644 main/postmarketos-ui-lxqt/unclutter-xfixes.desktop

diff --git a/main/postmarketos-ui-lxqt/10_onboard.gschema.override b/main/postmarketos-ui-lxqt/10_onboard.gschema.override
new file mode 100644
index 000000000..e9890a704
--- /dev/null
+++ b/main/postmarketos-ui-lxqt/10_onboard.gschema.override
@@ -0,0 +1,14 @@
+[org.gnome.desktop.interface]
+toolkit-accessibility=true
+
+[org.onboard]
+layout='/usr/share/onboard/layouts/Small.onboard'
+theme='/usr/share/onboard/themes/Nightshade.theme'
+show-tooltips=false
+
+[org.onboard.auto-show]
+enabled=true
+keyboard-device-detection-enabled=true
+
+[org.onboard.window]
+docking-enabled=true
diff --git a/main/postmarketos-ui-lxqt/APKBUILD b/main/postmarketos-ui-lxqt/APKBUILD
index e47a2a398..dfc165591 100644
--- a/main/postmarketos-ui-lxqt/APKBUILD
+++ b/main/postmarketos-ui-lxqt/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=postmarketos-ui-lxqt
-pkgver=0.1
-pkgrel=8
+pkgver=0.2
+pkgrel=0
 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)"
 url="https://lxqt-project.org/"
 arch="noarch !armhf" # lxqt-desktop not available on armhf
@@ -15,6 +15,7 @@ depends="
 	lxqt-desktop
 	lxqt-policykit
 	mesa-egl
+	polkit-elogind
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	tinydm
@@ -22,22 +23,55 @@ depends="
 	xorg-server
 	"
 _pmb_recommends="
+	alsa-plugins-pulse
+	alsa-utils
+	gvfs
+	bluedevil
+	onboard
 	gnome-keyring
 	network-manager-applet
 	paper-icon-theme
 	pavucontrol
+	pavucontrol-qt
 	pm-utils
+	qps
+	screengrab
+	lximage-qt
+	obconf-qt
 	postmarketos-artwork-wallpapers
 	pulseaudio-utils
+	unclutter-xfixes
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
-source="$pkgname-$pkgver.tar.gz::https://gitlab.com/antoni.aloytorrens/lxqt-tablet/-/archive/$pkgver/lxqt-tablet-$pkgver.tar.gz"
+source="
+	$pkgname-$pkgver.tar.gz::https://gitlab.com/antoni.aloytorrens/lxqt-tablet/-/archive/$pkgver/lxqt-tablet-$pkgver.tar.gz
+	unclutter-xfixes.desktop
+	10_onboard.gschema.override
+	onboard-autostart.desktop
+	lxqt-tablet.sh
+	"
 options="!check" # No testsuite
 builddir="$srcdir/lxqt-tablet-$pkgver"
 
 package() {
 	install -d -m755 "$pkgdir"/etc/skel
 	cp -a "$builddir"/config "$pkgdir"/etc/skel/.config
+
+	install -Dm644 -t "$pkgdir"/etc/xdg/lxqt-tablet/autostart \
+		"$srcdir"/unclutter-xfixes.desktop \
+		"$srcdir"/onboard-autostart.desktop
+
+	install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
+		"$srcdir"/10_onboard.gschema.override
+
+	install -Dm644 -t "$pkgdir"/etc/profile.d \
+		"$srcdir"/lxqt-tablet.sh
 }
 
-sha512sums="63492fd0ad8ffb1d0a9f4f3f53eb4b8a21e670ba5a2a62c86b38f60b77578cfd9970b0767c875fd263e06367f998a2e895b33562b0235b831c4aa34177e14ea6  postmarketos-ui-lxqt-0.1.tar.gz"
+sha512sums="
+dab8453a8dbb8d01f978340ac598a3705461ec3a536b131e9247511d090ce40c8732284f39f0464e3fa2134e21277db3570f106fc1ad85cd7e6cdc7043704a4d  postmarketos-ui-lxqt-0.2.tar.gz
+b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a  unclutter-xfixes.desktop
+ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b  10_onboard.gschema.override
+d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747  onboard-autostart.desktop
+54e7ab0c44d88578e46a6a7ecd0cad9980c4d062d453a9443428bdfe2773d26a7b110103c854d7f1ca20d764b1f79a5bf082474fb4a0949ffe871671cc66d97e  lxqt-tablet.sh
+"
diff --git a/main/postmarketos-ui-lxqt/lxqt-tablet.sh b/main/postmarketos-ui-lxqt/lxqt-tablet.sh
new file mode 100644
index 000000000..61430f941
--- /dev/null
+++ b/main/postmarketos-ui-lxqt/lxqt-tablet.sh
@@ -0,0 +1,3 @@
+# shellcheck shell=sh
+# Set primary config directory for postmarketOS LXQt configs.
+export XDG_CONFIG_DIRS="/etc/xdg/lxqt-tablet:/etc/xdg:/etc:/usr/share"
diff --git a/main/postmarketos-ui-lxqt/onboard-autostart.desktop b/main/postmarketos-ui-lxqt/onboard-autostart.desktop
new file mode 100644
index 000000000..6ef6c4e21
--- /dev/null
+++ b/main/postmarketos-ui-lxqt/onboard-autostart.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Onboard
+Comment=Flexible onscreen keyboard
+Icon=onboard
+Exec=onboard
diff --git a/main/postmarketos-ui-lxqt/unclutter-xfixes.desktop b/main/postmarketos-ui-lxqt/unclutter-xfixes.desktop
new file mode 100644
index 000000000..1c53e5b55
--- /dev/null
+++ b/main/postmarketos-ui-lxqt/unclutter-xfixes.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=unclutter-xfixes
+Comment=Hide cursor on touchscreen
+Exec=unclutter-xfixes --start-hidden --hide-on-touch