X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=107b1ad2a39d59dff055e4d3f28b3cc296f47441;hb=3ddd9a82f964bc27af6e82cd73e88ae9a292b560;hp=0d82fb2e00b7f00ab711fac8612ae5ff9fa81d66;hpb=13bcdae8284803a2ac34b36710a05a191d66f7b5;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 0d82fb2..107b1ad 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -9,7 +9,7 @@ dnl This is to prevent FvwmM4 to shadow $HOME
 undefine(`HOME')dnl
 dnl
 dnl Echo dimension
-`#' width = WIDTH
+`#' width = WIDTH()dnl
 divert(-1)
 
 dnl TrueType Fonts
@@ -79,8 +79,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(`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')
@@ -90,7 +90,7 @@ define(`TERM_SSH', `$1 -e SSH $2')
 define(`TERM_TITLE_SSH', `$1 -title "$3" -n "$3" -e SSH $2')
 
 define(`TERM_KOI8_SSH',
-TERM_TITLE_SSH(TERM_KOI8, $1, $2))
+`TERM_TITLE_SSH(`TERM_KOI8', $1, $2)')
 
 define(`SSH_SCREEN_KOI8',
 `SSH -t $1 TZ="$(cat /etc/timezone)" exec /usr/bin/screen -xRR -S default-koi8')
@@ -104,85 +104,85 @@ define(`TERM_TITLE_SSH_SCREEN_UTF8',
 `$1 -title "$3 scr" -n "$3 scr" -e SSH_SCREEN_UTF8($2)')
 
 define(`MENU_TERM_KOI8_SSH',
-"$2 (koi8)" TERM_KOI8_SSH($1, $2))
+`"$2 (koi8)" TERM_KOI8_SSH($1, $2)')
 
 define(`TERM_KOI8_BOTLT_SSH',
-TERM_TITLE_SSH(TERM_KOI8_BOTLT, $1, $2))
+`TERM_TITLE_SSH(`TERM_KOI8_BOTLT', $1, $2)')
 
 define(`TERM_KOI8_BOTRT_SSH',
-TERM_TITLE_SSH(TERM_KOI8_BOTRT, $1, $2))
+`TERM_TITLE_SSH(`TERM_KOI8_BOTRT', $1, $2)')
 
 define(`MENU_TERM_KOI8_BOTLT_SSH',
-"$2 (btlt,koi8)" TERM_KOI8_BOTLT_SSH($1, $2))
+`"$2 (btlt,koi8)" TERM_KOI8_BOTLT_SSH($1, $2)')
 
 define(`MENU_TERM_KOI8_BOTRT_SSH',
-"$2 (btrt,koi8)" TERM_KOI8_BOTRT_SSH($1, $2))
+`"$2 (btrt,koi8)" TERM_KOI8_BOTRT_SSH($1, $2)')
 
 define(`TERM_KOI8_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8, $1, $2))
+`TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8', $1, $2)')
 
 define(`MENU_TERM_KOI8_SSH_SCREEN',
-"$2 (koi8,scr)" TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8, $1, $2))
+`"$2 (koi8,scr)" TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8', $1, $2)')
 
 define(`TERM_KOI8_BOTLT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8_BOTLT, $1, $2))
+`TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8_BOTLT', $1, $2)')
 
 define(`TERM_KOI8_BOTRT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_KOI8(TERM_KOI8_BOTRT, $1, $2))
+`TERM_TITLE_SSH_SCREEN_KOI8(`TERM_KOI8_BOTRT', $1, $2)')
 
 define(`MENU_TERM_KOI8_BOTLT_SSH_SCREEN',
-"$2 (btlt,koi8,scr)" TERM_KOI8_BOTLT_SSH_SCREEN($1, $2))
+`"$2 (btlt,koi8,scr)" TERM_KOI8_BOTLT_SSH_SCREEN($1, $2)')
 
 define(`MENU_TERM_KOI8_BOTRT_SSH_SCREEN',
-"$2 (btrt,koi8,scr)" TERM_KOI8_BOTRT_SSH_SCREEN($1, $2))
+`"$2 (btrt,koi8,scr)" TERM_KOI8_BOTRT_SSH_SCREEN($1, $2)')
 
 define(`TERM_UTF8_SSH',
-TERM_TITLE_SSH(TERM_RU_UTF8, $1, $2))
+`TERM_TITLE_SSH(`TERM_RU_UTF8', $1, $2)')
 
 define(`MENU_TERM_UTF8_SSH',
-"$2 (utf8)" TERM_UTF8_SSH($1, $2))
+`"$2 (utf8)" TERM_UTF8_SSH($1, $2)')
 
 define(`TERM_UTF8_BOTLT_SSH',
-TERM_TITLE_SSH(TERM_RU_UTF8_BOTLT, $1, $2))
+`TERM_TITLE_SSH(`TERM_RU_UTF8_BOTLT', $1, $2)')
 
 define(`TERM_UTF8_BOTRT_SSH',
-TERM_TITLE_SSH(TERM_RU_UTF8_BOTRT, $1, $2))
+`TERM_TITLE_SSH(`TERM_RU_UTF8_BOTRT', $1, $2)')
 
 define(`MENU_TERM_UTF8_BOTLT_SSH',
-"$2 (btlt,utf8)" TERM_UTF8_BOTLT_SSH($1, $2))
+`"$2 (btlt,utf8)" TERM_UTF8_BOTLT_SSH($1, $2)')
 
 define(`MENU_TERM_UTF8_BOTRT_SSH',
-"$2 (btrt,utf8)" TERM_UTF8_BOTRT_SSH($1, $2))
+`"$2 (btrt,utf8)" TERM_UTF8_BOTRT_SSH($1, $2)')
 
 define(`TERM_UTF8_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8, $1, $2))
