Clean up sway config and add BQ Aquaris X5 support

Signed-off-by: Stacy Harper <contact@stacyharper.net>

configs/appcfg/sway_template

@@ -21,11 +21,10 @@ set $term foot
 set $menu bemenu-run
 
 ### Output configuration
-
-output "DSI-1" {
-         scale 2
-         bg /usr/share/sxmo/background.jpg fill
-}
+# Set default wallpaper for all outputs
+output * bg /usr/share/sxmo/background.jpg fill
+# Set 2x scale for DSI-1 (usually a display panel)
+output "DSI-1" scale 2
 
 ### Idle
 
@@ -50,6 +49,7 @@ exec sxmo_idle.sh start
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 
+###### Device-specific
 # repeat_delay how much time in milisec to consider it is hold pressed
 #    should be long enough to trigger simple click easily but
 #    should be short enough to trigger a repeat before the next threshold
@@ -57,6 +57,8 @@ exec sxmo_idle.sh start
 #    adapt it accordingly with the delay.
 #    prefer a lower but enough value
 # This is enough for 4 multikeys long presses
+
+### PinePhone (pine64-pinephone) / PineTab (pine64-pinetab)
 # Power button
 input 0:0:axp20x-pek {
     repeat_delay 200
@@ -69,6 +71,28 @@ input 1:1:1c21800.lradc {
     repeat_rate 15
     xkb_file /usr/share/sxmo/sway/xkb_mobile_normal_buttons
 }
+
+### BQ Aquaris X5 (bq-paella)
+# Power button
+input 0:0:pm8941_pwrkey {
+    repeat_delay 200
+    repeat_rate 15
+    xkb_file /usr/share/sxmo/sway/xkb_mobile_normal_buttons
+}
+# Volume up button
+input 1:1:GPIO_Buttons {
+    repeat_delay 200
+    repeat_rate 15
+    xkb_file /usr/share/sxmo/sway/xkb_mobile_normal_buttons
+}
+# Volume down button
+input 0:0:pm8941_resin {
+    repeat_delay 200
+    repeat_rate 15
+    xkb_file /usr/share/sxmo/sway/xkb_mobile_normal_buttons
+}
+###### End of device-specific
+
 exec sxmo_multikey.sh clear
 
 ### Key bindings
@@ -77,14 +101,27 @@ exec sxmo_multikey.sh clear
 #
     # Start a terminal
     bindsym $mod+Return exec $term
-    bindsym --input-device=0:0:axp20x-pek XF86PowerOff exec sxmo_multikey.sh powerbutton "sxmo_inputhandler.sh powerbutton_one" "sxmo_inputhandler.sh powerbutton_two" "sxmo_inputhandler.sh powerbutton_three"
-    bindsym $mod+p exec sxmo_appmenu.sh
 
-    # Lock sxmo
-    bindsym --input-device=1:1:1c21800.lradc XF86AudioRaiseVolume exec sxmo_multikey.sh volup "sxmo_inputhandler.sh volup_one" "sxmo_inputhandler.sh volup_two" "sxmo_inputhandler.sh volup_three"
+    # Launch appmenu
+    bindsym $mod+p exec sxmo_appmenu.sh
 
-    # Next workspace
-    bindsym --input-device=1:1:1c21800.lradc XF86AudioLowerVolume exec sxmo_multikey.sh voldown "sxmo_inputhandler.sh voldown_one" "sxmo_inputhandler.sh voldown_two" "sxmo_inputhandler.sh voldown_three"
+    # Multikey handling for power button
+    bindsym XF86PowerOff exec sxmo_multikey.sh powerbutton \
+        "sxmo_inputhandler.sh powerbutton_one" \
+        "sxmo_inputhandler.sh powerbutton_two" \
+        "sxmo_inputhandler.sh powerbutton_three"
+
+    # Multikey handling for volup button
+    bindsym XF86AudioRaiseVolume exec sxmo_multikey.sh volup \
+        "sxmo_inputhandler.sh volup_one" \
+        "sxmo_inputhandler.sh volup_two" \
+        "sxmo_inputhandler.sh volup_three"
+
+    # Multikey handling for voldown button
+    bindsym XF86AudioLowerVolume exec sxmo_multikey.sh voldown \
+        "sxmo_inputhandler.sh voldown_one" \
+        "sxmo_inputhandler.sh voldown_two" \
+        "sxmo_inputhandler.sh voldown_three"
 
     mode "menu" {
         bindsym --input-device=1:1:1c21800.lradc XF86AudioMute exec nothing # placeholder for "menu" mode

scripts/core/sxmo_menumode_toggler.sh

@@ -3,6 +3,10 @@
 inputs="
 	1:1:1c21800.lradc
 	0:0:axp20x-pek
+
+	0:0:pm8941_pwrkey
+	1:1:GPIO_Buttons
+	0:0:pm8941_resin
 "
 
 setup_xkb() {