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

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 0575243..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
@@ -94,15 +93,15 @@ define(`TERM_KOI8_SSH',
 TERM_TITLE_SSH(TERM_KOI8, $1, $2))
 
 define(`SSH_SCREEN_KOI8',
-`-t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-koi8')
+`SSH -t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-koi8')
 define(`SSH_SCREEN_UTF8',
-`-t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-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))
@@ -631,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