From 49b435d24fcc845c2773766bdf3ef3116d135285 Mon Sep 17 00:00:00 2001 From: tetrakist Date: Thu, 4 Mar 2021 11:22:25 -0800 Subject: [PATCH] Make Xresource loading generic. Call xrdb with "-merge". Signed-off-by: Maarten van Gompel --- scripts/core/sxmo_xinit.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/core/sxmo_xinit.sh b/scripts/core/sxmo_xinit.sh index 55d475a..4813e69 100755 --- a/scripts/core/sxmo_xinit.sh +++ b/scripts/core/sxmo_xinit.sh @@ -35,9 +35,10 @@ xdefaults() { xmodmap /usr/share/sxmo/appcfg/xmodmap_caps_esc xsetroot -mod 29 29 -fg '#0b3a4c' -bg '#082430' xset s off -dpms - xrdb /usr/share/sxmo/appcfg/xresources_xcalc.xr - xrdb /usr/share/sxmo/appcfg/xresources_dmenu.xr - [ -e "$HOME"/.Xresources ] && xrdb "$HOME"/.Xresources + for xr in /usr/share/sxmo/appcfg/*.xr; do + xrdb -merge "$xr" + done + [ -e "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources synclient TapButton1=1 TapButton2=3 TapButton3=2 MinSpeed=0.25 }