From 5fee59e19e46ccee891c96e8177afb7d4c400e57 Mon Sep 17 00:00:00 2001 From: dakkar Date: Tue, 2 Jun 2015 16:16:36 +0100 Subject: update to fvwm-crystal 3.2.3 This update is big: upstream has simplified and refactored everything, so I had to move stuff around a lot. I now rely much more on the overlay system, instead of adding custom files all over the place. --- components/functions/BlingBling | 1 + components/functions/Fullscreen | 1 + components/functions/Mixer | 15 +++++++++++ components/functions/Mixer-amixer | 25 ----------------- components/functions/Music-amarok | 49 --------------------------------- components/functions/Notify | 12 --------- components/functions/Numpad | 57 --------------------------------------- components/functions/Screen-Menu | 2 -- components/functions/Urgency-Hint | 13 +++++++++ 9 files changed, 30 insertions(+), 145 deletions(-) create mode 100644 components/functions/BlingBling create mode 100644 components/functions/Fullscreen create mode 100644 components/functions/Mixer delete mode 100644 components/functions/Mixer-amixer delete mode 100644 components/functions/Music-amarok delete mode 100644 components/functions/Notify delete mode 100644 components/functions/Numpad create mode 100644 components/functions/Urgency-Hint (limited to 'components/functions') diff --git a/components/functions/BlingBling b/components/functions/BlingBling new file mode 100644 index 0000000..242aa64 --- /dev/null +++ b/components/functions/BlingBling @@ -0,0 +1 @@ +# nothing, no translucency change diff --git a/components/functions/Fullscreen b/components/functions/Fullscreen new file mode 100644 index 0000000..8a5a4fd --- /dev/null +++ b/components/functions/Fullscreen @@ -0,0 +1 @@ +# do nothing, we don't want Fullscreen diff --git a/components/functions/Mixer b/components/functions/Mixer new file mode 100644 index 0000000..260faeb --- /dev/null +++ b/components/functions/Mixer @@ -0,0 +1,15 @@ +DestroyFunc Change-Volume-Up +AddToFunc Change-Volume-Up ++ I exec amixer set Master 10%+ >/dev/null + +DestroyFunc Change-Volume-Down +AddToFunc Change-Volume-Down ++ I exec amixer set Master 10%- >/dev/null + +DestroyFunc Mixer-Volume-Toggle +AddToFunc Mixer-Volume-Toggle ++ I exec amixer set Master toggle >/dev/null + +DestroyFunc Mixer-Show +AddToFunc Mixer-Show ++ I exec pavucontrol & diff --git a/components/functions/Mixer-amixer b/components/functions/Mixer-amixer deleted file mode 100644 index aec79b6..0000000 --- a/components/functions/Mixer-amixer +++ /dev/null @@ -1,25 +0,0 @@ -DestroyFunc Mixer-Volume -AddToFunc Mixer-Volume -+ I Exec amixer set Master "$0"'%' > /dev/null - -DestroyFunc Mixer-Volume-Up -AddToFunc Mixer-Volume-Up -+ I Exec amixer set Master "$0"'%+' > /dev/null - -DestroyFunc Mixer-Volume-Down -AddToFunc Mixer-Volume-Down -+ I Exec amixer set Master "$0"'%-' > /dev/null - -DestroyFunc Mixer-GUI -AddToFunc Mixer-GUI -+ I Exec exec gamix > /dev/null - -# Mixer menu -DestroyMenu /Mixer -AddToMenu /Mixer -+ "100%%" Mixer-Volume 100 -+ "90%%" Mixer-Volume 90 -+ "80%%" Mixer-Volume 80 -+ "50%%" Mixer-Volume 50 -+ "30%%" Mixer-Volume 30 -+ "0%%" Mixer-Volume 0 diff --git a/components/functions/Music-amarok b/components/functions/Music-amarok deleted file mode 100644 index 8a5ab35..0000000 --- a/components/functions/Music-amarok +++ /dev/null @@ -1,49 +0,0 @@ -DestroyMenu /Music -AddToMenu /Music -+ DynamicPopupAction Function /Music-generator - -DestroyFunc /Music-generator -AddToFunc /Music-generator -+ I DestroyMenu recreate /Music -+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom -+ I AddToMenu /Music '$[gt.Toggle repeat]' Music-ToggleRepeat -+ I AddToMenu /Music "" Nop -+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop -+ I AddToMenu /Music '$[gt.Show/hide player]' Music-GUI -+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause - -DestroyFunc Music-Play -AddToFunc Music-Play -+ I Exec exec dcop amarok player play 2>/dev/null - -DestroyFunc Music-Pause -AddToFunc Music-Pause -+ I Exec exec dcop amarok player pause 2>/dev/null - -DestroyFunc Music-Stop -AddToFunc Music-Stop -+ I Exec exec dcop amarok player stop 2>/dev/null - -DestroyFunc Music-PlayPause -AddToFunc Music-PlayPause -+ I Exec exec dcop amarok player playPause 2>/dev/null - -DestroyFunc Music-Next -AddToFunc Music-Next -+ I Exec exec dcop amarok player next 2>/dev/null - -DestroyFunc Music-Prev -AddToFunc Music-Prev -+ I Exec exec dcop amarok player prev 2>/dev/null - -DestroyFunc Music-ToggleRandom -AddToFunc Music-ToggleRandom -+ I Exec exec dcop amarok player enableRandomMode $( if [ $(dcop amarok player randomModeStatus) == false ]; then echo true; else echo false;fi) 2>/dev/null - -DestroyFunc Music-ToggleRepeat -AddToFunc Music-ToggleRepeat -+ I Exec exec dcop amarok player enableRepeatPlaylist $( if [ $(dcop amarok player repeatPlaylistStatus) == false ]; then echo true; else echo false;fi) 2>/dev/null - -DestroyFunc Music-GUI -AddToFunc Music-GUI -+ I Exec dcop amarok playlist togglePlaylist 2>/dev/null || amarok diff --git a/components/functions/Notify b/components/functions/Notify deleted file mode 100644 index f0c2a55..0000000 --- a/components/functions/Notify +++ /dev/null @@ -1,12 +0,0 @@ -AddToFunc StartFunction -+ I ModuleSynchronous FvwmPerl NotifyPerl -+ I SendToModule NotifyPerl load FvwmNotify.pm - -DestroyFunc BubbleNotify -AddToFunc BubbleNotify -+ I SendToModule NotifyPerl eval FvwmNotify::notify(q{$0},q{$1},q{$2},q{$3},q{$4}) - -DestroyFunc UrgencyFunc -AddtoFunc UrgencyFunc -+ I BubbleNotify $[w.name] $[w.name] 'beep!' 2000 $[w.iconfile] - diff --git a/components/functions/Numpad b/components/functions/Numpad deleted file mode 100644 index b694ee3..0000000 --- a/components/functions/Numpad +++ /dev/null @@ -1,57 +0,0 @@ -# Numpad - -# --------------------------------------------------------------------------- -# Focus functions -DestroyFunc Window-FocusInDirection -AddToFunc Window-FocusInDirection -+ I Direction $0 (CurrentPage, AnyScreen, AcceptsFocus, !Iconic) Focus - -DestroyFunc Window-FocusAndRaiseInDirection -AddToFunc Window-FocusAndRaiseInDirection -+ I Direction $0 (CurrentPage, AnyScreen, AcceptsFocus, !Iconic) Focus -+ I Current (Focused) Raise - -# --------------------------------------------------------------------------- -# Move functions -DestroyFunc Window-MPAnimatedMove -AddToFunc Window-MPAnimatedMove -+ I Current (HasPointer) AnimatedMove $0 $1 Warp -+ I TestRc (NoMatch) AnimatedMove $0 $1 - -DestroyFunc Window-Warp-CenterCenter -AddToFunc Window-Warp-CenterCenter -+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] / 2 - $[w.width] / 2`p `expr $[vp.height] / 2 - $[w.height] / 2`p' - -DestroyFunc Window-Warp-LeftCenter -AddToFunc Window-Warp-LeftCenter -+ I Current Piperead 'echo Window-MPAnimatedMove $[EWMH_BS_Panel_Left]p `expr $[vp.height] / 2 - $[w.height] / 2`p' - -DestroyFunc Window-Warp-LeftTop -AddToFunc Window-Warp-LeftTop -+ I Current Window-MPAnimatedMove $[EWMH_BS_Panel_Left]p $[EWMH_BS_Panel_Top]p - -DestroyFunc Window-Warp-CenterTop -AddToFunc Window-Warp-CenterTop -+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] / 2 - $[w.width] / 2`p $[EWMH_BS_Panel_Top]p' - -DestroyFunc Window-Warp-RightTop -AddToFunc Window-Warp-RightTop -+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] - $[EWMH_BS_Panel_Right] - $[w.width]`p $[EWMH_BS_Panel_Top]p' - -DestroyFunc Window-Warp-RightCenter -AddToFunc Window-Warp-RightCenter -+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] - $[EWMH_BS_Panel_Right] - $[w.width]`p `expr $[vp.height] / 2 - $[w.height] / 2`p' - -DestroyFunc Window-Warp-CenterBottom -AddToFunc Window-Warp-CenterBottom -+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] / 2 - $[w.width] / 2`p `expr $[vp.height] - $[EWMH_BS_Panel_Bottom] - $[w.height]`p' - -DestroyFunc Window-Warp-LeftBottom -AddToFunc Window-Warp-LeftBottom -+ I Current Piperead 'echo Window-MPAnimatedMove $[EWMH_BS_Panel_Left]p `expr $[vp.height] - $[EWMH_BS_Panel_Bottom] - $[w.height]`p' - -DestroyFunc Window-Warp-RightBottom -AddToFunc Window-Warp-RightBottom -+ I Current Piperead 'echo Window-MPAnimatedMove `expr $[vp.width] - $[EWMH_BS_Panel_Right] - $[w.width]`p `expr $[vp.height] - $[EWMH_BS_Panel_Bottom] - $[w.height]`p' - -# vim:ft=fvwm diff --git a/components/functions/Screen-Menu b/components/functions/Screen-Menu index e32dc39..28b6c09 100644 --- a/components/functions/Screen-Menu +++ b/components/functions/Screen-Menu @@ -7,5 +7,3 @@ AddToFunc BuildScreensMenu + I DestroyMenu recreate /Screens + I AddToMenu /Screens + I PipeRead $[FVWM_USERDIR]/scripts/fvwm-screen.pl - -Mouse 3 RI $[Mod1] Popup /Screens diff --git a/components/functions/Urgency-Hint b/components/functions/Urgency-Hint new file mode 100644 index 0000000..af35efe --- /dev/null +++ b/components/functions/Urgency-Hint @@ -0,0 +1,13 @@ +AddToFunc StartFunction ++ I ModuleSynchronous FvwmPerl NotifyPerl ++ I SendToModule NotifyPerl load FvwmNotify.pm + +DestroyFunc BubbleNotify +AddToFunc BubbleNotify ++ I SendToModule NotifyPerl eval FvwmNotify::notify(q{$0},q{$1},q{$2},q{$3},q{$4}) + +DestroyFunc UrgencyFunc +AddtoFunc UrgencyFunc ++ I BubbleNotify $[w.name] $[w.name] 'beep!' 2000 $[w.iconfile] + +DestroyFunc UrgencyDoneFunc -- cgit v1.2.3