+`TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8', $1, $2)')
 
 define(`MENU_TERM_UTF8_SSH_SCREEN',
-"$2 (utf8,scr)" TERM_UTF8_SSH_SCREEN($1, $2))
+`"$2 (utf8,scr)" TERM_UTF8_SSH_SCREEN($1, $2)')
 
 define(`TERM_UTF8_BOTLT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTLT, $1, $2))
+`TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8_BOTLT', $1, $2)')
 
 define(`TERM_UTF8_BOTRT_SSH_SCREEN',
-TERM_TITLE_SSH_SCREEN_UTF8(TERM_RU_UTF8_BOTRT, $1, $2))
+`TERM_TITLE_SSH_SCREEN_UTF8(`TERM_RU_UTF8_BOTRT', $1, $2)')
 
 define(`MENU_TERM_UTF8_BOTLT_SSH_SCREEN',
-"$2 (btlt,utf8,scr)" TERM_UTF8_BOTLT_SSH_SCREEN($1, $2))
+`"$2 (btlt,utf8,scr)" TERM_UTF8_BOTLT_SSH_SCREEN($1, $2)')
 
 define(`MENU_TERM_UTF8_BOTRT_SSH_SCREEN',
-"$2 (btrt,utf8,scr)" TERM_UTF8_BOTRT_SSH_SCREEN($1, $2))
+`"$2 (btrt,utf8,scr)" TERM_UTF8_BOTRT_SSH_SCREEN($1, $2)')
 
 define(`TERM_KOI8_BIG_SSH',
-TERM_KOI8_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))
+`"$2 (koi8)" TERM_KOI8_BIG_SSH($1, $2)')
 
 define(`TERM_KOI8_BIG_SSH_SCREEN',
-TERM_KOI8_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))
+`"$2 (koi8,scr)" TERM_KOI8_BIG_SSH_SCREEN($1, $2)')
 
 divert
 
@@ -625,39 +625,16 @@ AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
 +                             I Exec exec cgmem_nice 200 pavucontrol
 +                             I Wait "Volume Control"
 
-changequote([,])
+changequote([,])dnl
 DestroyFunc Id3Info
 AddToFunc Id3Info             I Exec "$HOME"/lib/audio/mp3/id3info.py "`audtool --current-song-filename`" | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
-changequote([`], ['])
-
-DestroyFunc Term-Iskra
-AddToFunc Term-Iskra          I GotoDeskAndPage 1 1 2
-+                             I TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra)
-
-DestroyFunc Term-Iskra-Big
-AddToFunc Term-Iskra-Big      I GotoDeskAndPage 1 1 2
-+                             I TERM_KOI8_BIG_SSH(iskra-aviel.phdru.name, ISKRA)
-
-DestroyFunc Term-Oper
-AddToFunc Term-Oper           I GotoDeskAndPage 1 1 2
-+                             I TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper)
-
-DestroyFunc Term-Oper-Big
-AddToFunc Term-Oper-Big       I GotoDeskAndPage 1 1 2
-+                             I TERM_KOI8_BIG_SSH(oper.med.ru, OPER)
-
-DestroyFunc Term-Phdru
-AddToFunc Term-Phdru          I GotoDeskAndPage 1 0 1
-+                             I TERM_KOI8_SSH_SCREEN(phdru.name, phdru.name)
-
-DestroyFunc Term-Phdru-Big
-AddToFunc Term-Phdru-Big      I GotoDeskAndPage 1 0 1
-+                             I TERM_KOI8_BIG_SSH(phdru.name, phdru.name)
+changequote([`], ['])dnl
 
 DestroyFunc Term3Hosts
-AddToFunc Term3Hosts          I Term-Iskra
+AddToFunc Term3Hosts          I GotoDeskAndPage 1 1 2
++                             I TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra)
 +                             I Wait TERM
-+                             I Term-Oper
++                             I TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper)
 +                             I Wait TERM
 +                             I GotoDeskAndPage 1 0 1
 +                             I TERM_KOI8_SSH_SCREEN(-D 1080 phdru.name, phdru.name)
@@ -683,7 +660,7 @@ AddToFunc Pidgin              I GotoDeskAndPage 1 1 0
 
 DestroyFunc Skype
 AddToFunc Skype               I GotoDeskAndPage 0 0 1
-+                             I Exec BROWSER=firefox exec cgmem_nice 1000 skypeforlinux
++                             I Exec BROWSER=firefox exec cgmem_nice 2000 skypeforlinux
 
 DestroyFunc XFilename
 AddToFunc XSetbgFilename      I Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
@@ -961,23 +938,27 @@ changequote([`], ['])
 #*FvwmButtons: (Swallow XClock 'Exec exec xclock -update 1 -geometry -3000-3000')
 
 # Buttons
-pushdef(`TERM_KOI8', `Exec "TERM" LC_CTYPE=ru_RU.KOI8-R exec TERM')
-pushdef(`TERM_RU_UTF8', `Exec "URxvt" LC_CTYPE=ru_RU.UTF-8 exec TERM -name URxvt')
+pushdef(`TERM_KOI8', `Exec "TERM" LC_CTYPE=ru_RU.KOI8-R exec TERM')dnl
+pushdef(`TERM_RU_UTF8', `Exec "URxvt" LC_CTYPE=ru_RU.UTF-8 exec TERM -name URxvt')dnl
 *FvwmButtons: (Title Term,     Icon rterm2.xpm,      Action TERM_KOI8)
 *FvwmButtons: (Title UTF-8,    Icon rterm2.xpm,      Action TERM_RU_UTF8)
+popdef(`TERM_KOI8', `TERM_RU_UTF8')dnl
+pushdef(`TERM_KOI8', `Exec "TERM" LC_CTYPE=ru_RU.KOI8-R exec TERM -xrm "*Page: 1 0 1"')dnl
 *FvwmButtons: (Title "phdru (k8,s)",    Icon xterm-sgi.xpm,   Action TERM_KOI8_SSH_SCREEN(phdru.name, phdru.name))
+popdef(`TERM_KOI8')dnl
+pushdef(`TERM_KOI8', `Exec "TERM" LC_CTYPE=ru_RU.KOI8-R exec TERM -xrm "*Page: 1 1 1"')dnl
 *FvwmButtons: (Title "iskra (k8,s)",    Icon xterm-sgi.xpm,   Action TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra))
 *FvwmButtons: (Title "oper (k8,s)",     Icon xterm-linux.xpm, Action TERM_KOI8_BOTRT_SSH_SCREEN(oper.med.ru, oper))
-popdef(`TERM_KOI8', `TERM_RU_UTF8')
+popdef(`TERM_KOI8')dnl
 
 *FvwmButtons: (Title Wallpaper, Icon find1.xpm,        Action Exec "gxmessage" "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
 *FvwmButtons: (Title "-1",      Icon find1.xpm,        Action Exec "gxmessage" "$HOME"/current/projects/xsetbg/print-filename.py 1 | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
 *FvwmButtons: (Title Next,      Icon Jrecycle.xpm,     Action Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-force)
 #*FvwmButtons: (Title pavucontrol, Icon mini.sound.xpm, Action Exec "Volume Control" exec cgmem_nice 200 pavucontrol)
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
-*FvwmButtons: (Title AudioPlayer,  Icon bell.xpm,      Action Exec "deadbeef" LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 400 deadbeef)
+*FvwmButtons: (Title AudioPlayer,  Icon bell.xpm,      Action Exec "deadbeef" LC_CTYPE=ru_RU.KOI8-R FvwmCommand "GotoDeskAndPage 0 1 1" && exec cgmem_nice 400 deadbeef)
 #*FvwmButtons: (Title XLock,     Icon Jxlock.xpm,      Action Exec exec xscreensaver-command -lock)
-*FvwmButtons: (Title Skype,    Icon skypeforlinux.png, Action Skype)
+*FvwmButtons: (Title Skype,    Icon skypeforlinux.png, Action Exec "Skype" FvwmCommand "GotoDeskAndPage 0 0 1" && BROWSER=firefox exec cgmem_nice 2000 skypeforlinux)
 
 ############################################################################
 # FvwmForm