X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.fvwm%2Fphd.m4;h=281820723fec152b5876603973c9d7ef5ccdba2e;hb=4bbd4a68e6e0c4c3dac82b1962fb0bc649129479;hp=3b19d01bfbfbc0bf60c4c83a35fa05ddfdda49e2;hpb=d848a85bf03ed811cb464e3ae07b88fdd2f2dafd;p=dotfiles.git diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4 index 3b19d01..2818207 100644 --- a/.fvwm/phd.m4 +++ b/.fvwm/phd.m4 @@ -83,25 +83,28 @@ 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-0-0',dnl -`ifelse(eval(WIDTH < 1920), 1, `80x28-0-0', `80x30-0-0'dnl +`ifelse(eval(WIDTH < 1024), 1, `80x25',dnl +`ifelse(eval(WIDTH < 1920), 1, `80x30', `80x32'dnl )')'dnl ) +define(`TERM_GEOM_BOTRT', `TERM_GEOM-0-0')'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 +113,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,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2)dnl +) + define(`REMOTE_HOST_UTF8', TERM_UTF8 -e ssh -4 "$1"dnl ) @@ -118,6 +129,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,btrt)" 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 ) @@ -187,7 +206,7 @@ Style * SloppyFocus ClickTime 250 # if the window occupies less than n% of the screen, draw it opaque -OpaqueMoveSize 5 +OpaqueMoveSize 100 # Do not flip pages on the edge of the screen, but allow to move windows EdgeScroll 0 0 @@ -477,7 +496,7 @@ AddToFunc "StartStandardSession" + I TERM_KOI8 -geometry 60x25-5-5 -iconic -name term-im-local + I Wait URxvt + I GotoDeskAndPage 1 1 0 -+ I Schedule 2000 GotoDeskAndPage 0 1 0 ++ I Schedule 1000 GotoDeskAndPage 0 1 0 ############################################################################ @@ -627,6 +646,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