device-nokia-n900: add screen locker for i3wm

device/community/device-nokia-n900/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=9.2.1
-pkgrel=1
+pkgver=9.3.0
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -149,7 +149,7 @@ xkeyboard_config() {
 
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes feh i3blocks rxvt-unicode upower"
+	depends="unclutter-xfixes feh i3blocks rxvt-unicode upower xautolock xsecurelock"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -196,7 +196,7 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-2b26f551b86c5d71119a518d18b49c3c6a9a6cfcc1ce4f19bb533ce415c698b1b3f200071e3f54b1abb11d8ae1add348e0a3f01ce21805607dd7beebdebf72c0  i3wm.conf
+363c36be0ace9ae35ea76f7b3d819bf7f82dee5112c4f1ae9af69ad5476bf4b3ecdb17109a77291ebdafaa8056118d55571a3a6d77b328304ea111ee45c2cff4  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -207,7 +207,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28  rx51_fise.map
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
-caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
+590679c55679be93c9549cf5fbcbad15216f4d422d211996450148fca41491e25955990b37253415ab28c21581405f05e3aadd468f0950769b3b3224c620df7a  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
 72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist

device/community/device-nokia-n900/i3wm/i3wm.conf

@@ -61,7 +61,7 @@ mode "command" {
 bindsym Shift+space mode "command"
 
 # This is the slidey button on the side
-bindsym XF86ScreenSaver exec --no-startup-id lock.sh
+bindsym XF86ScreenSaver exec --no-startup-id /usr/bin/lock.sh
 
 # Pressing the power button offers reboot, shutdown, or suspend choice
 bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
@@ -91,3 +91,5 @@ exec_always --no-startup-id feh --bg-fill /usr/share/wallpapers/postmarketos.jpg
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
 
+# Enable auto screen locker
+exec --no-startup-id xautolock -time 5 -secure -nowlocker /usr/bin/lock.sh -locker /usr/bin/lock.sh

device/community/device-nokia-n900/lock.sh

@@ -1,14 +1,36 @@
 #!/bin/sh
 
-FILE=~/.screenoff
-if [ -f $FILE ]; then
-	xinput set-prop 8 "Device Enabled" 1
-	xset dpms force on
-	rm "$FILE"
-else
-	xinput set-prop 8 "Device Enabled" 0
-	# Turn screen off twice (sometimes it does not work on first run)
-	xset dpms force off
-	xset dpms force off
-	touch "$FILE"
+set -x
+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+[ -f "$XDG_CONFIG_HOME"/i3lockscreen.conf ] && . "$XDG_CONFIG_HOME"/i3lockscreen.conf
+
+# TODO: change default theme?
+# TODO: could also source config from /etc for distro defaults
+export XSECURELOCK_AUTH_TIMEOUT="${XSECURELOCK_AUTH_TIMEOUT:-10}"
+export XSECURELOCK_BLANK_TIMEOUT="${XSECURELOCK_BLANK_TIMEOUT:-0}"
+export XSECURELOCK_BLANK_DPMS_STATE="${XSECURELOCK_BLANK_DPMS_STATE:-on}"
+export XSECURELOCK_SHOW_HOSTNAME="${XSECURELOCK_SHOW_HOSTNAME:-0}"
+export XSECURELOCK_SHOW_USERNAME="${XSECURELOCK_SHOW_USERNAME:-0}"
+export XSECURELOCK_SHOW_KEYBOARD_LAYOUT="${XSECURELOCK_SHOW_KEYBOARD_LAYOUT:-0}"
+export XSECURELOCK_PASSWORD_PROMPT="${XSECURELOCK_PASSWORD_PROMPT:-kaomoji}"
+
+display=off
+if xset q | grep -iq "monitor is on"; then
+        display=on
 fi
+
+case "$display" in
+        off)
+                # Re-enable display, just in case...
+                xset dpms force on
+                xinput enable "TSC2005 touchscreen"
+                ;;
+        on)
+                xinput disable "TSC2005 touchscreen"
+                if ! pidof xsecurelock >/dev/null; then
+                        xsecurelock
+                        # Re-enable touchscreen, just in case...
+                        xinput enable "TSC2005 touchscreen"
+                fi
+                ;;
+esac