Merge branch 'master' of git://git.draconx.ca/fvwmconf

[fvwmconf.git] / config

diff --git a/config b/config
index b652a53012518910ca3838faa182820ef5524621..5a3f26e3d2d2c853527d7797fa71de6cc397830d 100644 (file)
--- a/config
+++ b/config
@@ -4,25 +4,38 @@ ImagePath $[FVWM_USERDIR]/icons:$[FVWM_USERDIR]/pixmaps
 DestroyFunc InitFunction
 DestroyFunc StartFunction
 DestroyFunc ExitFunction
+
+# Global environment
 SetEnv TERMINAL $[HOME]/bin/urxvt.sh
 PipeRead 'echo SetEnv HOST `hostname`'
 
+SetEnv MUSIC /home/music
+
 SetEnv XMODIFIERS '@im=uim'
 SetEnv GTK_IM_MODULE 'uim'
 SetEnv QT_IM_MODULE 'uim'
 
+SetEnv GTK2_RC_FILES $[FVWM_USERDIR]/gtk2rc
+
 # Global Features
 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"
+
+# Menus (must be loaded after themes)
+Read global/windowmenu
+Read global/alttab
 
 # Virtual Desktops
 DesktopSize 6x1
 EdgeThickness 1
-EdgeResistance 1 0
+EdgeResistance 1
+Style * EdgeMoveDelay 1, EdgeMoveResistance 0
 EdgeScroll 0 0
 
 #####
@@ -39,7 +52,7 @@ CursorStyle Menu left_ptr
 # Global Styles and Options
 HideGeometryWindow Move
 OpaqueMoveSize -1
-Style * TileCascadePlacement, GrabFocusOff
+Style * MinOverlapPlacement, GrabFocusOff
 Style * ResizeOpaque
 Style * EWMHUseStrutHints, MwmButtons