Split the .fvwm directory into global, common, and host-specific subdirectories.

diff --git a/artemis/config b/artemis/config
new file mode 100644 (file)
index 0000000..d9d74e7
--- /dev/null
+++ b/artemis/config
@@ -0,0 +1,27 @@
+# Import common features
+Read common/bindings
+Read common/nickstheme
+
+# Bigger fonts must be set before including rootmenu
+Style * Font 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+Style * IconFont 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+MenuStyle * Font 'xft:M+1P+IPAG:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+MenuStyle * TitleFont 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+
+Read common/rootmenu
+Read common/wallpaper
+Read common/panels
+Read common/modifier
+
+
+# Bindings for the modifier key
+Mouse 1 WFT 4  Mod_M1Func
+Mouse 2 WFT 4  Mod_M2Func
+Mouse 3 WFT 4  Mod_M3Func
+Mouse 1 WFT 42 Mod_M1Func
+Mouse 2 WFT 42 Mod_M2Func
+Mouse 3 WFT 42 Mod_M3Func
+
+# Use a smaller pager
+*FvwmPager: Geometry 200x26-0-0
+EwmhBaseStruts 0 0 0 30

diff --git a/atropos/config b/atropos/config
new file mode 100644 (file)
index 0000000..29507c1
--- /dev/null
+++ b/atropos/config
@@ -0,0 +1,15 @@
+# Import common features
+Read common/bindings
+Read common/nickstheme
+Read common/rootmenu
+Read common/wallpaper
+Read common/panels
+Read common/modifier
+
+# Bindings for the modifier key
+Mouse 1 WFT M  Mod_M1Func
+Mouse 2 WFT M  Mod_M2Func
+Mouse 3 WFT M  Mod_M3Func
+
+# Struts for the pager.
+EwmhBaseStruts 0 0 0 42

diff --git a/bindings b/common/bindings
similarity index 80%
rename from bindings
rename to common/bindings
index 35ed961a1ae1fa9a7c98d393227477128dbfffe8..4d0ce486d2a7132ab320c201461579b7404632e9 100644 (file)
--- a/bindings
+++ b/common/bindings
@@ -6,6 +6,10 @@ Key Home      A CM Nop
 Key Insert    A CM Nop
 Key N         A CM Nop
 
+# Window management
+Key F4 A M  Close
+Key F4 A M2 Close
+
 # When programs don't set the resolution...
 Key F12 A C Exec exec xrandr -s 0
 
@@ -32,6 +36,11 @@ Mouse 4 R A GotoPage wrapx -1p 0p
 Mouse 4 T N Windowshade True
 Mouse 5 T N Windowshade False
 
+# Console
+Key grave A C Exec exec $[TERMINAL]
+Key F3 A M  Module FvwmConsole -terminal $[TERMINAL]
+Key F3 A M2 Module FvwmConsole -terminal $[TERMINAL]
+
 DestroyFunc DoPageMove
 AddToFunc   DoPageMove
 + I GotoPage   $0 0

diff --git a/common/modifier b/common/modifier
new file mode 100644 (file)
index 0000000..ddfc535
--- /dev/null
+++ b/common/modifier
@@ -0,0 +1,16 @@
+DestroyFunc Mod_M1Func
+AddToFunc   Mod_M1Func
+ + C Raise
+ + D Maximize 100 100
+ + M Move
+
+DestroyFunc Mod_M2Func
+AddToFunc   Mod_M2Func
+ + C Menu MenuWindow
+ + D Maximize 0 100
+
+DestroyFunc Mod_M3Func
+AddToFunc   Mod_M3Func
+ + C Lower
+ + D Maximize 100 0
+ + M PipeRead '. $[FVWM_USERDIR]/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'

diff --git a/nickstheme b/common/nickstheme
similarity index 100%
rename from nickstheme
rename to common/nickstheme

diff --git a/panels b/common/panels
similarity index 100%
rename from panels
rename to common/panels

diff --git a/rootmenu b/common/rootmenu
similarity index 88%
rename from rootmenu
rename to common/rootmenu
index 74001e867b7c167ee80650f447a34e835fdbfc23..9a62d01f32f80c1eaf96b14120bd489999cb4776 100644 (file)
--- a/rootmenu
+++ b/common/rootmenu
@@ -1,7 +1,7 @@
 MenuStyle * !TitleWarp
 
 CopyMenuStyle * MenuMPD
