.fvwmrc: Fix quoting

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

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 328d40e7258247e952eec0c2a1b78ae839d99e8f..23c7f5dc793089995fe5afd7bb68632218704cee 100644 (file)
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -77,10 +77,10 @@ define(`TERM_EN_UTF8', `Exec LC_CTYPE=en_US.UTF-8 exec TERM -name URxvt')
 define(`TERM_HEB_UTF8', `Exec LC_CTYPE=he_IL.UTF-8 exec TERM -name URxvt')
 define(`TERM_KOI8_BOTLT', `TERM_KOI8 -geometry TERM_GEOM_BOTLT')
 define(`TERM_RU_UTF8_BOTLT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTLT')
-define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT')
+define(`TERM_KOI8_BOTRT', ``TERM_KOI8' -geometry TERM_GEOM_BOTRT')
 define(`TERM_RU_UTF8_BOTRT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTRT')
-define(`TERM_KOI8_BIG', TERM_KOI8 -geometry TERM_GEOM_BIG)
-define(`TERM_UTF8_BIG', TERM_RU_UTF8 -geometry TERM_GEOM_BIG)
+define(`TERM_KOI8_BIG', `TERM_KOI8 -geometry TERM_GEOM_BIG')
+define(`TERM_UTF8_BIG', `TERM_RU_UTF8 -geometry TERM_GEOM_BIG')
 
 
 define(`SSH', `cgmem_nice 300 ssh')
@@ -90,27 +90,27 @@ define(`TERM_SSH', `$1 -e SSH $2')
 define(`TERM_TITLE_SSH', `$1 -title "$3" -n "$3" -e SSH $2')
 
 define(`TERM_KOI8_SSH',
-TERM_TITLE_SSH(TERM_KOI8, $1, $2))
+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))
 
 define(`TERM_KOI8_BOTLT_SSH',
-TERM_TITLE_SSH(TERM_KOI8_BOTLT, $1, $2))
+TERM_TITLE_SSH(`TERM_KOI8_BOTLT', $1, $2))
 
 define(`TERM_KOI8_BOTRT_SSH',
-TERM_TITLE_SSH(TERM_KOI8_BOTRT, $1, $2))
+TERM_TITLE_SSH(`TERM_KOI8_BOTRT', $1, $2))
 
 define(`MENU_TERM_KOI8_BOTLT_SSH',
 "$2 (btlt,koi8)" TERM_KOI8_BOTLT_SSH($1, $2))
@@ -119,16 +119,16 @@ define(`MENU_TERM_KOI8_BOTRT_SSH',
 "$2 (btrt,koi8)" TERM_KOI8_BOTRT_SSH($1, $2))
 
 define(`TERM_KOI8_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8, $1, $2))
+TERM_TITLE_SSH_SCREEN_KOI8(``TERM_KOI8'', $1, $2))
 
 define(`MENU_TERM_KOI8_SSH_SCREEN',
-"$2 (koi8,scr)" TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8, $1, $2))
+"$2 (koi8,scr)" TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8', $1, $2))
 
 define(`TERM_KOI8_BOTLT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8_BOTLT, $1, $2))
+TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8_BOTLT', $1, $2))
 
 define(`TERM_KOI8_BOTRT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8_BOTRT, $1, $2))
+TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8_BOTRT', $1, $2))
 
 define(`MENU_TERM_KOI8_BOTLT_SSH_SCREEN',
 "$2 (btlt,koi8,scr)" TERM_KOI8_BOTLT_SSH_SCREEN($1, $2))
@@ -137,16 +137,16 @@ define(`MENU_TERM_KOI8_BOTRT_SSH_SCREEN',
 "$2 (btrt,koi8,scr)" TERM_KOI8_BOTRT_SSH_SCREEN($1, $2))
 
 define(`TERM_UTF8_SSH',
-TERM_TITLE_SSH(TERM_RU_UTF8, $1, $2))
+TERM_TITLE_SSH(`TERM_RU_UTF8', $1, $2))
 
 define(`MENU_TERM_UTF8_SSH',
 "$2 (utf8)" TERM_UTF8_SSH($1, $2))
 
 define(`TERM_UTF8_BOTLT_SSH',
-TERM_TITLE_SSH(TERM_RU_UTF8_BOTLT, $1, $2))
+TERM_TITLE_SSH(`TERM_RU_UTF8_BOTLT', $1, $2))
 
 define(`TERM_UTF8_BOTRT_SSH',
-TERM_TITLE_SSH(TERM_RU_UTF8_BOTRT, $1, $2))
+TERM_TITLE_SSH(`TERM_RU_UTF8_BOTRT', $1, $2))
 
 define(`MENU_TERM_UTF8_BOTLT_SSH',
 "$2 (btlt,utf8)" TERM_UTF8_BOTLT_SSH($1, $2))
@@ -155,16 +155,16 @@ define(`MENU_TERM_UTF8_BOTRT_SSH',
 "$2 (btrt,utf8)" TERM_UTF8_BOTRT_SSH($1, $2))
 
 define(`TERM_UTF8_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8, $1, $2))
+TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8', $1, $2))
 
 define(`MENU_TERM_UTF8_SSH_SCREEN',
 "$2 (utf8,scr)" TERM_UTF8_SSH_SCREEN($1, $2))
 
 define(`TERM_UTF8_BOTLT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTLT, $1, $2))
+TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8_BOTLT', $1, $2))
 
 define(`TERM_UTF8_BOTRT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTRT, $1, $2))
+TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8_BOTRT', $1, $2))
 
 define(`MENU_TERM_UTF8_BOTLT_SSH_SCREEN',
 "$2 (btlt,utf8,scr)" TERM_UTF8_BOTLT_SSH_SCREEN($1, $2))
@@ -630,38 +630,11 @@ 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
+AddToFunc Term3Hosts          I GotoDeskAndPage 1 1 2
++                             I TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra)
 +                             I Wait TERM
-+                             I Term-Oper
++                             I TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper)
 +                             I Wait TERM
 +                             I GotoDeskAndPage 1 0 1
 +                             I TERM_KOI8_SSH_SCREEN(-D 1080 phdru.name, phdru.name)