Merge git://git.draconx.com/fvwmconf

[fvwmconf.git] / config

diff --git a/config b/config
index b652a53012518910ca3838faa182820ef5524621..b256285d5d72a6acfd4dc537d61368a48454604d 100644 (file)
--- a/config
+++ b/config
@@ -15,14 +15,18 @@ SetEnv QT_IM_MODULE 'uim'
 Read global/multiscreen
 Read global/fullscreen
 Read global/windowmenu
+Read global/appspecific
 
 # Machine-specific features
-Read $[HOST]/config
+PipeRead "[ -f '$[FVWM_USERDIR]/$[HOST]/config' ] \
+          && echo Read $[HOST]/config \
+         || echo Read default/config"
 
 # Virtual Desktops
 DesktopSize 6x1
 EdgeThickness 1
-EdgeResistance 1 0
+EdgeResistance 1
+Style * EdgeMoveDelay 1, EdgeMoveResistance 0
 EdgeScroll 0 0
 
 #####