-MenuStyle MenuMPD ItemFormat "%.2|%3.5l%.5l%2.3>%-80.5r%.5i%1|"
+MenuStyle MenuMPD ItemFormat "%.2|%3.5l%.5l%2.3>%-70.5r%.5i%1|"
 
 DestroyMenu MenuFvwmRoot
 AddToMenu   MenuFvwmRoot
@@ -19,7 +19,6 @@ AddToFunc   MakeMenuFvwmRoot
        AddToMenu MenuFvwmRoot 'GMPC%gmpc.png%' Exec exec gmpc"
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Network%network.svg:16x16%" Popup MenuNetwork
-+ I AddToMenu MenuFvwmRoot "Games%games.svg:16x16%" Popup MenuGames
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Wallpaper%wallpaper.svg:16x16%" Popup MenuWallpaper
 + I AddToMenu MenuFvwmRoot "Music%music.svg:16x16%" Popup MenuMPD
@@ -31,10 +30,8 @@ AddToFunc   MakeMenuFvwmRoot
 DestroyMenu MenuNetwork
 AddToMenu   MenuNetwork
 + "Pan Newsreader%pan.png%" Exec exec env LC_ALL=en_CA.UTF-8 pan
-
-DestroyMenu MenuGames
-AddToMenu   MenuGames
-+ "Gens%sonic.png%" Exec exec gens
++ "Valknut%valknut.png%" Exec exec valknut
++ "aMule GUI%amule.png%" Exec exec amulegui
 
 DestroyMenu MenuMPD
 AddToMenu   MenuMPD

diff --git a/wallpaper b/common/wallpaper
similarity index 100%
rename from wallpaper
rename to common/wallpaper

diff --git a/config b/config
index ca8f1c91454edbd4320819387cc81cc7dcbc046e..9a5a447e096964145fb82d06c1f5c0ee70b9a8bd 100644 (file)
--- a/config
+++ b/config
@@ -5,16 +5,15 @@ DestroyFunc InitFunction
 DestroyFunc StartFunction
 DestroyFunc ExitFunction
 SetEnv TERMINAL /home/nick/bin/urxvt.sh
+PipeRead 'echo SetEnv HOST `hostname`'
 
-# Features
-Read multiscreen
-Read nickstheme
-Read rootmenu
-Read wallpaper
-Read windowmenu
-Read bindings
-Read panels
-Read fullscreen
+# Global Features
+Read global/multiscreen
+Read global/fullscreen
+Read global/windowmenu
+
+# Machine-specific features
+Read $[HOST]/config
 
 # Virtual Desktops
 DesktopSize 6x1
@@ -39,18 +38,6 @@ OpaqueMoveSize -1
 Style * TileCascadePlacement, GrabFocusOff
 Style * ResizeOpaque
 Style * EWMHUseStrutHints, MwmButtons
-EwmhBaseStruts 0 0 0 42
-
-# Bindings
-Key grave A C Exec exec $[TERMINAL]
-
-# FVWM Console
-Key F3 A M Module FvwmConsole -terminal $[TERMINAL]
-Key F3 A M2 Module FvwmConsole -terminal $[TERMINAL]
-
-# Close Window
-Key F4 A M Close
-Key F4 A M2 Close
 
 # Window Buttons
 Mouse 1 I N IconClick
@@ -74,31 +61,6 @@ Style Xchat DecorateTransient
 Style EasyTag_Scanner DecorateTransient
 Style "Open Image" DecorateTransient
 
-#####
-# Modifier Key
-##########
-DestroyFunc Mouse1Func
-AddToFunc   Mouse1Func
- + C Raise
- + D Maximize 100 100
- + M Move
-
-DestroyFunc Mouse2Func
-AddToFunc   Mouse2Func
- + C Menu MenuWindow
- + D Maximize 0 100
-
-DestroyFunc Mouse3Func
-AddToFunc   Mouse3Func
- + C Lower
- + D Maximize 100 0
- + M PipeRead '. $[FVWM_USERDIR]/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
-
-
-Mouse 1 WFT M Mouse1Func
-Mouse 2 WFT M Mouse2Func
-Mouse 3 WFT M Mouse3Func
-
 # URGENT!
 
 DestroyFunc UrgencyFunc

diff --git a/fullscreen b/global/fullscreen
similarity index 100%
rename from fullscreen
rename to global/fullscreen

diff --git a/multiscreen b/global/multiscreen
similarity index 100%
rename from multiscreen
rename to global/multiscreen

diff --git a/windowmenu b/global/windowmenu
similarity index 100%
rename from windowmenu
rename to global/windowmenu