summaryrefslogtreecommitdiff
path: root/initvars.config
diff options
context:
space:
mode:
Diffstat (limited to 'initvars.config')
-rw-r--r--initvars.config70
1 files changed, 34 insertions, 36 deletions
diff --git a/initvars.config b/initvars.config
index 24b21e0..aaa4dd2 100644
--- a/initvars.config
+++ b/initvars.config
@@ -1,13 +1,9 @@
## Initialization of variables
-# Height and width of the viewport
-SetEnv height $[vp.height]
-SetEnv width $[vp.width]
-
# heights of panel apps
-SetEnv fvwm_config_trayheight 26
-SetEnv fvwm_config_clockheight 64
-PipeRead 'echo SetEnv fvwm_config_pagerheight $(($[vp.height] - 64 -26))'
+InfoStoreAdd trayheight 26
+InfoStoreAdd clockheight 64
+PipeRead 'echo InfoStoreAdd pagerheight $(($[vp.height] - $[infostore.trayheight] - $[infostore.clockheight]))'
##############################
## Set default applications ##
@@ -16,36 +12,36 @@ PipeRead 'echo SetEnv fvwm_config_pagerheight $(($[vp.height] - 64 -26))'
# Default terminal
DestroyFunc set_terminal
AddToFunc set_terminal
-+ I Test (EnvIsSet fvwm_config_terminal) Nop
++ I Test (EnvIsSet fvwm_config_terminal) InfoStoreAdd terminal $[fvwm_config_terminal]
+ I TestRc (Match) Break
-+ I Test (x urxvt) SetEnv fvwm_config_terminal urxvt
++ I Test (x urxvt) InfoStoreAdd terminal urxvt
+ I TestRc (Match) Break
-+ I Test (x urxvtcd) SetEnv fvwm_config_terminal urxvtcd
++ I Test (x urxvtcd) InfoStoreAdd terminal urxvtcd
+ I TestRc (Match) Break
-+ I Test (x gnome-terminal) SetEnv fvwm_config_terminal gnome-terminal
++ I Test (x gnome-terminal) InfoStoreAdd terminal gnome-terminal
+ I TestRc (Match) Break
-+ I Test (x konsole) SetEnv fvwm_config_terminal konsole
++ I Test (x konsole) InfoStoreAdd terminal konsole
+ I TestRc (Match) Break
-+ I Test (x rxvt) SetEnv fvwm_config_terminal rxvt
++ I Test (x rxvt) InfoStoreAdd terminal rxvt
+ I TestRc (Match) Break
-+ I Test (x mrxvt) SetEnv fvwm_config_terminal mrxvtv
++ I Test (x mrxvt) InfoStoreAdd terminal mrxvtv
+ I TestRc (Match) Break
-+ I Test (x eterm) SetEnv fvwm_config_terminal eterm
++ I Test (x eterm) InfoStoreAdd terminal eterm
+ I TestRc (Match) Break
-+ I Test (x aterm) SetEnv fvwm_config_terminal aterm
++ I Test (x aterm) InfoStoreAdd terminal aterm
+ I TestRc (Match) Break
-+ I Test (x xterm) SetEnv fvwm_config_terminal xterm
++ I Test (x xterm) InfoStoreAdd terminal xterm
set_terminal
DestroyFunc set_terminal
#keyboard layout tool
DestroyFunc set_xkb_tool
AddToFunc set_xkb_tool
-+ I Test (EnvIsSet fvwm_config_xkb_tool) Nop
++ I Test (EnvIsSet fvwm_config_xkb_tool) InfoStoreAdd xkb_tool $[fvwm_config_xkb_tool]
+ I TestRc (Match) Break
-+ I Test (x fbxkb) SetEnv fvwm_config_xkb_tool fbxkb
++ I Test (x fbxkb) InfoStoreAdd xkb_tool fbxkb
+ I TestRc (Match) Break
-+ I Test (x kxkb) SetEnv fvwm_config_xkb_tool kxkb
++ I Test (x kxkb) InfoStoreAdd xkb_tool kxkb
+ I TestRc (Match) Break
set_xkb_tool
DestroyFunc set_xkb_tool
@@ -53,11 +49,11 @@ DestroyFunc set_xkb_tool
#clipboard manager
DestroyFunc set_clipboard_manager
AddToFunc set_clipboard_manager
-+ I Test (EnvIsSet fvwm_config_clipboard_manager) Nop
++ I Test (EnvIsSet fvwm_config_clipboard_manager) InfoStoreAdd clipboard_manager $[fvwm_config_clipboard_manager]
+ I TestRc (Match) Break
-+ I Test (x parcellite) SetEnv fvwm_config_clipboard_manager parcellite
++ I Test (x parcellite) InfoStoreAdd clipboard_manager parcellite
+ I TestRc (Match) Break
-+ I Test (x klipper) SetEnv fvwm_config_clipboard_manager klipper
++ I Test (x klipper) InfoStoreAdd clipboard_manager klipper
+ I TestRc (Match) Break
set_clipboard_manager
DestroyFunc set_clipboard_manager
@@ -65,26 +61,28 @@ DestroyFunc set_clipboard_manager
# Wallpaper directory
DestroyFunc set_wallpaper_dir
AddToFunc set_wallpaper_dir
-+ I Test (x "$[HOME]/gallery/wallpapers") SetEnv WALLPAPERDIR "$[HOME]/gallery/wallpapers/"
++ I Test (EnvIsSet fvwm_config_wallpaperdir) InfoStoreAdd wallpaperdir $[fvwm_config_wallpaperdir]
++ I TestRC (Match) Break
++ I Test (x "$[HOME]/gallery/wallpapers") InfoStoreAdd wallpaperdir "$[HOME]/gallery/wallpapers/"
+ I TestRC (Match) Break
-+ I Test (x "$[HOME]/system/wallpapers") SetEnv WALLPAPERDIR "$[HOME]/system/wallpapers/"
++ I Test (x "$[HOME]/system/wallpapers") InfoStoreAdd wallpaperdir "$[HOME]/system/wallpapers/"
+ I TestRc (Match) Break
-+ I Test (x "$[HOME]/wallpapers") SetEnv WALLPAPERDIR "$[HOME]/wallpapers/"
++ I Test (x "$[HOME]/wallpapers") InfoStoreAdd wallpaperdir "$[HOME]/wallpapers/"
+ I TestRc (Match) Break
-+ I Test (x "$[FVWM_USERDIR]/wallpapers") SetEnv WALLPAPERDIR "$[FVWM_USERDIR]/wallpapers/"
++ I Test (x "$[FVWM_USERDIR]/wallpapers") InfoStoreAdd wallpaperdir "$[FVWM_USERDIR]/wallpapers/"
+ I TestRc (Match) Break
-+ I SetEnv WALLPAPERDIR "$[FVWM_USERDIR]"
++ I InfoStoreAdd wallpaperdir "$[FVWM_USERDIR]"
set_wallpaper_dir
DestroyFunc set_wallpaper_dir
# Clock
DestroyFunc set_clock
AddToFunc set_clock
-+ I Test (EnvIsSet fvwm_config_clock) Nop
++ I Test (EnvIsSet fvwm_config_clock) InfoStoreAdd clock $[fvwm_config_clock]
+ I TestRc (Match) Break
-+ I Test (x dclock) SetEnv fvwm_config_clock dclock
++ I Test (x dclock) InfoStoreAdd clock dclock
+ I TestRc (Match) Break
-+ I Test (x xclock) SetEnv fvwm_config_clock xclock
++ I Test (x xclock) InfoStoreAdd clock xclock
+ I TestRc (Match) Break
set_clock
DestroyFunc set_clock
@@ -92,15 +90,15 @@ DestroyFunc set_clock
# Lock screen
DestroyFunc set_lock
AddToFunc set_lock
-+ I Test (EnvIsSet fvwm_config_lock) Nop
++ I Test (EnvIsSet fvwm_config_lock) InfoStoreAdd lock $[fvwm_config_lock]
+ I TestRc (Match) Break
-+ I Test (x xlock) SetEnv fvwm_config_lock xlock
++ I Test (x xlock) InfoStoreAdd lock xlock
+ I TestRc (Match) Break
-+ I Test (x xscreensaver-command) SetEnv fvwm_config_lock "xscreensaver-command -lock"
++ I Test (x xscreensaver-command) InfoStoreAdd lock "xscreensaver-command -lock"
+ I TestRc (Match) Break
-+ I Test (x alock) SetEnv fvwm_config_lock alock
++ I Test (x alock) InfoStoreAdd lock alock
+ I TestRc (Match) Break
-+ I Test (x slock) SetEnv fvwm_config_lock slock
++ I Test (x slock) InfoStoreAdd lock slock
+ I TestRc (Match) Break
set_lock
DestroyFunc set_lock