X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fphd.m4;h=3f8b1b098dd80ec6efc38019282d070e65873985;hb=e6304cf5d426d1d43980eb862e9737d6208cf077;hp=576ea6faf82975fbe5a964d1d41f9b4992e03a58;hpb=3c093357482205dc89cb8ffc4edd4603f0b4e7bf;p=dotfiles.git

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index 576ea6f..3f8b1b0 100644
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -54,8 +54,8 @@ define(`BUTTONS_FONT', PAGER_FONT)
 
 
 define(`MENU_FONT',
-ifelse(eval(WIDTH < 1024), 1, `xft:Helvetica:size=16',
-       eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'))
+ifelse(eval(WIDTH < 1024), 1, `xft:Sans:size=16',
+       eval(WIDTH < 1920), 1, `xft:Sans:size=18', `xft:Sans:size=22'))
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)
 define(`ICON_BOX_FONT', MENU_FONT)
@@ -79,7 +79,7 @@ define(`TERM_GEOM_BOTRT', TERM_GEOM`-0-0')
 
 define(`TERM_GEOM_BIG',
 ifelse(eval(WIDTH < 1024), 1, `96x30',
-       eval(WIDTH < 1920), 1, `112x32', `126x35'))
+       eval(WIDTH < 1920), 1, `112x32+2-0', `126x35'))
 
 
 define(`TERM', `urxvt')
@@ -232,7 +232,8 @@ Style * BorderWidth 5, HandleWidth 5, Icon unknown1.xpm
 Style * DecorateTransient, ClickToFocusRaisesOff
 
 Style "Fvwm*"           !Title, Sticky, WindowListSkip
-Style "FvwmButtons"     !Handles, BorderWidth 0
+Style "FvwmButtons"     !Handles, BorderWidth 0, Layer 2
+Style "FvwmPager"       Layer 2
 
 # Terminals
 Style "*term"           Icon term.xpm
@@ -259,7 +260,7 @@ Style "*Pidgin*"        MinOverlapPercentPlacement
 # (S)MPlayer
 Style "*MPlayer*"       Layer 6, PositionPlacement 350p 100p
 
-Style "*clock"          !Title, Sticky, WindowListSkip, Color Black/#40c040, NeverFocus, PositionPlacement 50-50w +1p
+Style "*clock"          !Title, Sticky, WindowListSkip, Color Black/#40c040, NeverFocus, PositionPlacement 50-50w +1p, Layer 2
 Style "emacs"           NoPPosition
 Style "gxmessage"       PositionPlacement 50-50w +20
 Style "*lock"           !Title, Sticky, WindowListSkip
@@ -480,9 +481,7 @@ AddToFunc StartStandardSession
 +              I TERM_KOI8 -e su -
 +              I Wait TERM
 +              I PaVuControl
-+              I Wait "Volume Control"
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
-+              I FireFox
 +              I GotoDeskAndPage 1 0 1
 +              I TERM_KOI8
 +              I Wait TERM
@@ -495,7 +494,7 @@ AddToFunc StartStandardSession
 +              I Wait URxvt
 +              I TERM_KOI8 -geometry 60x25-5-5 -iconic -name term-im-local
 +              I Wait URxvt
-+              I GotoDeskAndPage 1 1 0
++              I FireFox
 +              I Schedule 1000 GotoDeskAndPage 0 1 0
 
 DestroyFunc ResumeFunction
@@ -503,8 +502,7 @@ AddToFunc ResumeFunction
 +              I GotoDeskAndPage 0 0 0
 +              I TERM_KOI8
 +              I Wait TERM
-+              I PaVuControl
-+              I Wait "Volume Control"
++              I None ("Volume Control") PaVuControl
 +              I Exec sleep 10; exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I 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 -
 +              I Wait gxmessage
@@ -573,7 +571,7 @@ AddToFunc PrintFunction         I Raise
 +                               I Exec exec xdpr -id $w
 
 DestroyFunc Raise-All
-AddToFunc Raise-All           I All (!"FvwmButtons|System|*clock") Raise
+AddToFunc Raise-All           I All Raise
 
 ##############################################################################
 # User-defined functions
@@ -582,6 +580,7 @@ AddToFunc Raise-All           I All (!"FvwmButtons|System|*clock") Raise
 DestroyFunc PaVuControl
 AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
 +                             I Exec exec pavucontrol
++                             I Wait "Volume Control"
 
 changequote([,])
 DestroyFunc Id3Info
@@ -660,7 +659,9 @@ AddToMenu Window-Ops2   "Center"        Center
 AddToMenu Terminals     "Terminals" Title
 +               "Grey term (koi8)" TERM_KOI8
 +               "Grey term (utf8)" TERM_UTF8
++               "Grey term (koi8,btlt)" TERM_KOI8_BOTLT
 +               "Grey term (koi8,btrt)" TERM_KOI8_BOTRT
++               "Grey term (utf8,btlt)" TERM_UTF8_BOTLT
 +               "Grey term (utf8,btrt)" TERM_UTF8_BOTRT
 +               "Big grey term (koi8)" TERM_KOI8 -geometry TERM_GEOM_BIG
 +                       ""      Nop
@@ -769,17 +770,22 @@ AddToMenu RootMenu "Root Menu"  Title
 # This menu will fire up some often used programs
 DestroyMenu  Utilities
 AddToMenu Utilities     "Choose one:" Title
++                       "qPDFview" Exec exec qpdfview
 +                       "FBReader" Exec exec fbreader
++                       ""       Nop
 +                       "GVim (koi8)" Exec LC_CTYPE=ru_RU.KOI8-R exec gvim
 +                       "GVim (utf8)" Exec LC_CTYPE=ru_RU.UTF-8  exec gvim
++                       ""       Nop
 +                       "MyRuLb (koi8)" Exec LC_CTYPE=ru_RU.KOI8-R exec "$HOME"/admin/prog/myrulib/myrulib
 +                       "MyRuLb (utf8)" Exec LC_CTYPE=ru_RU.UTF-8  exec "$HOME"/admin/prog/myrulib/myrulib
++                       ""       Nop
 #+                       "XFortune" Exec /usr/games/fortune | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 #+                       "xbuffy" Exec exec xbuffy -fn 'XBUFFY_FONT' -geometry +0+125 -boxfile mail/misc/.xbuffyrc
 +                       ""       Nop
 +                       "pavucontrol" PaVuControl
 +                       "DeadBeef"    DeadBeef
 +                       "Id3Info"     Id3Info
++                       ""       Nop
 +                       "Gajim"       Gajim
 +                       "Pidgin"      Pidgin
 +                       ""       Nop
@@ -789,7 +795,7 @@ AddToMenu Utilities     "Choose one:" Title
 +                       "Refresh Screen" Refresh
 +                       "xrefresh" Exec exec xrefresh
 +                       ""       Nop
-+                       "xcalc" Exec exec xcalc
+#+                       "xcalc" Exec exec xcalc
 +                       "xclipboard" Exec exec xclipboard
 +                       "xcutsel" Exec exec xcutsel
 #+                       "xman" Exec exec xman -notopbox -geometry +150+102