Fix screen locking

resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml

@@ -2,23 +2,22 @@
 
 <channel name="xfce4-power-manager" version="1.0">
   <property name="xfce4-power-manager" type="empty">
-    <property name="power-button-action" type="uint" value="3"/>
+    <property name="power-button-action" type="empty"/>
     <property name="brightness-switch-restore-on-exit" type="int" value="0"/>
-    <property name="brightness-switch" type="empty"/>
+    <property name="brightness-switch" type="int" value="0"/>
-    <property name="brightness-on-battery" type="empty"/>
+    <property name="brightness-on-battery" type="uint" value="9"/>
     <property name="brightness-level-on-battery" type="empty"/>
-    <property name="dpms-on-battery-off" type="0"/>
+    <property name="dpms-on-battery-off" type="uint" value="15"/>
-    <property name="dpms-on-battery-sleep" type="0"/>
+    <property name="lid-action-on-battery" type="uint" value="1"/>
-    <property name="blank-on-battery" type="0"/>
+    <property name="logind-handle-lid-switch" type="bool" value="false"/>
-    <property name="blank-on-ac" type="0"/>
+    <property name="lid-action-on-ac" type="uint" value="1"/>
-    <property name="dpms-on-ac-sleep" type="0"/>
-    <property name="dpms-on-ac-off" type="0"/>
-    <property name="inactivity-on-battery" type="empty"/>
-    <property name="brightness-level-on-ac" type="empty"/>
     <property name="inactivity-sleep-mode-on-battery" type="uint" value="1"/>
-    <property name="lid-action-on-battery" type="uint" value="0"/>
+    <property name="lock-screen-suspend-hibernate" type="bool" value="true"/>
-    <property name="logind-handle-lid-switch" type="bool" value="true"/>
+    <property name="dpms-on-ac-sleep" type="uint" value="0"/>
-    <property name="lid-action-on-ac" type="uint" value="0"/>
+    <property name="dpms-on-ac-off" type="uint" value="15"/>
-    <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
+    <property name="blank-on-ac" type="int" value="0"/>
+    <property name="blank-on-battery" type="int" value="0"/>
+    <property name="dpms-on-battery-sleep" type="uint" value="0"/>
+    <property name="critical-power-action" type="uint" value="0"/>
   </property>
 </channel>

resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-screensaver.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-screensaver" version="1.0">
+  <property name="saver" type="empty">
+    <property name="mode" type="int" value="0"/>
+    <property name="idle-activation" type="empty">
+      <property name="delay" type="int" value="15"/>
+    </property>
+  </property>
+</channel>

resources/InstallResources/xfce-config/xflock-xsecurelock.patch

@@ -6,7 +6,7 @@ index d55cbf7..b7b28c6
  
  # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
  for lock_cmd in \
-+    "xfce4-screensaver-command --lock"\
++    "env XSECURELOCK_PASSWORD_PROMPT=asterisks xsecurelock"\
      "xscreensaver-command -lock" \
      "light-locker-command --lock" \
      "gnome-screensaver-command --lock" \

scripts/InstallScripts/InstallPackages.sh

@@ -43,11 +43,22 @@ DEBIAN_FRONTEND=noninteractive apt -t buster install -y firefox-esr || DEBIAN_FR
 # #install chromium from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite
 DEBIAN_FRONTEND=noninteractive apt -t buster install -y chromium || DEBIAN_FRONTEND=noninteractive apt install -y chromium
 
-[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice && apt install -t sid -y libxfce4ui-2-0 xfce4-screensaver
+[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice
 [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt
 
 if [ "$DE" = "xfce" ]
 then
+  # remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175
+  apt remove -y light-locker
+  apt purge -y light-locker
+
+  #xsecurelock is the lightest weight, actually functional screen locker I have been able to find
+  # light-locker is outright broken, and xfce4-screensaver crashes if system
+  # is told to sleep at lid close, and activate lock
+  # gnome-screensaver shows the desktop for a fraction of a second at wakeup
+  # xscreensaver works as well, if you prefer that but is less simple
+  apt install xsecurelock
+
   #Install packages not in an apt repo
   dpkg -i $DIR/xfce-themes/*
 
@@ -61,8 +72,8 @@ then
   cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
 
 
-  #Patch xflock4 to support xfce-screensaver https://docs.xfce.org/apps/screensaver/faq
+  #Patch xflock4 to activate xsecurelock
-  patch /usr/bin/xflock4 < $DIR/xfce-config/xflock4-xfce4-screensaver.patch
+  patch /usr/bin/xflock4 < $DIR/xfce-config/xflock-xsecurelock.patch
 
   #Copy in wallpapers
   rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/
@@ -115,13 +126,10 @@ cp -rf $DIR/headphone-acpi-toggle /etc/acpi/events/headphone-acpi-toggle
 mkdir /etc/X11/xorg.conf.d/
 cp -rf $DIR/30-touchpad.conf /etc/X11/xorg.conf.d/
 
-# remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175
-apt remove -y light-locker
-
 apt clean && apt autoremove --purge
 
 #enable periodic TRIM
-cp /usr/share/doc/util-linux/examples/fstrim.{service,timer} /etc/systemd/system || cp /lib/systemd/system/fstrim.{service,timer} /etc/systemd/system
+cp /lib/systemd/system/fstrim.{service,timer} /etc/systemd/system
 systemctl enable fstrim.timer
 
 dmesg -D

scripts/buildFilesystem.sh

@@ -167,7 +167,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential
 #Package is copied into /InstallResources/packages
 
 #Download the packages to be installed by Install.sh:
-chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice sudo pavucontrol-qt
+chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice sudo pavucontrol-qt xsecurelock
 
 
 if [ "$PRAWNOS_SUITE" = "stretch" ]
@@ -188,9 +188,6 @@ fi
 # #grab firefox from buster or higher, since stretch is broken
 chroot $outmnt apt-get -t $FIREFOX_SUITE install -d -y firefox-esr
 
-# install xfce-screensaver from sid
-chroot $outmnt apt-get -t sid install -d -y xfce4-screensaver libxfce4ui-2-0
-
 #Cleanup hosts
 rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests
 echo -n "127.0.0.1        PrawnOS-Alpha" > $outmnt/etc/hosts