.fvwmrc: minor refactoring of font configuration

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

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index ca87a1b8a94d0d7122d2edb4bbc4bb3139ba82d7..65475824fc73a172ba1c75370badc2d45db7bc28 100644 (file)
--- 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)
@@ -138,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
 
 ##########################################################################
@@ -704,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)