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.

31 files changed, 68 insertions, 86 deletions

diff --git a/decorations/Dakkar/Colorsets b/decorations/Dakkar/Colorsets
deleted file mode 100644
index 549aaa4..0000000
--- a/decorations/Dakkar/Colorsets
+++ /dev/null
@@ -1,24 +0,0 @@
-# Colorset setup
-
-# What colorset numbers do we use?
-SetEnv cs_window_inactive "9"
-SetEnv cs_window_active "10"
-SetEnv cs_window_inactiveborder "11"
-SetEnv cs_window_activeborder "12"
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Colorsets
-
-Colorset $[cs_window_inactive] \
-Foreground "black", Background "black", \
-Hilight "white", Shadow "#e0d9d2", \
-Fgsh "#e0d9d2"
-
-Colorset $[cs_window_active] \
-Foreground "white", Background "black", \
-Hilight "white", Shadow "gray", \
-fgsh "black"
-
-Colorset $[cs_window_inactiveborder] Background "#3e3c39"
-Colorset $[cs_window_activeborder] Background "#1f252b"
-
diff --git a/decorations/Dakkar/Default/Colorsets b/decorations/Dakkar/Default/Colorsets
new file mode 100644
index 0000000..2b75860
--- /dev/null
+++ b/decorations/Dakkar/Default/Colorsets
@@ -0,0 +1,19 @@
+# Colorset setup
+
+# What colorset numbers do we use?
+InfoStoreAdd cs_window_inactive "9"
+InfoStoreAdd cs_window_active "10"
+
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Colorsets
+
+Colorset $[infostore.cs_window_inactive] \
+Foreground "#7f7d7b", Background "#bfbcb9", \
+Hilight "#666666", Shadow "#666666", \
+VGradient 100 3 "#f2eeeb" 40 "#f1edea" 10 "#bfbcb9" 50 "#d4d1cd", Tint
+
+Colorset $[infostore.cs_window_active] \
+Foreground "white", Background "#637a8a", \
+Hilight "gray", Shadow "gray", \
+VGradient 100 3 "#90a8b9" 40 "#8ba4b6" 10 "#576b79" 50 "#6d8798", Tint
+
diff --git a/decorations/Dakkar/Default/Theme.os2 b/decorations/Dakkar/Default/Theme.os2
new file mode 100644
index 0000000..928f31b
--- /dev/null
+++ b/decorations/Dakkar/Default/Theme.os2
@@ -0,0 +1,49 @@
+# OS/2 version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 17 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+                        70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+                        48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+                        23x28@1 23x23@1
+
+# Maximize
++ ButtonStyle 2 Vector 13 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+                        50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+                        23x43@1 43x43@1 43x23@1
+
++ ButtonStyle 3 MiniIcon
+
+# Iconify
++ ButtonStyle 4 Vector 5 23x63@4 74x63@1 74x72@1 23x72@1 23x63@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset                $[infostore.cs_window_inactive], \
+        BorderColorset          $[infostore.cs_window_inactive], \
+        HilightColorset         $[infostore.cs_window_active], \
+        HilightBorderColorset   $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-os2-MiniIcon
+
diff --git a/decorations/Dakkar/README b/decorations/Dakkar/README
deleted file mode 100644
index 780d5d3..0000000
--- a/decorations/Dakkar/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Clearlooks DeepSky window decoration for FVWM & FVWM-Crystal
------------------------------------------------------
-
-Ported by: Maciej Delmanowski <harnir@post.pl>
-Homepage: http://fvwm-crystal.berlios.de/
-License: GPL
-
-Based on Clearlooks GTK2 engine
-Original authors: Richard Stellingwerff, Daniel Borgmann
-Original homepage: http://clearlooks.sourceforge.net/
-
diff --git a/decorations/Dakkar/Theme.os2 b/decorations/Dakkar/Theme.os2
deleted file mode 100644
index 3a0d7dd..0000000
--- a/decorations/Dakkar/Theme.os2
+++ /dev/null
@@ -1,51 +0,0 @@
-# OS/2 version
-
-# Setup colorsets
-Read $./Colorsets
-
-DestroyDecor recreate WindowDecoration
-AddToDecor WindowDecoration
-
-+ TitleStyle Active TiledPixmap $./window-active-title.png
-+ TitleStyle InActive TiledPixmap $./window-inactive-title.png
-+ TitleStyle Centered Height 24 -- flat
-
-+ BorderStyle -- HiddenHandles
-+ BorderStyle -- Flat
-
-+ ButtonStyle 1 \
-	ActiveUp (Pixmap $./window-active-close.png) \
-	ActiveDown (Pixmap $./window-active-close-down.png) \
-	InactiveUp (Pixmap $./window-inactive-close.png) \
-	InactiveDown (Pixmap $./window-inactive-close-down.png)
-
-+ ButtonStyle 2 \
-	ActiveUp (Pixmap $./window-active-maximize.png) \
-	ActiveDown (Pixmap $./window-active-maximize-down.png) \
-	InactiveUp (Pixmap $./window-inactive-maximize.png) \
-	InactiveDown (Pixmap $./window-inactive-maximize-down.png)
-
-+ ButtonStyle 3 MiniIcon
-
-+ ButtonStyle 4 \
-	ActiveUp (Pixmap $./window-active-iconify.png) \
-	ActiveDown (Pixmap $./window-active-iconify-down.png) \
-	InactiveUp (Pixmap $./window-inactive-iconify.png) \
-	InactiveDown (Pixmap $./window-inactive-iconify-down.png)
-
-+ ButtonStyle All -- UseTitleStyle
-+ ButtonStyle All -- flat
-
-Style * HandleWidth 1, BorderWidth 1
-Style * Colorset                $[cs_window_inactive], \
-        BorderColorset          $[cs_window_inactiveborder], \
-        HilightColorset         $[cs_window_active], \
-        HilightBorderColorset   $[cs_window_activeborder]
-
-Style * Font shadow="1 1":"xft:Verdana:pixelsize=12:Bold:encoding=iso10646-1"
-
-Style * UseDecor WindowDecoration
-
-# Setup button functions
-Include components/decorations/Buttons-os2-MiniIcon
-
diff --git a/decorations/Dakkar/window-active-arrows-down.png b/decorations/Dakkar/window-active-arrows-down.png
deleted file mode 100644
index 439b303..0000000
--- a/decorations/Dakkar/window-active-arrows-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-arrows.png b/decorations/Dakkar/window-active-arrows.png
deleted file mode 100644
index 7ae7c04..0000000
--- a/decorations/Dakkar/window-active-arrows.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-close-down.png b/decorations/Dakkar/window-active-close-down.png
deleted file mode 100644
index e0bdf5a..0000000
--- a/decorations/Dakkar/window-active-close-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-close.png b/decorations/Dakkar/window-active-close.png
deleted file mode 100644
index cb32d9b..0000000
--- a/decorations/Dakkar/window-active-close.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-empty-down.png b/decorations/Dakkar/window-active-empty-down.png
deleted file mode 100644
index 5464cdd..0000000
--- a/decorations/Dakkar/window-active-empty-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-empty.png b/decorations/Dakkar/window-active-empty.png
deleted file mode 100644
index 3d00ffb..0000000
--- a/decorations/Dakkar/window-active-empty.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-iconify-down.png b/decorations/Dakkar/window-active-iconify-down.png
deleted file mode 100644
index 08fb621..0000000
--- a/decorations/Dakkar/window-active-iconify-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-iconify.png b/decorations/Dakkar/window-active-iconify.png
deleted file mode 100644
index a075000..0000000
--- a/decorations/Dakkar/window-active-iconify.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-maximize-down.png b/decorations/Dakkar/window-active-maximize-down.png
deleted file mode 100644
index 69b47e2..0000000
--- a/decorations/Dakkar/window-active-maximize-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-maximize.png b/decorations/Dakkar/window-active-maximize.png
deleted file mode 100644
index 2d0ce4d..0000000
--- a/decorations/Dakkar/window-active-maximize.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-options-down.png b/decorations/Dakkar/window-active-options-down.png
deleted file mode 100644
index e67784b..0000000
--- a/decorations/Dakkar/window-active-options-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-options.png b/decorations/Dakkar/window-active-options.png
deleted file mode 100644
index 7eaf4f4..0000000
--- a/decorations/Dakkar/window-active-options.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-active-title.png b/decorations/Dakkar/window-active-title.png
deleted file mode 100644
index d6df41b..0000000
--- a/decorations/Dakkar/window-active-title.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-arrows-down.png b/decorations/Dakkar/window-inactive-arrows-down.png
deleted file mode 100644
index d26ba21..0000000
--- a/decorations/Dakkar/window-inactive-arrows-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-arrows.png b/decorations/Dakkar/window-inactive-arrows.png
deleted file mode 100644
index a4191df..0000000
--- a/decorations/Dakkar/window-inactive-arrows.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-close-down.png b/decorations/Dakkar/window-inactive-close-down.png
deleted file mode 100644
index 646dfc3..0000000
--- a/decorations/Dakkar/window-inactive-close-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-close.png b/decorations/Dakkar/window-inactive-close.png
deleted file mode 100644
index b837725..0000000
--- a/decorations/Dakkar/window-inactive-close.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-empty-down.png b/decorations/Dakkar/window-inactive-empty-down.png
deleted file mode 100644
index 8f3d319..0000000
--- a/decorations/Dakkar/window-inactive-empty-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-empty.png b/decorations/Dakkar/window-inactive-empty.png
deleted file mode 100644
index 0a3a3c6..0000000
--- a/decorations/Dakkar/window-inactive-empty.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-iconify-down.png b/decorations/Dakkar/window-inactive-iconify-down.png
deleted file mode 100644
index 51e6df0..0000000
--- a/decorations/Dakkar/window-inactive-iconify-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-iconify.png b/decorations/Dakkar/window-inactive-iconify.png
deleted file mode 100644
index f3d6976..0000000
--- a/decorations/Dakkar/window-inactive-iconify.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-maximize-down.png b/decorations/Dakkar/window-inactive-maximize-down.png
deleted file mode 100644
index daaaf8e..0000000
--- a/decorations/Dakkar/window-inactive-maximize-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-maximize.png b/decorations/Dakkar/window-inactive-maximize.png
deleted file mode 100644
index 9147053..0000000
--- a/decorations/Dakkar/window-inactive-maximize.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-options-down.png b/decorations/Dakkar/window-inactive-options-down.png
deleted file mode 100644
index 3664e8d..0000000
--- a/decorations/Dakkar/window-inactive-options-down.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-options.png b/decorations/Dakkar/window-inactive-options.png
deleted file mode 100644
index 371b8a9..0000000
--- a/decorations/Dakkar/window-inactive-options.png
+++ /dev/null
diff --git a/decorations/Dakkar/window-inactive-title.png b/decorations/Dakkar/window-inactive-title.png
deleted file mode 100644
index 3266749..0000000
--- a/decorations/Dakkar/window-inactive-title.png
+++ /dev/null