.fvwmrc: Move `SSH` into `SSH_SCREEN_*` macros

[dotfiles.git] / .fvwm / main.m4

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 1095e1495865ccf21b80f0757b83201aed682c5e..12ddc6acb4ba52c6f5833cd48f67aa6dc35d4000 100644 (file)
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -4,13 +4,12 @@
 
 dnl The file is in m4 format, use FvwmM4 module to read it
 dnl like this: ModuleSynchronous FvwmM4 -lock main.m4
-
+dnl
 dnl This is to prevent FvwmM4 to shadow $HOME
-undefine(`HOME')
-
+undefine(`HOME')dnl
+dnl
 dnl Echo dimension
 `#' width = WIDTH
-
 divert(-1)
 
 dnl TrueType Fonts
@@ -93,14 +92,16 @@ define(`TERM_TITLE_SSH', `$1 -title "$3" -n "$3" -e SSH $2')
 define(`TERM_KOI8_SSH',
 TERM_TITLE_SSH(TERM_KOI8, $1, $2))
 
-define(`SSH_SCREEN_KOI8', `-t $1 exec /usr/bin/screen -xRR -S default-koi8')
-define(`SSH_SCREEN_UTF8', `-t $1 exec /usr/bin/screen -xRR -S default-utf8')
+define(`SSH_SCREEN_KOI8',
+`SSH -t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-koi8')
+define(`SSH_SCREEN_UTF8',
+`SSH -t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-utf8')
 
 define(`TERM_TITLE_SSH_SCREEN_KOI8',
-`$1 -title "$3 scr" -n "$3 scr" -e SSH SSH_SCREEN_KOI8($2)')
+`$1 -title "$3 scr" -n "$3 scr" -e SSH_SCREEN_KOI8($2)')
 
 define(`TERM_TITLE_SSH_SCREEN_UTF8',
-`$1 -title "$3 scr" -n "$3 scr" -e SSH SSH_SCREEN_UTF8($2)')
+`$1 -title "$3 scr" -n "$3 scr" -e SSH_SCREEN_UTF8($2)')
 
 define(`MENU_TERM_KOI8_SSH',
 "$2 (koi8)" TERM_KOI8_SSH($1, $2))