From fe672c1fbe169131f2fd2f8bfefac69c437c3ad4 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 31 May 2014 04:42:22 +0400 Subject: [PATCH] Add bottom-right geometry for terminals --- .fvwm/phd.m4 | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4 index 182897a..b62a3e8 100644 --- a/.fvwm/phd.m4 +++ b/.fvwm/phd.m4 @@ -83,25 +83,32 @@ define(`MESSAGE_FONT', `Nimbus Sans L 18')'dnl dnl Terminal emulator -define(`TERM', `urxvt') - -define(`TERM_KOI8', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM') - -define(`TERM_UTF8', `Exec exec "$HOME"/lib/X11/utf8rxvt') - define(`TERM_GEOM', +`ifelse(eval(WIDTH < 1024), 1, `80x25',dnl +`ifelse(eval(WIDTH < 1920), 1, `80x30', `80x32'dnl +)')'dnl +) + +define(`TERM_GEOM_BOTRT', `ifelse(eval(WIDTH < 1024), 1, `80x25-0-0',dnl -`ifelse(eval(WIDTH < 1920), 1, `80x28-0-0', `80x30-0-0'dnl +`ifelse(eval(WIDTH < 1920), 1, `80x30-0-0', `80x32-0-0'dnl )')'dnl ) define(`TERM_GEOM_BIG', -`ifelse(eval(WIDTH < 1024), 1, `96x30-0-0',dnl -`ifelse(eval(WIDTH < 1920), 1, `112x32-0-0', `126x35-0-0'dnl +`ifelse(eval(WIDTH < 1024), 1, `96x30',dnl +`ifelse(eval(WIDTH < 1920), 1, `112x32', `126x35'dnl )')'dnl ) +define(`TERM', `urxvt') +define(`TERM_KOI8', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM') +define(`TERM_UTF8', `Exec exec "$HOME"/lib/X11/utf8rxvt') +define(`TERM_KOI8_BOTRT', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM -geometry TERM_GEOM_BOTRT') +define(`TERM_UTF8_BOTRT', `Exec exec "$HOME"/lib/X11/utf8rxvt -geometry TERM_GEOM_BOTRT') + + define(`REMOTE_HOST_KOI8', TERM_KOI8 -title "$2" -n "$2" -e ssh -4 "$1"dnl ) @@ -110,6 +117,14 @@ define(`REMOTE_HOST_KOI8_MENU', "$2 (koi8)" REMOTE_HOST_KOI8($1, $2)dnl ) +define(`REMOTE_HOST_KOI8_BOTRT', +TERM_KOI8_BOTRT -title "$2" -n "$2" -e ssh -4 "$1"dnl +) + +define(`REMOTE_HOST_KOI8_BOTRT_MENU', +"$2 (koi8)" REMOTE_HOST_KOI8_BOTRT($1, $2)dnl +) + define(`REMOTE_HOST_UTF8', TERM_UTF8 -e ssh -4 "$1"dnl ) @@ -118,6 +133,14 @@ define(`REMOTE_HOST_UTF8_MENU', "$2 (utf8)" REMOTE_HOST_UTF8($1, $2)dnl ) +define(`REMOTE_HOST_UTF8_BOTRT', +TERM_UTF8_BOTRT -e ssh -4 "$1"dnl +) + +define(`REMOTE_HOST_UTF8_BOTRT_MENU', +"$2 (utf8)" REMOTE_HOST_UTF8_BOTRT($1, $2)dnl +) + define(`REMOTE_HOST_KOI8_BIG', TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1"dnl ) @@ -627,6 +650,8 @@ AddToMenu Window-Ops2 "Center" Center AddToMenu Terminals "Terminals" Title + "Grey term (koi8)" TERM_KOI8 + "Grey term (utf8)" TERM_UTF8 ++ "Grey term (koi8,btrt)" TERM_KOI8_BOTRT ++ "Grey term (utf8,btrt)" TERM_UTF8_BOTRT + "Big grey term (koi8)" TERM_KOI8 -geometry TERM_GEOM_BIG + "" Nop + "White/black term (koi8)" TERM_KOI8 -fg white -cr white -bg black -- 2.39.2