From 007181a21a5cfc57edd5028f1675cf0b60e4218b Mon Sep 17 00:00:00 2001
From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
Date: Wed, 8 Jan 2025 09:24:02 -0800
Subject: [PATCH 1/7] configuration changes for default labwc session

- Combines two prior patches into one, as they're both for the labwc
session.
- Sets openSUSE background for labwc session
- Adjusts the pointerspeed to make the default mouse pointer less twitchy
- Moves user configs from default labwc locations, to avoid config
  conflicts
- Add LABWC_CONFIG_DIR env variable for labwc-tweaks compatibility
---
 configurations/labwc/autostart |  2 +-
 configurations/labwc/rc.xml    |  2 +-
 startlxqtwayland.in            | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configurations/labwc/autostart b/configurations/labwc/autostart
index fa49741..a756d24 100644
--- a/configurations/labwc/autostart
+++ b/configurations/labwc/autostart
@@ -3,7 +3,7 @@
 # Preferred place for starting wayland-only applications
 
 # Set background color or image (below the desktop):
-swaybg -i /usr/share/lxqt/wallpapers/origami-dark-labwc.png  >/dev/null 2>&1 &
+swaybg -i /usr/share/wallpapers/openSUSEdefault/contents/images/default.png  >/dev/null 2>&1 &
 
 # Faster startup for GTK apps:
 dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY > /dev/null 2>&1 &
diff --git a/configurations/labwc/rc.xml b/configurations/labwc/rc.xml
index d30f842..b8ffd86 100644
--- a/configurations/labwc/rc.xml
+++ b/configurations/labwc/rc.xml
@@ -662,7 +662,7 @@
     <device category="default">
       <naturalScroll></naturalScroll>
       <leftHanded></leftHanded>
-      <pointerSpeed>1</pointerSpeed>
+      <pointerSpeed>0.0</pointerSpeed>
       <accelProfile></accelProfile>
       <tap>yes</tap>
       <tapButtonMap></tapButtonMap>
diff --git a/startlxqtwayland.in b/startlxqtwayland.in
index ca713c5..dda2ee5 100644
--- a/startlxqtwayland.in
+++ b/startlxqtwayland.in
@@ -97,10 +97,10 @@ if  [ -z "$COMPOSITOR" ]; then
 
 elif [ "$COMPOSITOR" = "labwc" ]; then
     # Copy default configuration if not existing and set keyboard layout if different from us
-    if [ ! -d "$XDG_CONFIG_HOME/labwc" ]; then
-       cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/  # use default location here
+    if [ ! -d "$XDG_CONFIG_HOME/lxqt/labwc" ]; then
+       cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/lxqt/labwc/  # use default location here
        if echo "$valid_layouts" | grep -q "$trylayout"; then
-          echo "XKB_DEFAULT_LAYOUT=$trylayout" >> $XDG_CONFIG_HOME/labwc/environment
+          echo "XKB_DEFAULT_LAYOUT=$trylayout" >> $XDG_CONFIG_HOME/lxqt/labwc/environment
        fi
     fi
 
@@ -110,7 +110,9 @@ elif [ "$COMPOSITOR" = "labwc" ]; then
         echo "Running on virtualized hardware"
     fi
 
-    exec $COMPOSITOR -C $XDG_CONFIG_HOME/labwc -S lxqt-session
+    # Set LABWC_CONFIG_DIR for labwc-tweaks compatibility
+    export LABWC_CONFIG_DIR=$XDG_CONFIG_HOME/lxqt/labwc
+    exec $COMPOSITOR -C $XDG_CONFIG_HOME/lxqt/labwc -S lxqt-session
 
 elif [ "$COMPOSITOR" = "niri" ]; then
     if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-niri.kdl" ]; then
-- 
2.49.0