X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.fvwm%2Fmain.m4;h=db62cb9cc640f65f6a4414c4338e4a75aa0ee124;hb=4079f9edf8ae86a37e65cdaccf716d56ea1c6346;hp=839333dd805e671c4546596eb58d86b34de849c6;hpb=f43172c5b3008165867b08b6815712b1c9c1f26a;p=dotfiles.git diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 839333d..db62cb9 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -91,17 +91,23 @@ define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT') define(`TERM_UTF8_BOTRT', `TERM_UTF8 -geometry TERM_GEOM_BOTRT') +define(`REMOTE_HOST_TERM', +`$1 -e ssh -4 $2') + +define(`REMOTE_HOST_TERM_TITLE', +`$1 -title $3 -n $3 -e ssh -4 $2') + define(`REMOTE_HOST_KOI8', -`TERM_KOI8 -title "$2" -n "$2" -e ssh -4 "$1"') +REMOTE_HOST_TERM_TITLE(TERM_KOI8, $1, $2)) define(`REMOTE_HOST_KOI8_MENU', "$2 (koi8)" REMOTE_HOST_KOI8($1, $2)) define(`REMOTE_HOST_KOI8_BOTLT', -TERM_KOI8_BOTLT -title "$2" -n "$2" -e ssh -4 "$1") +REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTLT, $1, $2)) define(`REMOTE_HOST_KOI8_BOTRT', -`TERM_KOI8_BOTRT -title "$2" -n "$2" -e ssh -4 "$1"') +REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTRT, $1, $2)) define(`REMOTE_HOST_KOI8_BOTLT_MENU', "$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2)) @@ -110,16 +116,16 @@ define(`REMOTE_HOST_KOI8_BOTRT_MENU', "$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2)) define(`REMOTE_HOST_UTF8', -TERM_UTF8 -e ssh -4 "$1") +REMOTE_HOST_TERM(TERM_UTF8, $1)) define(`REMOTE_HOST_UTF8_MENU', "$2 (utf8)" REMOTE_HOST_UTF8($1, $2)) define(`REMOTE_HOST_UTF8_BOTLT', -TERM_UTF8_BOTLT -e ssh -4 "$1") +REMOTE_HOST_TERM(TERM_UTF8_BOTLT, $1)) define(`REMOTE_HOST_UTF8_BOTRT', -TERM_UTF8_BOTRT -e ssh -4 "$1") +REMOTE_HOST_TERM(TERM_UTF8_BOTRT, $1)) define(`REMOTE_HOST_UTF8_BOTLT_MENU', "$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2)) @@ -132,6 +138,28 @@ TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1") define(`REMOTE_HOST_KOI8_BIG_MENU', "$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2)) + +define(`SSH_CONNECTION_SHARING_TERM', +$1 -title "git@$3" -n "git@$3" -e ssh -N4 "$2") + +define(`SSH_CONNECTION_SHARING_UTF8', +SSH_CONNECTION_SHARING_TERM(TERM_UTF8, $1, $2)) + +define(`SSH_CONNECTION_SHARING_UTF8_BOTLT', +SSH_CONNECTION_SHARING_TERM(TERM_UTF8_BOTLT, $1, $2)) + +define(`SSH_CONNECTION_SHARING_UTF8_BOTRT', +SSH_CONNECTION_SHARING_TERM(TERM_UTF8_BOTRT, $1, $2)) + +define(`SSH_CONNECTION_SHARING_UTF8_MENU', +"git@$2 (utf8)" SSH_CONNECTION_SHARING_UTF8($1, $2)) + +define(`SSH_CONNECTION_SHARING_UTF8_BOTLT_MENU', +"git@$2 (utf8,btlt)" SSH_CONNECTION_SHARING_UTF8_BOTLT($1, $2)) + +define(`SSH_CONNECTION_SHARING_UTF8_BOTRT_MENU', +"git@$2 (utf8,btrt)" SSH_CONNECTION_SHARING_UTF8_BOTRT($1, $2)) + divert ########################################################################## @@ -698,7 +726,14 @@ AddToMenu TermColors "Term Colors" Title + "Term: white/deeppink" TERM_KOI8 -fg white -cr white -bg deeppink + "Term: white/black" TERM_KOI8 -fg white -cr white -bg black +AddToMenu SSH-connection-sharing "SSH connection sharing" Title ++ SSH_CONNECTION_SHARING_UTF8_MENU(phd@git.code.sf.net, SF) ++ SSH_CONNECTION_SHARING_UTF8_BOTLT_MENU(git@gitlab.com, gitlab) ++ SSH_CONNECTION_SHARING_UTF8_BOTRT_MENU(git@github.com, github) + AddToMenu Systems "Systems" Title ++ "SSH connection sharing" Popup SSH-connection-sharing ++ "" Nop + REMOTE_HOST_KOI8_MENU(phdru.name, phdru) + REMOTE_HOST_UTF8_MENU(phdru.name, phdru) + REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU)