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.

30 files changed, 66 insertions, 193 deletions

diff --git a/components/apps/ROX-Filer b/components/apps/ROX-Filer
new file mode 100644
index 0000000..889b553
--- /dev/null
+++ b/components/apps/ROX-Filer
@@ -0,0 +1,7 @@
+# Launch the pinboard
+Test (Init) Test (x rox) Exec exec rox --pinboard=Default
+
+# Set the specified wallpaper using ROX-Filer's pinboard
+DestroyFunc Wallpaper-Set
+AddToFunc Wallpaper-Set
++ I Test (x rox) Exec echo "<?xml version=\"1.0\"?><env:Envelope xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\"><env:Body xmlns=\"http://rox.sourceforge.net/SOAP/ROX-Filer\"><SetBackdrop><Filename>$*</Filename><Style>Fit</Style></SetBackdrop></env:Body></env:Envelope>" | rox -R
diff --git a/components/bindings/Desktop-MMB-EdgeScroll b/components/bindings/Desktop-MMB-EdgeScroll
new file mode 100644
index 0000000..9a93de5
--- /dev/null
+++ b/components/bindings/Desktop-MMB-EdgeScroll
@@ -0,0 +1 @@
+# we always want EdgeScroll on!
diff --git a/components/bindings/Desktop-MMB-TogglePanels b/components/bindings/Desktop-MMB-TogglePanels
new file mode 100644
index 0000000..5d49344
--- /dev/null
+++ b/components/bindings/Desktop-MMB-TogglePanels
@@ -0,0 +1 @@
+# not useful for me
diff --git a/components/bindings/Desktop-dakkar b/components/bindings/Extra-Keybindings
index 9b3b434..f8ec431 100644
--- a/components/bindings/Desktop-dakkar
+++ b/components/bindings/Extra-Keybindings
@@ -1,5 +1,9 @@
-# Open screen on Alt+RMB
-Mouse 3 RI $[Mod1] Exec exec $[DefaultTerminal] -title local-screen -e screen -D -RR
+Key apostrophe A $[Mod1] Menu /Applications root c c
+Key quotedbl A $[Mod1] Menu /FVWM-Crystal root c c
+
+Mouse 3 RI $[Mod1] Exec exec $[infostore.DefaultTerminal] -title local-screen -e screen -D -RR
+
+Mouse 3 RI $[Mod2] Popup /Screens
 
 Key XF86Launch3 A N Exec emacsclient -nc
 Key XF86Launch4 A N Exec firefox
diff --git a/components/bindings/Multimedia_Keys b/components/bindings/Multimedia_Keys
new file mode 100644
index 0000000..1694805
--- /dev/null
+++ b/components/bindings/Multimedia_Keys
@@ -0,0 +1,4 @@
+Key XF86AudioRaiseVolume A $[Mod0] Change-Volume-Up
+Key XF86AudioLowerVolume A $[Mod0] Change-Volume-Down
+Key XF86AudioMute A $[Mod0] Mixer-Volume-Toggle
+Key XF86Eject A $[Mod0] Mixer-Show
diff --git a/components/bindings/Multimedia_Keys_Numlock b/components/bindings/Multimedia_Keys_Numlock
new file mode 100644
index 0000000..ea1ed71
--- /dev/null
+++ b/components/bindings/Multimedia_Keys_Numlock
@@ -0,0 +1 @@
+# no special numlock stuff
diff --git a/components/bindings/Music b/components/bindings/Music
deleted file mode 100644
index 02d963d..0000000
--- a/components/bindings/Music
+++ /dev/null
@@ -1,8 +0,0 @@
-Key XF86AudioLowerVolume A $[Mod0] Mixer-Volume-Down 5
-Key XF86AudioRaiseVolume A $[Mod0] Mixer-Volume-Up 5
-Key XF86AudioMute A $[Mod0] Mixer-GUI
-Key XF86Eject A $[Mod0] Music-GUI
-
-Key XF86AudioPlay A $[Mod0] Music-PlayPause
-Key XF86AudioNext A $[Mod] Music-Next
-Key XF86AudioPrev A $[Mod] Music-Prev
diff --git a/components/bindings/Numpad-Control b/components/bindings/Numpad-Control
new file mode 100644
index 0000000..76396b5
--- /dev/null
+++ b/components/bindings/Numpad-Control
@@ -0,0 +1,8 @@
+Key KP_Add      A $[Mod1] Raise
+Key KP_Subtract A $[Mod1] Lower
+Key KP_Multiply A $[Mod1] PlaceAgain
+Key KP_Equal    A $[Mod1] Window-Shade toggle
+
+Key KP_Divide   A $[Mod2] Maximize toggle 0 100
+Key KP_Enter    A $[Mod2] Maximize toggle 100 0
+Key KP_Decimal  A $[Mod2] Maximize toggle 100 100
diff --git a/components/bindings/Numpad-Focus b/components/bindings/Numpad-Focus
index f09ddd9..43a601b 100644
--- a/components/bindings/Numpad-Focus
+++ b/components/bindings/Numpad-Focus
@@ -1,5 +1,3 @@
-# Here are the bindings for focus-switching using the numpad
-# This version only switches the focus
 Key KP_Home             A $[Mod1] Window-FocusInDirection NorthWest
 Key KP_Left             A $[Mod1] Window-FocusInDirection West
 Key KP_End              A $[Mod1] Window-FocusInDirection SouthWest
@@ -9,5 +7,3 @@ Key KP_Page_Up          A $[Mod1] Window-FocusInDirection NorthEast
 Key KP_Page_Down        A $[Mod1] Window-FocusInDirection SouthEast
 Key KP_Right            A $[Mod1] Window-FocusInDirection East
 Key KP_Begin            A $[Mod1] Window-FocusInDirection Center
-
-# vim:ft=fvwm
diff --git a/components/bindings/Numpad-Warp b/components/bindings/Numpad-Warp
new file mode 100644
index 0000000..87ef4e0
--- /dev/null
+++ b/components/bindings/Numpad-Warp
@@ -0,0 +1 @@
+# no warping
diff --git a/components/bindings/Window-Basic b/components/bindings/Window-Basic
index d67845b..8143118 100644
--- a/components/bindings/Window-Basic
+++ b/components/bindings/Window-Basic
@@ -1,10 +1,8 @@
-# Basic window bindings
-
 Mouse 1 T       $[Mod] Window-Raise-RaiseMove
 Mouse 2 T       $[Mod] Window-Shade-Resize
 Mouse 3 T       $[Mod] Window-Lower-Move
 
 Mouse 1 WT      $[Mod1] Window-Raise-RaiseMove
-Mouse 2 WT      $[Mod1] Popup /Window-Menu Mouse -50m +5p
+#Mouse 2 WT      $[Mod1] Popup /Window-Menu Mouse -50m +5p
+Mouse 2 WT	$[Mod1] Window-Resize-Opaque SE
 Mouse 3 WT      $[Mod1] Window-Lower-Move
-
diff --git a/components/bindings/Window-Control b/components/bindings/Window-Control
new file mode 100644
index 0000000..2d3fa67
--- /dev/null
+++ b/components/bindings/Window-Control
@@ -0,0 +1,2 @@
+Key W           A $[Mod1] Close
+Key M           A $[Mod1] Window-Iconify
diff --git a/components/bindings/Window-Control-Dakkar b/components/bindings/Window-Control-Dakkar
deleted file mode 100644
index 3080bfb..0000000
--- a/components/bindings/Window-Control-Dakkar
+++ /dev/null
@@ -1,9 +0,0 @@
-Key W           A $[Mod1] Close
-Key M           A $[Mod1] Window-Iconify
-Key KP_Add      A $[Mod1] Raise
-Key KP_Subtract A $[Mod1] Lower
-Key KP_Multiply A $[Mod1] PlaceAgain
-Key KP_Equal    A $[Mod1] Window-Shade toggle
-Key KP_Up       A $[Mod2] Maximize toggle 0 100
-Key KP_Right    A $[Mod2] Maximize toggle 100 0
-Key KP_Begin    A $[Mod2] Maximize toggle 100 100
diff --git a/components/bindings/Window-List b/components/bindings/Window-List
index 9710532..772bfc1 100644
--- a/components/bindings/Window-List
+++ b/components/bindings/Window-List
@@ -5,7 +5,6 @@
 # Show windows on all pages
 Key Tab A $[Mod1]	Window-List "root c c"
 
-
 # This menu shows iconified windows
 Key Tab A $[Mod2]	Window-List-Icons "root c c"
 
diff --git a/components/bindings/Window-Rearrange b/components/bindings/Window-Rearrange
new file mode 100644
index 0000000..6755e99
--- /dev/null
+++ b/components/bindings/Window-Rearrange
@@ -0,0 +1 @@
+# I don't understand the default code, let's disable it for now
diff --git a/components/bindings/Window-Transparency b/components/bindings/Window-Transparency
new file mode 100644
index 0000000..880e0ee
--- /dev/null
+++ b/components/bindings/Window-Transparency
@@ -0,0 +1 @@
+# no transparency
diff --git a/components/decorations/Buttons-os2-MiniIcon b/components/decorations/Buttons-os2-MiniIcon
index 798fe66..58b3cf5 100644
--- a/components/decorations/Buttons-os2-MiniIcon
+++ b/components/decorations/Buttons-os2-MiniIcon
@@ -1,9 +1,3 @@
-# OS/2 Button Setup
-# Written by Maciej Delmanowski <harnir@post.pl>
-#
-# This is the window titlebar button setup similar to the OS/2
-# buttons on the titlebar
-
 # 1st button - close
 Mouse 1 1 $[Mod]	Window-Button-Function Button1 /Window-Menu Close
 Mouse 2 1 $[Mod]	Window-Button-Function Button1 /Window-Menu Nop
