X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=9ca1fd93e22369f532a9a1d9f95840b2c18b0db8;hb=bb53f00ff30828e780af5833fb5ef96e1ce0aebd;hp=98905037db81cbd9c69286575feeaecba83c476b;hpb=10ed04ab0d9665c425dc9878b46fd47d75b2d50a;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 9890503..9ca1fd9 100644
--- 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))
@@ -629,34 +630,18 @@ DestroyFunc Id3Info
 AddToFunc Id3Info             I Exec "$HOME"/lib/audio/mp3/id3info.py "`audtool --current-song-filename`" | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 changequote([`], ['])
 
-DestroyFunc AudioPlayer
-AddToFunc AudioPlayer         I GotoDeskAndPage 0 1 1
-+                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 400 deadbeef
-
 DestroyFunc Term-Iskra
 AddToFunc Term-Iskra          I GotoDeskAndPage 1 1 2
 +                             I TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra)
 
-DestroyFunc Term-Iskra-Big
-AddToFunc Term-Iskra-Big      I GotoDeskAndPage 1 1 2
-+                             I TERM_KOI8_BIG_SSH(iskra-aviel.phdru.name, ISKRA)
-
 DestroyFunc Term-Oper
 AddToFunc Term-Oper           I GotoDeskAndPage 1 1 2
 +                             I TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper)
 
-DestroyFunc Term-Oper-Big
-AddToFunc Term-Oper-Big       I GotoDeskAndPage 1 1 2
-+                             I TERM_KOI8_BIG_SSH(oper.med.ru, OPER)
-
 DestroyFunc Term-Phdru
 AddToFunc Term-Phdru          I GotoDeskAndPage 1 0 1
 +                             I TERM_KOI8_SSH_SCREEN(phdru.name, phdru.name)
 
-DestroyFunc Term-Phdru-Big
-AddToFunc Term-Phdru-Big      I GotoDeskAndPage 1 0 1
-+                             I TERM_KOI8_BIG_SSH(phdru.name, phdru.name)
-
 DestroyFunc Term3Hosts
 AddToFunc Term3Hosts          I Term-Iskra
 +                             I Wait TERM
@@ -968,9 +953,9 @@ pushdef(`TERM_KOI8', `Exec "TERM" LC_CTYPE=ru_RU.KOI8-R exec TERM')
 pushdef(`TERM_RU_UTF8', `Exec "URxvt" LC_CTYPE=ru_RU.UTF-8 exec TERM -name URxvt')
 *FvwmButtons: (Title Term,     Icon rterm2.xpm,      Action TERM_KOI8)
 *FvwmButtons: (Title UTF-8,    Icon rterm2.xpm,      Action TERM_RU_UTF8)
-*FvwmButtons: (Title "phdru (koi8,scr)",    Icon xterm-sgi.xpm,   Action TERM_KOI8_SSH_SCREEN(phdru.name, phdru.name))
-*FvwmButtons: (Title "iskra (koi8,scr)",    Icon xterm-sgi.xpm,   Action TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra))
-*FvwmButtons: (Title "oper (koi8,scr)",     Icon xterm-linux.xpm, Action TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper))
+*FvwmButtons: (Title "phdru (k8,s)",    Icon xterm-sgi.xpm,   Action TERM_KOI8_SSH_SCREEN(phdru.name, phdru.name))
+*FvwmButtons: (Title "iskra (k8,s)",    Icon xterm-sgi.xpm,   Action TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra))
+*FvwmButtons: (Title "oper (k8,s)",     Icon xterm-linux.xpm, Action TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper))
 popdef(`TERM_KOI8', `TERM_RU_UTF8')
 
 *FvwmButtons: (Title Wallpaper, Icon find1.xpm,        Action Exec "gxmessage" "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
@@ -1008,7 +993,7 @@ popdef(`TERM_KOI8', `TERM_RU_UTF8')
 #*Rlogin: Input        UserName  10   ""
 #*Rlogin: Line         expand
 #*Rlogin: Button       quit "Login" ^M
-#*Rlogin: Command      TERM_KOI8 -T term@$(HostName) -e rlogin $(HostName) $(Custom?-l $(UserName))
+`#'*Rlogin: Command      TERM_KOI8 -T term@$(HostName) -e rlogin $(HostName) $(Custom?-l $(UserName))
 #*Rlogin: Button       restart   "Clear"
 #*Rlogin: Command Beep
 #*Rlogin: Button       quit "Cancel"