X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=51e0f2fe353f406a7ce2fe65ba682fab2595a1d4;hb=791511a208ca32455ba7184f9915a4b1ed227468;hp=fcbede001454f6fc880a4306e24e0fb0084bfa0d;hpb=847e2e9245266885d4bcdc7a22295172dc2dc5cb;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index fcbede0..51e0f2f 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -103,7 +103,8 @@ define(`REMOTE_HOST_TERM_TITLE', `$1 -title $3 -n $3 -e SSH $2')
 define(`REMOTE_HOST_KOI8',
 REMOTE_HOST_TERM_TITLE(TERM_KOI8, $1, $2))
 
-define(`REMOTE_SCREEN_KOI8', `-t $1 exec screen -xRR -S default-koi8')
+define(`REMOTE_SCREEN_KOI8', `-t $1 exec /usr/bin/screen -xRR -S default-koi8')
+define(`REMOTE_SCREEN_UTF8', `-t $1 exec /usr/bin/screen -xRR -S default-utf8')
 
 define(`REMOTE_HOST_KOI8_MENU',
 "$2 (koi8)" REMOTE_HOST_KOI8($1, $2))
@@ -121,16 +122,16 @@ define(`REMOTE_HOST_KOI8_BOTRT_MENU',
 "$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2))
 
 define(`REMOTE_HOST_UTF8',
-REMOTE_HOST_TERM(TERM_RU_UTF8, $1))
+REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8, $1, $2))
 
 define(`REMOTE_HOST_UTF8_MENU',
 "$2 (utf8)" REMOTE_HOST_UTF8($1, $2))
 
 define(`REMOTE_HOST_UTF8_BOTLT',
-REMOTE_HOST_TERM(TERM_RU_UTF8_BOTLT, $1))
+REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8_BOTLT, $1, $2))
 
 define(`REMOTE_HOST_UTF8_BOTRT',
-REMOTE_HOST_TERM(TERM_RU_UTF8_BOTRT, $1))
+REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8_BOTRT, $1, $2))
 
 define(`REMOTE_HOST_UTF8_BOTLT_MENU',
 "$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2))
@@ -274,7 +275,6 @@ Style "*MPlayer*"       Layer 6, PositionPlacement 250p 100p
 Style "*mpv"            Layer 6, PositionPlacement 250p 100p
 
 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
 Style "Mosaic"          NoPPosition
@@ -477,7 +477,7 @@ AddToFunc RestartFunction
 DestroyFunc UrgencyFunc
 AddToFunc UrgencyFunc
 +                             I Iconify off
-+                             I ThisWindow ("*Downloads") Break
++                             I ThisWindow ("*Downloads|Skype") Break
 +                             I FlipFocus
 +                             I Raise
 +                             I WarpToWindow 5p 5p
@@ -800,37 +800,22 @@ AddToMenu RootMenu "Root Menu"  Title
 +               "XSetBg"        Popup XSetBgMenu
 +               "Fvwm Commands" Popup FvwmCommands
 
+DestroyMenu OSMenu
+AddToMenu OSMenu        "OS commands:" Title
++                       "Suspend to ram"  Exec exec s2r
++                       "Suspend to disk" Exec exec s2d
++                       "Suspend to both" Exec exec s2b
+
 # This menu will fire up some often used programs
-DestroyMenu  Utilities
+DestroyMenu Utilities
 AddToMenu Utilities     "Choose one:" Title
-+                       "qPDFview" Exec LC_CTYPE=ru_RU.KOI8-R exec qpdfview
-+                       "FBReader" Exec LC_CTYPE=ru_RU.KOI8-R exec fbreader
++                       "OS"     Popup OSMenu
 +                       ""       Nop
 +                       "GVim (koi8)" Exec LC_CTYPE=ru_RU.KOI8-R exec gvim
 +                       "GVim (utf8)" Exec LC_CTYPE=ru_RU.UTF-8  exec gvim
 +                       ""       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
-+                       "AudioPlayer" AudioPlayer
-+                       "Id3Info"     Id3Info
-+                       ""       Nop
-+                       "Gajim"       Gajim
-+                       "Pidgin"      Pidgin
-+                       ""       Nop
-+                       "xload"  Exec exec xload -geometry =136x136+0+0
-+                       "Top"    TERM_KOI8 -T Top -n Top -e top
-+                       ""       Nop
 +                       "Refresh Screen" Refresh
 +                       "xrefresh" Exec exec xrefresh
-+                       ""       Nop
-#+                       "xcalc" Exec exec xcalc
-+                       "xclipboard" Exec exec xclipboard
-+                       "xcutsel" Exec exec xcutsel
-#+                       "xman" Exec exec xman -notopbox -geometry +150+102
-#+                       "emacs" Exec emacs -geometry 81x35+150+34
-#+                       "xv" Function warp-or-run xv "Exec exec xv -ncols 240 -geometry +0+0"
 
 DestroyMenu  Browsers
 AddToMenu Browsers      "Choose one:" Title