@@ -11,12 +5,12 @@ Mouse 3 1 $[Mod]	Window-Button-Function Button1 /Window-Menu Window-Iconify
 Style * Button 1
 
 # 2nd button - various ways to maximize a window
-Mouse 1 2 $[Mod0]	Window-Button-Function Button2 /Window-Menu-Maximize Maximize 
-Mouse 2 2 $[Mod0]	Window-Button-Function Button2 /Window-Menu-Maximize Maximize 100 0
-Mouse 3 2 $[Mod0]	Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 100
-Mouse 1 2 $[Mod1]	Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow grow
-Mouse 2 2 $[Mod1]	Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow 0
-Mouse 3 2 $[Mod1]	Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 grow
+Mouse 1 2 $[Mod0]	Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 2 $[Mod0]	Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 3 2 $[Mod0]	Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod1]	Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1]	Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
+Mouse 3 2 $[Mod1]	Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
 Style * Button 2
 
 # MiniIcon
@@ -42,4 +36,3 @@ Style * NoButton 8
 Style * NoButton 9
 
 Style * NoButton 0
-
diff --git a/components/desktop/FVWM-Crystal_Preferences b/components/desktop/FVWM-Crystal_Preferences
new file mode 100644
index 0000000..66121aa
--- /dev/null
+++ b/components/desktop/FVWM-Crystal_Preferences
@@ -0,0 +1,3 @@
+LoadPreferences NotificationAreaManager
+LoadPreferences DeskPageXY
+DesktopSize $[infostore.Desk_Pages_X]x$[infostore.Desk_Pages_Y]
diff --git a/components/desktop/Keyboard b/components/desktop/Keyboard
index 84bd7d9..2a2fcc2 100644
--- a/components/desktop/Keyboard
+++ b/components/desktop/Keyboard
@@ -1,17 +1,7 @@
-# Standard keyboard layout
-# You need several functions to use all of the keybindings
-
-Include components/bindings/Music
 Include components/bindings/Pager-Square
 Include components/bindings/PageSwitch-Square
-#Include components/bindings/Window-Control
+Include components/bindings/Window-Control
 Include components/bindings/Window-List
-#Include components/bindings/Window-Rearrange
+Include components/bindings/Window-Rearrange
 Include components/bindings/Misc-Keybindings
-Include components/bindings/Window-Control-Dakkar
-Include components/bindings/Numpad-Focus
-Include components/bindings/TheLauncher
-
-Key apostrophe A $[Mod1] Menu /Applications root c c
-Key quotedbl A $[Mod1] Menu /FVWM-Crystal root c c
-
+Include components/bindings/Extra-Keybindings
diff --git a/components/desktop/Keyboard_NumLock b/components/desktop/Keyboard_NumLock
new file mode 100644
index 0000000..7b4fde6
--- /dev/null
+++ b/components/desktop/Keyboard_NumLock
@@ -0,0 +1 @@
+# numlock disables everything! we want this.
diff --git a/components/desktop/dakkar_Preferences b/components/desktop/dakkar_Preferences
deleted file mode 100644
index b2d6254..0000000
--- a/components/desktop/dakkar_Preferences
+++ /dev/null
@@ -1,6 +0,0 @@
-AddToMenu /Preferences/Mixer
-Test (x amixer)         + '%22x22/apps/alsamixer.png%ALSA' SelectMixer amixer
-
-AddToMenu /Preferences/MusicPlayer
-Test (x amarok)         + '%22x22/apps/amarok.png%AmaroK' SelectMusicPlayer amarok
-
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/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/Notify b/components/functions/Urgency-Hint
index f0c2a55..af35efe 100644
--- a/components/functions/Notify
+++ b/components/functions/Urgency-Hint
@@ -10,3 +10,4 @@ DestroyFunc UrgencyFunc
 AddtoFunc UrgencyFunc
 + I BubbleNotify $[w.name] $[w.name] 'beep!' 2000 $[w.iconfile]
 
+DestroyFunc UrgencyDoneFunc
diff --git a/components/scripts/FvwmScript-Clock-dakkar b/components/scripts/FvwmScript-Clock
index a298848..a298848 100755
--- a/components/scripts/FvwmScript-Clock-dakkar
+++ b/components/scripts/FvwmScript-Clock