X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fphd.m4;h=4b76f82af03960f175e92c27c2a6299a416166ad;hb=6ed70b3b6063459249c81f2d8a2ee99ce6e59ff0;hp=80f0e43a2333a7552e6667fecfa6844a406b89f6;hpb=64f4a9546340d990665e24896b410d460981f11a;p=dotfiles.git

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index 80f0e43..4b76f82 100644
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -51,21 +51,21 @@ define(`ICON_FONT', `LARGE_FONT')
 
 
 define(`PAGER_GEOM',
-`ifelse(eval(WIDTH < 1024), 1, `365x100+0+0',dnl
-`ifelse(eval(WIDTH < 1920), 1, `365x100+0+0', `600x160+0+0'dnl
-)')'dnl
+ifelse(eval(WIDTH < 1024), 1, `365x100+0+0',dnl
+ifelse(eval(WIDTH < 1920), 1, `365x100+0+0', `600x160+0+0'dnl
+))dnl
 )
 
 define(`PAGER_FONT',
-`ifelse(eval(WIDTH < 1920), 1, `SMALL_FONT', `BIG_FONT'dnl
-)')
+ifelse(eval(WIDTH < 1920), 1, `SMALL_FONT', `BIG_FONT'dnl
+))
 define(`BUTTONS_FONT', PAGER_FONT)
 
 
 define(`MENU_FONT',
-`ifelse(eval(WIDTH < 1024), 1, `xft:Helvetica:size=16',dnl
-`ifelse(eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'dnl
-)')'dnl
+ifelse(eval(WIDTH < 1024), 1, `xft:Helvetica:size=16',dnl
+ifelse(eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'dnl
+))dnl
 )
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)
@@ -74,33 +74,36 @@ define(`ICON_BOX_FONT', MENU_FONT)
 
 dnl XSetBg message width and font
 define(`TEXT_WIDTH',
-`ifelse(eval(WIDTH < 1024), 1, 70,dnl
-`ifelse(eval(WIDTH < 1920), 1, 75, 80 dnl
-)')'dnl
+ifelse(eval(WIDTH < 1024), 1, 70,dnl
+ifelse(eval(WIDTH < 1920), 1, 75, `80'dnl
+))dnl
 )
 
-define(`MESSAGE_FONT', `Nimbus Sans L 18')'dnl
+define(`MESSAGE_FONT', `Nimbus Sans L 18')dnl
 
 
 dnl Terminal emulator
 define(`TERM_GEOM',
-`ifelse(eval(WIDTH < 1024), 1, `80x25',dnl
-`ifelse(eval(WIDTH < 1920), 1, `80x30', `80x32'dnl
-)')'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_BOTLT', `TERM_GEOM+0-0')dnl
+define(`TERM_GEOM_BOTRT', `TERM_GEOM-0-0')dnl
 
 define(`TERM_GEOM_BIG',
-`ifelse(eval(WIDTH < 1024), 1, `96x30',dnl
-`ifelse(eval(WIDTH < 1920), 1, `112x32', `126x35'dnl
-)')'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_BOTLT', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM -geometry TERM_GEOM_BOTLT')
+define(`TERM_UTF8_BOTLT', `Exec exec "$HOME"/lib/X11/utf8rxvt -geometry TERM_GEOM_BOTLT')
 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')
 
@@ -113,10 +116,18 @@ define(`REMOTE_HOST_KOI8_MENU',
 "$2 (koi8)" REMOTE_HOST_KOI8($1, $2)dnl
 )
 
+define(`REMOTE_HOST_KOI8_BOTLT',
+TERM_KOI8_BOTLT -title "$2" -n "$2" -e ssh -4 "$1"dnl
+)
+
 define(`REMOTE_HOST_KOI8_BOTRT',
 TERM_KOI8_BOTRT -title "$2" -n "$2" -e ssh -4 "$1"dnl
 )
 
+define(`REMOTE_HOST_KOI8_BOTLT_MENU',
+"$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2)dnl
+)
+
 define(`REMOTE_HOST_KOI8_BOTRT_MENU',
 "$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2)dnl
 )
@@ -129,10 +140,18 @@ define(`REMOTE_HOST_UTF8_MENU',
 "$2 (utf8)" REMOTE_HOST_UTF8($1, $2)dnl
 )
 
+define(`REMOTE_HOST_UTF8_BOTLT',
+TERM_UTF8_BOTLT -e ssh -4 "$1"dnl
+)
+
 define(`REMOTE_HOST_UTF8_BOTRT',
 TERM_UTF8_BOTRT -e ssh -4 "$1"dnl
 )
 
+define(`REMOTE_HOST_UTF8_BOTLT_MENU',
+"$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2)dnl
+)
+
 define(`REMOTE_HOST_UTF8_BOTRT_MENU',
 "$2 (utf8,btrt)" REMOTE_HOST_UTF8_BOTRT($1, $2)dnl
 )
@@ -477,8 +496,8 @@ AddToFunc "StartStandardSession"
 +              I TERM_KOI8
 +              I Wait TERM
 +              I GotoDeskAndPage 0 0 1
-+              I TERM_KOI8 -geometry 38x30+0-0
-+              I Wait TERM
++              I TERM_UTF8 -geometry 38x30+0-0
++              I Wait URxvt
 +              I GotoDeskAndPage 0 1 0
 +              I TERM_KOI8 -e su -
 +              I Wait TERM
@@ -817,26 +836,26 @@ AddToMenu XScreenSaverMenu     "Choose mode:" Title
 +                       "Kill Screen Saver"         Exec exec xscreensaver-command -exit
 
 AddToMenu XSetBgMenu    "XSetBg" Title
-+                       "Change wallpaper" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-force
-+                       "Start" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-start
-+                       "Stop" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-stop
-+                       "Restart" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-restart
++                       "Change wallpaper" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-force
++                       "Start" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-start
++                       "Stop" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-stop
++                       "Restart" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-restart
 +                       ""       Nop
 changequote([,])
-+                       "Xli" Exec fn="`$HOME/admin/prog/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
-+                       "Xli (scaled)" Exec fn="`$HOME/admin/prog/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
-+                       "Open in browser" Exec exec webbrowserX -n "`$HOME/admin/prog/xsetbg/print-filename.py -e koi8-r`"
-+                       "Filename" Exec exec "$HOME"/admin/prog/xsetbg/print-filename.py -e koi8-r
-+                       "XFilename" Exec "$HOME"/admin/prog/xsetbg/print-filename.py | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
-+                       "XFilename (wrapped)" Exec "$HOME"/admin/prog/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "Xli" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
++                       "Xli (scaled)" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
++                       "Open in browser" Exec exec webbrowserX -n "`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`"
++                       "Filename" Exec exec "$HOME"/current/projects/xsetbg/print-filename.py -e koi8-r
++                       "XFilename" Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "XFilename (wrapped)" Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +                       ""       Nop
-+                       "Xli (prev.)" Exec fn="`$HOME/admin/prog/xsetbg/print-filename.py -e koi8-r -o`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
-+                       "Xli (prev., scaled)" Exec fn="`$HOME/admin/prog/xsetbg/print-filename.py -e koi8-r -o`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
-+                       "Open in browser (prev.)" Exec exec webbrowserX -n "`$HOME/admin/prog/xsetbg/print-filename.py -e koi8-r -o`"
++                       "Xli (prev.)" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r -o`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
++                       "Xli (prev., scaled)" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r -o`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
++                       "Open in browser (prev.)" Exec exec webbrowserX -n "`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r -o`"
 changequote([`], ['])
-+                       "Filename (prev.)" Exec exec "$HOME"/admin/prog/xsetbg/print-filename.py -e koi8-r -o
-+                       "XFilename (prev.)" Exec "$HOME"/admin/prog/xsetbg/print-filename.py -o | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
-+                       "XFilename (prev., wrapped)" Exec "$HOME"/admin/prog/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "Filename (prev.)" Exec exec "$HOME"/current/projects/xsetbg/print-filename.py -e koi8-r -o
++                       "XFilename (prev.)" Exec "$HOME"/current/projects/xsetbg/print-filename.py -o | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "XFilename (prev., wrapped)" Exec "$HOME"/current/projects/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 
 ############################################################################
 # FvwmBacker
@@ -844,7 +863,7 @@ changequote([`], ['])
 #*FvwmBacker: Command (Desk 0, Page * *) -solid DarkCyan
 #*FvwmBacker: Command (Desk 1, Page * *) -solid steelblue
 #*FvwmBacker: Command (Desk 2, Page * *) -solid midnightblue
-*FvwmBacker: Command (Desk *, Page * *) Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-change
+*FvwmBacker: Command (Desk *, Page * *) Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-change
 
 ############################################################################
 # FvwmButtons
@@ -894,9 +913,9 @@ changequote([`], ['])
 *FvwmButtons: (Title UTF-8,    Icon rterm2.xpm,      Action TERM_UTF8)
 *FvwmButtons: (Title phdru,    Icon xterm-sgi.xpm,   Action Term-Phdru)
 
-*FvwmButtons: (Title Wallpaper, Icon find1.xpm,        Action Exec $HOME/admin/prog/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
-*FvwmButtons: (Title "-1",      Icon find1.xpm,        Action Exec $HOME/admin/prog/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
-*FvwmButtons: (Title Next,      Icon Jrecycle.xpm,     Action Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-force)
+*FvwmButtons: (Title Wallpaper, Icon find1.xpm,        Action Exec $HOME/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
+*FvwmButtons: (Title "-1",      Icon find1.xpm,        Action Exec $HOME/current/projects/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | 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 PaVuControl)
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
 #*FvwmButtons: (Title Audacious, Icon bell.xpm,        Action Audacious)