Merge panel.config to config.

2 files changed, 52 insertions, 49 deletions

diff --git a/config b/config
index ca25326..9189781 100644
--- a/config
+++ b/config
@@ -14,13 +14,27 @@ DefaultFont -*-fixed-*-*-*-*-14-*-*-*-*-*-iso10646-1
 # Basic commands #
 ##################
 
-DesktopSize 1x7
+#   pager_height = viewport_height - dclock - stalonetray
+PipeRead 'echo SetEnv fvwm_config_pagerheight $(($[vp.height] - 80 -64))'
+#   96 pixels per page
+PipeRead 'echo SetEnv fvwm_config_pages $(($[fvwm_config_pagerheight]/96))'
+DesktopSize 1x$[fvwm_config_pages]
 EdgeThickness 0
 EdgeScroll 100 100
 OpaqueMoveSize unlimited
 HideGeometryWindow Always
 IgnoreModifiers L25
 EdgeResistance -1
+EwmhBaseStruts 0 128 0 0
+
+Read initvars.config
+Read functions.config
+Read colorset.config
+Read font.config
+Read bindings.config
+Read styles.config
+Read deco.config
+Read menu.config
 
 #####################
 # STARTUP FUNCTIONS #
@@ -28,17 +42,12 @@ EdgeResistance -1
 
 DestroyFunc StartFunction
 AddToFunc StartFunction
-+ I Read initvars.config
-+ I Read functions.config
 + I Test (Init) RandomWall
-+ I Read colorset.config
-+ I Read font.config
-+ I Read bindings.config
-+ I Read styles.config
-+ I Read deco.config
-+ I Read panel.config
-+ I Read menu.config
++ I Piperead 'echo SetEnv i $(($[vp.height] - 4))'
++ I Module FvwmButtons -g 124x$[i]-0+0 FvwmTaskbar
++ I UnsetEnv i
 + I All (maximized) WindowStyle !Borders, !Title, ResizeHintOverride
++ I All (Maximized) Maximize true
 + I UpdateStyles
 + I Module FvwmCommandS
 + I Module FvwmEvent
@@ -50,6 +59,10 @@ DestroyFunc ExitFunction
 AddToFunc ExitFunction
 + I Test (!torestart) exec exec rm -f /dev/shm/icon.tmp.*
 
+#########################
+# Modules configuration #
+#########################
+
 # Config for the FvwmIdent
 DestroyModuleConfig FvwmIdent: *
 *FvwmIdent: Colorset 8
@@ -59,3 +72,32 @@ DestroyModuleConfig FvwmIdent: *
 DestroyModuleConfig FvwmEvent: *
 *FvwmEvent: StartDelay 4
 *FvwmEvent: add_window FvwmWindowAutoMaximize
+
+#####   PANEL   #####
+
+# PAGER
+DestroyModuleconfig FvwmPager: *
+*FvwmPager: Balloons
+*FvwmPager: DeskHilight
+*FvwmPager: WindowBorderWidth 2
+*FvwmPager: BalloonColorset * 12
+*FvwmPager: Colorset * 6
+*FvwmPager: HilightColorset * 10
+*FvwmPager: WindowColorsets 11 12
+*FvwmPager: BalloonFont $[ThemeTitleFont]
+*FvwmPager: Font none
+*FvwmPager: SmallFont $[ThemeMiniFont]
+*FvwmPager: UseSkipList
+*FvwmPager: Window3DBorders
+
+# PANEL
+DestroyModuleConfig FvwmTaskbar: *
+*FvwmTaskbar: Frame 1
+*FvwmTaskbar: Font $[ThemeTitleFont]
+*FvwmTaskbar: Colorset 9
+*FvwmTaskbar: Rows $[vp.height]
+*FvwmTaskbar: Columns 2
+*FvwmTaskbar: (2x$[fvwm_config_pagerheight], Swallow 'FvwmPager' 'FvwmPager')
+*FvwmTaskbar: (2x64, Swallow (NoClose, UseOld) stalonetray 'Exec stalonetray --no-shrink')
+*FvwmTaskbar: (2x64, Swallow 'dclock' 'Exec dclock')
+Style FvwmTaskbar Colorset 2, HandleWidth 2, BorderWidth 2
diff --git a/panel.config b/panel.config
deleted file mode 100644
index 6b13fb4..0000000
--- a/panel.config
+++ /dev/null
@@ -1,39 +0,0 @@
-SetEnv title_width 18
-Piperead 'echo SetEnv pager_height $(($[height]-80-64))'
-Piperead 'echo SetEnv pages $((pager_height/96))'
-DesktopSize 1x$[pages]
-
-# PAGER
-DestroyModuleconfig FvwmPager: *
-*FvwmPager: Balloons
-*FvwmPager: DeskHilight
-*FvwmPager: WindowBorderWidth 2
-*FvwmPager: BalloonColorset * 12
-*FvwmPager: Colorset * 6
-*FvwmPager: HilightColorset * 10
-*FvwmPager: WindowColorsets 11 12
-*FvwmPager: BalloonFont $[ThemeTitleFont]
-*FvwmPager: Font none
-*FvwmPager: SmallFont $[ThemeMiniFont]
-*FvwmPager: UseSkipList
-*FvwmPager: Window3DBorders
-
-# PANEL
-DestroyModuleConfig FvwmTaskbar: *
-*FvwmTaskbar: Frame 1
-*FvwmTaskbar: Font $[ThemeTitleFont]
-*FvwmTaskbar: Colorset 9
-*FvwmTaskbar: Rows $[vp.height]
-*FvwmTaskbar: Columns 2
-*FvwmTaskbar: (2x$[pager_height], Swallow 'FvwmPager' 'FvwmPager')
-#*FvwmTaskbar: (1x64, Swallow (Close, UseOld) 'wmbubble' 'Exec wmbubble')
-#*FvwmTaskbar: (1x64, Swallow (Close, UseOld) 'AlsaMixer.app' 'Exec AlsaMixer.app')
-*FvwmTaskbar: (2x64, Swallow (NoClose, UseOld) stalonetray 'Exec stalonetray --no-shrink')
-*FvwmTaskbar: (2x64, Swallow 'dclock' 'Exec dclock')
-
-AddToFunc StartFunction I Piperead 'echo SetEnv i $(($[height] - 4))'
-AddToFunc StartFunction I Module FvwmButtons -g 124x$[i]-0+0 FvwmTaskbar
-AddToFunc StartFunction I EwmhBaseStruts 0 128 0 0
-AddToFunc StartFunction I UnsetEnv i
-AddToFunc StartFunction I All (Maximized) Maximize true
-AddToFunc StartFunction I Style FvwmTaskbar Colorset 2, HandleWidth 2, BorderWidth 2