From 884132f1531aa93222be418209118983e9fcbc66 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Mon, 25 May 2020 03:13:31 +0300 Subject: [PATCH] .fvwmrc: Use `REMOTE_SCREEN` directly --- .fvwm/main.m4 | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 7812b72..4ec6d08 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -105,24 +105,15 @@ REMOTE_HOST_TERM_TITLE(TERM_KOI8, $1, $2)) define(`REMOTE_SCREEN', `-t $1 exec screen -xRR -S default') -define(`REMOTE_HOST_KOI8_SCREEN', -REMOTE_HOST_KOI8(REMOTE_SCREEN($1), $2)) - define(`REMOTE_HOST_KOI8_MENU', "$2 (koi8)" REMOTE_HOST_KOI8($1, $2)) define(`REMOTE_HOST_KOI8_BOTLT', REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTLT, $1, $2)) -define(`REMOTE_HOST_KOI8_SCREEN_BOTLT', -REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTLT, REMOTE_SCREEN($1), $2)) - define(`REMOTE_HOST_KOI8_BOTRT', REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTRT, $1, $2)) -define(`REMOTE_HOST_KOI8_SCREEN_BOTRT', -REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTRT, REMOTE_SCREEN($1), $2)) - define(`REMOTE_HOST_KOI8_BOTLT_MENU', "$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2)) @@ -608,15 +599,15 @@ AddToFunc AudioPlayer I GotoDeskAndPage 0 1 1 DestroyFunc Term-Iskra AddToFunc Term-Iskra I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8(iskra-aviel.phdru.name, iskra) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN(iskra-aviel.phdru.name), iskra) DestroyFunc Term-Iskra-Big AddToFunc Term-Iskra-Big I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8_BIG(iskra-aviel.phdru.name, iskra) ++ I REMOTE_HOST_KOI8_BIG(iskra-aviel.phdru.name, ISKRA) DestroyFunc Term-Oper AddToFunc Term-Oper I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8_BOTRT(oper.med.ru, oper) ++ I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN(oper.med.ru), oper) DestroyFunc Term-Oper-Big AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 @@ -624,7 +615,7 @@ AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 DestroyFunc Term-Phdru AddToFunc Term-Phdru I GotoDeskAndPage 1 0 1 -+ I REMOTE_HOST_KOI8(phdru.name, phdru.name) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN(phdru.name), phdru.name) DestroyFunc Term-Phdru-Big AddToFunc Term-Phdru-Big I GotoDeskAndPage 1 0 1 @@ -730,15 +721,15 @@ AddToMenu TermColors "Term Colors" Title + "Term: white/black" TERM_KOI8 -fg white -cr white -bg black AddToMenu Systems "Systems" Title -+ REMOTE_HOST_KOI8_MENU(iskra-aviel.phdru.name, iskra) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN(iskra-aviel.phdru.name), iskra) + REMOTE_HOST_UTF8_BOTLT_MENU(iskra-aviel.phdru.name, iskra) + REMOTE_HOST_KOI8_BIG_MENU(iskra-aviel.phdru.name, ISKRA) + "" Nop -+ REMOTE_HOST_KOI8_BOTRT_MENU(oper.med.ru, oper) ++ REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN(oper.med.ru), oper) + REMOTE_HOST_UTF8_BOTRT_MENU(oper.med.ru, oper) + REMOTE_HOST_KOI8_BIG_MENU(oper.med.ru, OPER) + "" Nop -+ REMOTE_HOST_KOI8_MENU(phdru.name, phdru) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN(phdru.name), phdru) + REMOTE_HOST_UTF8_BOTLT_MENU(phdru.name, phdru) + REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU) @@ -936,9 +927,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, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8_SCREEN(-D 1080 phdru.name, phdru.name)) -*FvwmButtons: (Title iskra, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8_SCREEN(iskra-aviel.phdru.name, iskra)) -*FvwmButtons: (Title oper, Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_SCREEN_BOTRT(oper.med.ru, oper)) +*FvwmButtons: (Title phdru, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN(-D 1080 phdru.name), phdru.name)) +*FvwmButtons: (Title iskra, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN(iskra-aviel.phdru.name), iskra)) +*FvwmButtons: (Title oper, Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_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 -) -- 2.39.2