From 10ed04ab0d9665c425dc9878b46fd47d75b2d50a Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 10 Feb 2022 03:29:45 +0300 Subject: [PATCH] Refactor(.fvwmrc): Refactor macros for big terminals --- .fvwm/main.m4 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 05298ed..9890503 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -80,6 +80,8 @@ define(`TERM_KOI8_BOTLT', `TERM_KOI8 -geometry TERM_GEOM_BOTLT') define(`TERM_RU_UTF8_BOTLT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTLT') define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT') define(`TERM_RU_UTF8_BOTRT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTRT') +define(`TERM_KOI8_BIG', TERM_KOI8 -geometry TERM_GEOM_BIG) +define(`TERM_UTF8_BIG', TERM_RU_UTF8 -geometry TERM_GEOM_BIG) define(`SSH', `cgmem_nice 300 ssh') @@ -170,13 +172,13 @@ define(`MENU_TERM_UTF8_BOTRT_SSH_SCREEN', "$2 (btrt,utf8,scr)" TERM_UTF8_BOTRT_SSH_SCREEN($1, $2)) define(`TERM_KOI8_BIG_SSH', -TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e SSH "$1") +TERM_KOI8_BIG -title "$2" -n "$2" -e SSH "$1") define(`MENU_TERM_KOI8_BIG_SSH', "$2 (koi8)" TERM_KOI8_BIG_SSH($1, $2)) define(`TERM_KOI8_BIG_SSH_SCREEN', -TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e SSH_SCREEN_KOI8 "$1") +TERM_KOI8_BIG -title "$2" -n "$2" -e SSH_SCREEN_KOI8 "$1") define(`MENU_TERM_KOI8_BIG_SSH_SCREEN', "$2 (koi8,scr)" TERM_KOI8_BIG_SSH_SCREEN($1, $2)) @@ -530,7 +532,7 @@ AddToFunc StartStandardSession + I XsetbgFilename + I Wait gxmessage + I GotoDeskAndPage 2 0 1 -+ I TERM_KOI8 -geometry TERM_GEOM_BIG ++ I TERM_KOI8_BIG + I Wait TERM + I FireFox + I GotoDeskAndPage 0 1 1 @@ -737,8 +739,8 @@ AddToMenu Terminals "Terminals" Title + "Grey term (btrt,koi8)" TERM_KOI8_BOTRT + "Grey term (btlt,utf8)" TERM_RU_UTF8_BOTLT + "Grey term (btrt,utf8)" TERM_RU_UTF8_BOTRT -+ "Big grey term (koi8)" TERM_KOI8 -geometry TERM_GEOM_BIG -+ "Big grey term (utf8)" TERM_RU_UTF8 -geometry TERM_GEOM_BIG ++ "Big grey term (koi8)" TERM_KOI8_BIG ++ "Big grey term (utf8)" TERM_UTF8_BIG + "" Nop + "White/black term (koi8)" TERM_KOI8 -fg white -cr white -bg black + "White/black term (utf8)" TERM_RU_UTF8 -fg white -bg black -- 2.39.5