summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2009-04-19 11:01:41 +0200
committerAnton Khirnov <wyskas@gmail.com>2009-04-19 11:01:41 +0200
commita4e03ccbb9dffdd20143708d72e26ecd6e3742ca (patch)
tree6475e2f0e983791288f490f9e9d3515c92710fc9
parentb16ba3a5f9cdbe5c3a10e3977b73b7aebdff0ade (diff)
Prepend environment vars with fvwm_config
-rw-r--r--bindings.config9
-rw-r--r--config4
-rw-r--r--initvars.config28
3 files changed, 20 insertions, 21 deletions
diff --git a/bindings.config b/bindings.config
index dd78a01..1b8907b 100644
--- a/bindings.config
+++ b/bindings.config
@@ -16,8 +16,7 @@ Key F3 A M Menu menu_fvwmConfig Root 10p 10p
Key C A 4 Menu menu_fvwmConfig Root 10p 10p
# FvwmConsole
-#Mouse 2 R N FvwmConsole -terminal $[terminal]
-Key F A 4 FvwmConsole -terminal $[terminal]
+Key F A 4 FvwmConsole -terminal $[fvwm_config_terminal]
# Close window
Key F4 A M Close
@@ -49,15 +48,15 @@ Key Down I N Next (CurrentPage, Iconified) Focus
Key Up I N Prev (CurrentPage, Iconified) Focus
# Launch preferred applications
-Key T A 4 Exec $[terminal]
-Key V A 4 Exec $[terminal] -e alsamixer
+Key T A 4 Exec $[fvwm_config_terminal]
+Key V A 4 Exec $[fvwm_config_terminal] -e alsamixer
# Escape and tab bindings:
# ctrl+esc: process window
# alt+tab: tipical behaviour
# ctrl+alt+tab: cycle wins in current page
# win+tab: idem
-Key Escape A C Exec $[terminal] -e htop
+Key Escape A C Exec $[fvwm_config_terminal] -e htop
Key Tab A M WindowList Root c c currentDesk, \
NoGeometry, NoCurrentDeskTitle, CurrentAtEnd, \
NoNumInDeskTitle, NoHotKeys
diff --git a/config b/config
index c9b1ac0..ae09a20 100644
--- a/config
+++ b/config
@@ -43,8 +43,8 @@ AddToFunc StartFunction
+ I UpdateStyles
+ I Module FvwmCommandS
+ I Test (Init) RandomWall
-+ I Test (EnvIsSet xkb_tool, Init) Exec $xkb_tool
-+ I Test (EnvIsSet clipboard_manager, Init) Exec $clipboard_manager
++ I Test (EnvIsSet fvwm_config_xkb_tool, Init) Exec $[fvwm_config_xkb_tool]
++ I Test (EnvIsSet fvwm_config_clipboard_manager, Init) Exec $[fvwm_config_clipboard_manager]
+ I Test (Restart) All (Iconic) Test (f $[FVWM_USERDIR]/tmp/icon.tmp.$[w.id].png) WindowStyle IconOverride, icon $[FVWM_USERDIR]/tmp/icon.tmp.$[w.id].png
DestroyFunc ExitFunction
diff --git a/initvars.config b/initvars.config
index 187e31f..4e0b98e 100644
--- a/initvars.config
+++ b/initvars.config
@@ -16,32 +16,32 @@ SetEnv width $[vp.width]
# Default terminal
DestroyFunc set_terminal
AddToFunc set_terminal
-+ I Test (EnvIsSet terminal) Nop
++ I Test (EnvIsSet fvwm_config_terminal) Nop
+ I TestRc (Match) Break
-+ I Test (x urxvtcd) SetEnv terminal urxvt
++ I Test (x urxvtcd) SetEnv fvwm_config_terminal urxvt
+ I TestRc (Match) Break
-+ I Test (x terminal) SetEnv terminal terminal
++ I Test (x terminal) SetEnv fvwm_config_terminal terminal
+ I TestRc (Match) Break
-+ I Test (x rxvt) SetEnv terminal rxvt
++ I Test (x rxvt) SetEnv fvwm_config_terminal rxvt
+ I TestRc (Match) Break
-+ I Test (x mrxvt) SetEnv terminal mrxvtv
++ I Test (x mrxvt) SetEnv fvwm_config_terminal mrxvtv
+ I TestRc (Match) Break
-+ I Test (x eterm) SetEnv terminal eterm
++ I Test (x eterm) SetEnv fvwm_config_terminal eterm
+ I TestRc (Match) Break
-+ I Test (x aterm) SetEnv terminal aterm
++ I Test (x aterm) SetEnv fvwm_config_terminal aterm
+ I TestRc (Match) Break
-+ I Test (x xtern) SetEnv terminal xterm
++ I Test (x xtern) SetEnv fvwm_config_terminal xterm
set_terminal
DestroyFunc set_terminal
#keyboard layout tool
DestroyFunc set_xkb_tool
AddToFunc set_xkb_tool
-+ I Test (EnvIsSet xkb_tool) Nop
++ I Test (EnvIsSet fvwm_config_xkb_tool) Nop
+ I TestRc (Match) Break
-+ I Test (x fbxkb) SetEnv xkb_tool fbxkb
++ I Test (x fbxkb) SetEnv fvwm_config_xkb_tool fbxkb
+ I TestRc (Match) Break
-+ I Test (x kxkb) SetEnv xkb_tool kxkb
++ I Test (x kxkb) SetEnv fvwm_config_xkb_tool kxkb
+ I TestRc (Match) Break
set_xkb_tool
DestroyFunc set_xkb_tool
@@ -49,11 +49,11 @@ DestroyFunc set_xkb_tool
#clipboard manager
DestroyFunc set_clipboard_manager
AddToFunc set_clipboard_manager
-+ I Test (EnvIsSet clipboard_manager) Nop
++ I Test (EnvIsSet fvwm_config_clipboard_manager) Nop
+ I TestRc (Match) Break
-+ I Test (x parcellite) SetEnv clipboard_manager parcellite
++ I Test (x parcellite) SetEnv fvwm_config_clipboard_manager parcellite
+ I TestRc (Match) Break
-+ I Test (x klipper) SetEnv clipboard_manager klipper
++ I Test (x klipper) SetEnv fvwm_config_clipboard_manager klipper
+ I TestRc (Match) Break
set_clipboard_manager
DestroyFunc set_clipboard_manager