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

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 05140f8..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
@@ -77,7 +77,7 @@ define(`TERM_EN_UTF8', `Exec LC_CTYPE=en_US.UTF-8 exec TERM -name URxvt')
 define(`TERM_HEB_UTF8', `Exec LC_CTYPE=he_IL.UTF-8 exec TERM -name URxvt')
 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_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')
@@ -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,10 +625,10 @@ 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([`], ['])
+changequote([`], ['])dnl
 
 DestroyFunc Term3Hosts
 AddToFunc Term3Hosts          I GotoDeskAndPage 1 1 2
@@ -660,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 -
@@ -958,7 +958,7 @@ popdef(`TERM_KOI8')dnl
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
 *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 Exec "Skype" FvwmCommand "GotoDeskAndPage 0 0 1" && BROWSER=firefox exec cgmem_nice 1000 skypeforlinux)
+*FvwmButtons: (Title Skype,    Icon skypeforlinux.png, Action Exec "Skype" FvwmCommand "GotoDeskAndPage 0 0 1" && BROWSER=firefox exec cgmem_nice 2000 skypeforlinux)
 
 ############################################################################
 # FvwmForm