X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=1095e1495865ccf21b80f0757b83201aed682c5e;hb=d971e202ad077f3031ac56284358bfc0ff6b499f;hp=9d7803f794f73a1fd83f0d9f353fc10fb37b1c2e;hpb=3eb4baf8d278f70d0918eb855d55a7256edf8c96;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 9d7803f..1095e14 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -12,18 +12,6 @@ dnl Echo dimension
 `#' width = WIDTH
 
 divert(-1)
-dnl koi8-r Fonts
-dnl define(`SMALL_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-100-*-*-*-*-koi8-r')
-dnl define(`MEDIUM_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-120-*-*-*-*-koi8-r')
-dnl define(`BIG_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-140-*-*-*-*-koi8-r')
-
-dnl cp1251 Fonts
-dnl define(`SMALL_FONT_CP1251', `-*-fixed-medium-r-normal-*-*-100-*-*-*-*-*-cp1251')
-dnl define(`MEDIUM_FONT_CP1251', `-*-fixed-medium-r-normal-*-*-120-*-*-*-*-*-cp1251')
-dnl define(`BIG_FONT_CP1251', `-*-fixed-medium-r-normal-*-*-140-*-*-*-*-*-cp1251')
-
-dnl define(`XBUFFY_FONT', `-cronyx-helvetica-bold-r-*-*-*-100-*-*-*-*-koi8-r')
-
 
 dnl TrueType Fonts
 define(`VERY_SMALL_FONT', `xft:Sans:size=10')
@@ -92,58 +80,108 @@ 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_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(`SSH', `cgmem_nice 300 ssh')
 
-define(`REMOTE_HOST_TERM', `$1 -e SSH $2')
+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))
+
+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(`TERM_TITLE_SSH_SCREEN_KOI8',
+`$1 -title "$3 scr" -n "$3 scr" -e SSH SSH_SCREEN_KOI8($2)')
+
+define(`TERM_TITLE_SSH_SCREEN_UTF8',
+`$1 -title "$3 scr" -n "$3 scr" -e SSH 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))
+
+define(`TERM_KOI8_BOTRT_SSH',
+TERM_TITLE_SSH(TERM_KOI8_BOTRT, $1, $2))
+
+define(`MENU_TERM_KOI8_BOTLT_SSH',
+"$2 (btlt,koi8)" TERM_KOI8_BOTLT_SSH($1, $2))
+
+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))
+
+define(`MENU_TERM_KOI8_SSH_SCREEN',
+"$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))
+
+define(`TERM_KOI8_BOTRT_SSH_SCREEN',
+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))
+
+define(`MENU_TERM_KOI8_BOTRT_SSH_SCREEN',
+"$2 (btrt,koi8,scr)" TERM_KOI8_BOTRT_SSH_SCREEN($1, $2))
 
-define(`REMOTE_HOST_TERM_TITLE', `$1 -title $3 -n $3 -e SSH $2')
+define(`TERM_UTF8_SSH',
+TERM_TITLE_SSH(TERM_RU_UTF8, $1, $2))
 
-define(`REMOTE_HOST_KOI8',
-REMOTE_HOST_TERM_TITLE(TERM_KOI8, $1, $2))
+define(`MENU_TERM_UTF8_SSH',
+"$2 (utf8)" TERM_UTF8_SSH($1, $2))
 
-define(`REMOTE_SCREEN_KOI8', `-t $1 exec /usr/bin/screen -xRR -S default-koi8')
-define(`REMOTE_SCREEN_UTF8', `-t $1 exec /usr/bin/screen -xRR -S default-utf8')
+define(`TERM_UTF8_BOTLT_SSH',
+TERM_TITLE_SSH(TERM_RU_UTF8_BOTLT, $1, $2))
 
-define(`REMOTE_HOST_KOI8_MENU',
-"$2 (koi8)" REMOTE_HOST_KOI8($1, $2))
+define(`TERM_UTF8_BOTRT_SSH',
+TERM_TITLE_SSH(TERM_RU_UTF8_BOTRT, $1, $2))
 
-define(`REMOTE_HOST_KOI8_BOTLT',
-REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTLT, $1, $2))
+define(`MENU_TERM_UTF8_BOTLT_SSH',
+"$2 (btlt,utf8)" TERM_UTF8_BOTLT_SSH($1, $2))
 
-define(`REMOTE_HOST_KOI8_BOTRT',
-REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTRT, $1, $2))
+define(`MENU_TERM_UTF8_BOTRT_SSH',
+"$2 (btrt,utf8)" TERM_UTF8_BOTRT_SSH($1, $2))
 
-define(`REMOTE_HOST_KOI8_BOTLT_MENU',
-"$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2))
+define(`TERM_UTF8_SSH_SCREEN',
+TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8, $1, $2))
 
-define(`REMOTE_HOST_KOI8_BOTRT_MENU',
-"$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2))
+define(`MENU_TERM_UTF8_SSH_SCREEN',
+"$2 (utf8,scr)" TERM_UTF8_SSH_SCREEN($1, $2))
 
-define(`REMOTE_HOST_UTF8',
-REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8, $1, $2))
+define(`TERM_UTF8_BOTLT_SSH_SCREEN',
+TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTLT, $1, $2))
 
-define(`REMOTE_HOST_UTF8_MENU',
-"$2 (utf8)" REMOTE_HOST_UTF8($1, $2))
+define(`TERM_UTF8_BOTRT_SSH_SCREEN',
+TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTRT, $1, $2))
 
-define(`REMOTE_HOST_UTF8_BOTLT',
-REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8_BOTLT, $1, $2))
+define(`MENU_TERM_UTF8_BOTLT_SSH_SCREEN',
+"$2 (btlt,utf8,scr)" TERM_UTF8_BOTLT_SSH_SCREEN($1, $2))
 
-define(`REMOTE_HOST_UTF8_BOTRT',
-REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8_BOTRT, $1, $2))
+define(`MENU_TERM_UTF8_BOTRT_SSH_SCREEN',
+"$2 (btrt,utf8,scr)" TERM_UTF8_BOTRT_SSH_SCREEN($1, $2))
 
-define(`REMOTE_HOST_UTF8_BOTLT_MENU',
-"$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2))
+define(`TERM_KOI8_BIG_SSH',
+TERM_KOI8_BIG -title "$2" -n "$2" -e SSH "$1")
 
-define(`REMOTE_HOST_UTF8_BOTRT_MENU',
-"$2 (utf8,btrt)" REMOTE_HOST_UTF8_BOTRT($1, $2))
+define(`MENU_TERM_KOI8_BIG_SSH',
+"$2 (koi8)" TERM_KOI8_BIG_SSH($1, $2))
 
-define(`REMOTE_HOST_KOI8_BIG',
-TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e SSH "$1")
+define(`TERM_KOI8_BIG_SSH_SCREEN',
+TERM_KOI8_BIG -title "$2" -n "$2" -e SSH_SCREEN_KOI8 "$1")
 
-define(`REMOTE_HOST_KOI8_BIG_MENU',
-"$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2))
+define(`MENU_TERM_KOI8_BIG_SSH_SCREEN',
+"$2 (koi8,scr)" TERM_KOI8_BIG_SSH_SCREEN($1, $2))
 
 divert
 
@@ -494,7 +532,7 @@ AddToFunc StartStandardSession
 +              I XsetbgFilename
 +              I Wait gxmessage
 +              I GotoDeskAndPage 2 0 1
-+              I TERM_KOI8 -geometry TERM_GEOM_BIG
++              I TERM_KOI8_BIG
 +              I Wait TERM
 +              I FireFox
 +              I GotoDeskAndPage 0 1 1
@@ -597,27 +635,27 @@ AddToFunc AudioPlayer         I GotoDeskAndPage 0 1 1
 
 DestroyFunc Term-Iskra
 AddToFunc Term-Iskra          I GotoDeskAndPage 1 1 2
-+                             I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra)
++                             I TERM_KOI8_SSH_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 TERM_KOI8_BIG_SSH(iskra-aviel.phdru.name, ISKRA)
 
 DestroyFunc Term-Oper
 AddToFunc Term-Oper           I GotoDeskAndPage 1 1 2
-+                             I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper)
++                             I TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper)
 
 DestroyFunc Term-Oper-Big
 AddToFunc Term-Oper-Big       I GotoDeskAndPage 1 1 2
-+                             I REMOTE_HOST_KOI8_BIG(oper.med.ru, OPER)
++                             I TERM_KOI8_BIG_SSH(oper.med.ru, OPER)
 
 DestroyFunc Term-Phdru
 AddToFunc Term-Phdru          I GotoDeskAndPage 1 0 1
-+                             I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name)
++                             I TERM_KOI8_SSH_SCREEN(phdru.name, phdru.name)
 
 DestroyFunc Term-Phdru-Big
 AddToFunc Term-Phdru-Big      I GotoDeskAndPage 1 0 1
-+                             I REMOTE_HOST_KOI8_BIG(phdru.name, phdru.name)
++                             I TERM_KOI8_BIG_SSH(phdru.name, phdru.name)
 
 DestroyFunc Term3Hosts
 AddToFunc Term3Hosts          I Term-Iskra
@@ -625,7 +663,7 @@ AddToFunc Term3Hosts          I Term-Iskra
 +                             I Term-Oper
 +                             I Wait TERM
 +                             I GotoDeskAndPage 1 0 1
-+                             I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru.name)
++                             I TERM_KOI8_SSH_SCREEN(-D 1080 phdru.name, phdru.name)
 +                             I Wait TERM
 +                             I GotoDeskAndPage 1 1 2
 
@@ -697,12 +735,12 @@ AddToMenu Terminals     "Terminals" Title
 +               "Grey term (koi8)" TERM_KOI8
 +               "Grey term (utf8)" TERM_RU_UTF8
 +               "Grey term (heb-utf8)" TERM_HEB_UTF8
-+               "Grey term (koi8,btlt)" TERM_KOI8_BOTLT
-+               "Grey term (koi8,btrt)" TERM_KOI8_BOTRT
-+               "Grey term (utf8,btlt)" TERM_RU_UTF8_BOTLT
-+               "Grey term (utf8,btrt)" TERM_RU_UTF8_BOTRT
-+               "Big grey term (koi8)" TERM_KOI8 -geometry TERM_GEOM_BIG
-+               "Big grey term (utf8)" TERM_RU_UTF8 -geometry TERM_GEOM_BIG
++               "Grey term (btlt,koi8)" TERM_KOI8_BOTLT
++               "Grey term (btrt,koi8)" TERM_KOI8_BOTRT
++               "Grey term (btlt,utf8)" TERM_RU_UTF8_BOTLT
++               "Grey term (btrt,utf8)" TERM_RU_UTF8_BOTRT
++               "Big grey term (koi8)" TERM_KOI8_BIG
++               "Big grey term (utf8)" TERM_UTF8_BIG
 +                       ""      Nop
 +               "White/black term (koi8)" TERM_KOI8 -fg white -cr white -bg black
 +               "White/black term (utf8)" TERM_RU_UTF8 -fg white -bg black
@@ -735,18 +773,18 @@ AddToMenu TermColors    "Term Colors" Title
 AddToMenu Systems       "Systems" Title
 +                       "Iskra+Oper+Phdru" Term3Hosts
 +                       ""        Nop
-+                       REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(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)
++                       MENU_TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra)
++                       MENU_TERM_UTF8_BOTLT_SSH(iskra-aviel.phdru.name, iskra)
++                       MENU_TERM_KOI8_BIG_SSH(iskra-aviel.phdru.name, ISKRA)
 +                       ""        Nop
-+                       REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN_KOI8(oper.med.ru), oper)
-+                       REMOTE_HOST_UTF8_BOTRT_MENU(oper.med.ru, oper)
-+                       REMOTE_HOST_KOI8_BIG_MENU(oper.med.ru, OPER)
++                       MENU_TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper)
++                       MENU_TERM_UTF8_BOTRT_SSH(oper.med.ru, oper)
++                       MENU_TERM_KOI8_BIG_SSH(oper.med.ru, OPER)
 +                       ""        Nop
-+                       REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(phdru.name), phdru)
-+                       REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru SOCKS5)
-+                       REMOTE_HOST_UTF8_BOTLT_MENU(phdru.name, phdru)
-+                       REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU)
++                       MENU_TERM_KOI8_SSH_SCREEN(phdru.name, phdru)
++                       MENU_TERM_KOI8_SSH_SCREEN(-D 1080 phdru.name, phdru SOCKS5)
++                       MENU_TERM_UTF8_BOTLT_SSH(phdru.name, phdru)
++                       MENU_TERM_KOI8_BIG_SSH(phdru.name, PHDRU)
 
 AddToMenu FvwmCommands  "Fvwm Commands" Title
 +                       "Restart" Restart
@@ -930,9 +968,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(REMOTE_SCREEN_KOI8(phdru.name), phdru.name))
-*FvwmButtons: (Title iskra,    Icon xterm-sgi.xpm,   Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra))
-*FvwmButtons: (Title oper,     Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(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 -)
@@ -970,7 +1008,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"