X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=b93b61542eb347d07d3bd654a43e9d4ff9748667;hb=5f1513898e4a0172d5b126075f9c851b79edc3f2;hp=bf743f297da0cf5bec74d1b17b958001714c7505;hpb=95713eee6d120757ac9484d73f0e41afa39850bf;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index bf743f2..b93b615 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -32,6 +32,7 @@ define(`MEDIUM_FONT', `xft:Sans:size=14')
 define(`BIG_FONT', `xft:Sans:size=16')
 define(`LARGE_FONT', `xft:Sans:size=18')
 define(`HUGE_FONT', `xft:Sans:size=20')
+define(`GIGANTIC_FONT', `xft:Sans:size=22')
 
 dnl Bold TT fonts
 define(`SMALL_BOLD_FONT', SMALL_FONT`:Bold')
@@ -54,8 +55,8 @@ define(`BUTTONS_FONT', PAGER_FONT)
 
 
 define(`MENU_FONT',
-ifelse(eval(WIDTH < 1024), 1, `xft:Sans:size=16',
-       eval(WIDTH < 1920), 1, `xft:Sans:size=18', `xft:Sans:size=22'))
+ifelse(eval(WIDTH < 1024), 1, BIG_FONT,
+       eval(WIDTH < 1920), 1, LARGE_FONT, GIGANTIC_FONT))
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)
 define(`ICON_BOX_FONT', MENU_FONT)
@@ -91,17 +92,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 +117,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 +139,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
 
 ##########################################################################
@@ -482,6 +511,8 @@ AddToFunc StartStandardSession
 +              I Wait TERM
 +              I PaVuControl
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
++              I XsetbgFilename
++              I Wait gxmessage
 +              I GotoDeskAndPage 1 0 1
 +              I TERM_KOI8
 +              I Wait TERM
@@ -604,7 +635,7 @@ AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
 +                             I Exec exec start-browser firefox
 +                             I Wait "*Mozilla Firefox"
 +                             I All ("*Mozilla Firefox") Lower
-+                             I Exec webbrowserX -n file:///home/phd/Internet/WWW/misc/index.html; exec webbrowserX -t file:///home/phd/Internet/WWW/misc/internet.html
++                             I Exec webbrowserX -n file:///home/phd/Internet/WWW/dashboard/index.html; exec webbrowserX -t file:///home/phd/Internet/WWW/dashboard/internet.html
 +                             I Wait "*Mozilla Firefox"
 
 DestroyFunc Gajim
@@ -696,7 +727,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)