X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=7de4966d9579528130f0badd31157b27f4e9d5df;hb=9cbd9e9642c8480c145f8a327f378b9c4b418475;hp=aa2c7cf0b201e1ef5f5ef5ce1aabda182a67e33a;hpb=8525913c9e27d153d370640c9870f283525f6f90;p=dotfiles.git diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index aa2c7cf..7de4966 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -12,18 +12,6 @@ dnl Echo dimension `#' width = WIDTH divert(-1) -dnl koi8-r Fonts -dnl define(`SMALL_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-100-*-*-*-*-koi8-r') -dnl define(`MEDIUM_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-120-*-*-*-*-koi8-r') -dnl define(`BIG_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-140-*-*-*-*-koi8-r') - -dnl cp1251 Fonts -dnl define(`SMALL_FONT_CP1251', `-*-fixed-medium-r-normal-*-*-100-*-*-*-*-*-cp1251') -dnl define(`MEDIUM_FONT_CP1251', `-*-fixed-medium-r-normal-*-*-120-*-*-*-*-*-cp1251') -dnl define(`BIG_FONT_CP1251', `-*-fixed-medium-r-normal-*-*-140-*-*-*-*-*-cp1251') - -dnl define(`XBUFFY_FONT', `-cronyx-helvetica-bold-r-*-*-*-100-*-*-*-*-koi8-r') - dnl TrueType Fonts define(`VERY_SMALL_FONT', `xft:Sans:size=10') @@ -94,11 +82,11 @@ define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT') define(`TERM_RU_UTF8_BOTRT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTRT') -define(`SSH', `cgmem_nice 300 ssh -4') +define(`SSH', `cgmem_nice 300 ssh') define(`REMOTE_HOST_TERM', `$1 -e SSH $2') -define(`REMOTE_HOST_TERM_TITLE', `$1 -title $3 -n $3 -e SSH $2') +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)) @@ -275,6 +263,7 @@ 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 "deadbeef" PositionPlacement -0 -0 Style "gxmessage" PositionPlacement 50-50w +20 Style "*lock" !Title, Sticky, WindowListSkip Style "Mosaic" NoPPosition @@ -487,9 +476,6 @@ AddToFunc StartStandardSession + I GotoDeskAndPage 0 0 0 + I TERM_KOI8 + I Wait TERM -#+ I GotoDeskAndPage 0 0 1 -#+ I TERM_RU_UTF8 -geometry 38x30+0-0 -#+ I Wait URxvt + I Exec exec cgmem_nice 200 pulseaudio --start + I PaVuControl + I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off @@ -595,11 +581,11 @@ changequote([`], [']) DestroyFunc AudioPlayer AddToFunc AudioPlayer I GotoDeskAndPage 0 1 1 -+ I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 200 audacious ++ I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 400 deadbeef DestroyFunc Term-Iskra AddToFunc Term-Iskra I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra scr) DestroyFunc Term-Iskra-Big AddToFunc Term-Iskra-Big I GotoDeskAndPage 1 1 2 @@ -607,7 +593,7 @@ AddToFunc Term-Iskra-Big I GotoDeskAndPage 1 1 2 DestroyFunc Term-Oper AddToFunc Term-Oper I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper) ++ I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper scr) DestroyFunc Term-Oper-Big AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 @@ -615,7 +601,7 @@ AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 DestroyFunc Term-Phdru AddToFunc Term-Phdru I GotoDeskAndPage 1 0 1 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name scr) DestroyFunc Term-Phdru-Big AddToFunc Term-Phdru-Big I GotoDeskAndPage 1 0 1 @@ -627,14 +613,14 @@ AddToFunc Term3Hosts I Term-Iskra + I Term-Oper + I Wait TERM + I GotoDeskAndPage 1 0 1 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru.name) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru.name scr) + I Wait TERM + I GotoDeskAndPage 1 1 2 DestroyFunc FireFox AddToFunc FireFox I Any ("*Mozilla Firefox") Break + I GotoDeskAndPage 1 0 0 -+ I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 start-browser firefox ++ I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 start-browser firefox -P phd + I Wait "*Mozilla Firefox" + I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 firefox --new-window + I Wait "*Mozilla Firefox" @@ -737,15 +723,16 @@ AddToMenu TermColors "Term Colors" Title AddToMenu Systems "Systems" Title + "Iskra+Oper+Phdru" Term3Hosts + "" Nop -+ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra scr) + REMOTE_HOST_UTF8_BOTLT_MENU(iskra-aviel.phdru.name, iskra) + REMOTE_HOST_KOI8_BIG_MENU(iskra-aviel.phdru.name, ISKRA) + "" Nop -+ REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN_KOI8(oper.med.ru), oper) ++ REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN_KOI8(oper.med.ru), oper scr) + REMOTE_HOST_UTF8_BOTRT_MENU(oper.med.ru, oper) + REMOTE_HOST_KOI8_BIG_MENU(oper.med.ru, OPER) + "" Nop -+ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(phdru.name), phdru) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(phdru.name), phdru scr) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru scr SOCKS5) + REMOTE_HOST_UTF8_BOTLT_MENU(phdru.name, phdru) + REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU) @@ -931,9 +918,9 @@ 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') *FvwmButtons: (Title Term, Icon rterm2.xpm, Action TERM_KOI8) *FvwmButtons: (Title UTF-8, Icon rterm2.xpm, Action TERM_RU_UTF8) -*FvwmButtons: (Title phdru, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name)) -*FvwmButtons: (Title iskra, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra)) -*FvwmButtons: (Title oper, Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper)) +*FvwmButtons: (Title "phdru scr", Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name scr)) +*FvwmButtons: (Title "iskra scr", Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra scr)) +*FvwmButtons: (Title "oper scr", Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper scr)) popdef(`TERM_KOI8', `TERM_RU_UTF8') *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 -) @@ -941,7 +928,7 @@ popdef(`TERM_KOI8', `TERM_RU_UTF8') *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 "Audacious" LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 200 audacious) +*FvwmButtons: (Title AudioPlayer, Icon bell.xpm, Action Exec "deadbeef" LC_CTYPE=ru_RU.KOI8-R 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)