From 713ed2460a75f6316d0227662b9b7135d5413bdb Mon Sep 17 00:00:00 2001
From: thomasadam <thomasadam>
Date: Tue, 25 Mar 2008 01:00:31 +0000
Subject: [PATCH] Update afterstep theme to use features in FVWM 2.5.25+

Some of the style options were a little out of date.  This also removes some
deprecation warnings from old style changing since the theme was written.
---
 themes/afterstep/background              | 2 +-
 themes/afterstep/buttons                 | 6 ++++--
 themes/afterstep/globalfeel              | 9 ++++++---
 themes/afterstep/modules/main            | 4 ++--
 themes/afterstep/modules/normal-icons/no | 2 +-
 themes/afterstep/modules/styles          | 2 +-
 themes/afterstep/windowlook              | 4 ++--
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/themes/afterstep/background b/themes/afterstep/background
index 6ab3455..625e399 100644
--- a/themes/afterstep/background
+++ b/themes/afterstep/background
@@ -1,6 +1,6 @@
 DestroyFunc FuncFvwmStartThemeBackground
 AddToFunc   FuncFvwmStartThemeBackground
-+ I Exec xpmroot $FT_DATADIR/images/background/as-back.xpm
++ I Exec exec xpmroot $FT_DATADIR/images/background/as-back.xpm
 
 DestroyFunc FuncFvwmStopThemeBackground
 AddToFunc   FuncFvwmStopThemeBackground
diff --git a/themes/afterstep/buttons b/themes/afterstep/buttons
index 6f9fd84..30dad31 100644
--- a/themes/afterstep/buttons
+++ b/themes/afterstep/buttons
@@ -1,7 +1,9 @@
 FuncFvwmDecorBackground
 
-Style "*" Button 1, Button 2, Button 3, Button 4
-Style "*" FvwmButtons  # button relief does not follow the state
+Style * Button 1, Button 2, Button 3, Button 4
+
+# button relief does not follow the state
+Style * FvwmButtons  
 
 AddButtonStyle 1 Pixmap button/as-window-switch.xpm
 AddButtonStyle 2 Pixmap button/as-window-close.xpm
diff --git a/themes/afterstep/globalfeel b/themes/afterstep/globalfeel
index 3852f9a..c7195a4 100644
--- a/themes/afterstep/globalfeel
+++ b/themes/afterstep/globalfeel
@@ -14,14 +14,17 @@ OpaqueMoveSize 100
 Emulate MWM
 HideGeometryWindow Never
 BugOpts FlickeringMoveWorkaround Off
-SnapAttraction 10 SameType Screen
-SnapGrid 5 5
+Style * SnapAttraction 10 SameType Screen
+Style * SnapGrid 5 5
 XorValue 55555
 
 # ---------------------- Paging and Mouse Parameters ----------------------
 
 EdgeScroll 100 100
-EdgeResistance 100  100 
+#EdgeResistance 100  100 
+Style * EdgeMoveDelay 10
+Style * EdgeMoveResistance 10
+
 EdgeThickness 1
 ClickTime 150
 MoveThreshold 3
diff --git a/themes/afterstep/modules/main b/themes/afterstep/modules/main
index 162b775..4409510 100644
--- a/themes/afterstep/modules/main
+++ b/themes/afterstep/modules/main
@@ -6,8 +6,8 @@
 # ----------------------------------------------------------------------------
 # Icon related configuration
 
-Style "*" IconBox screen w 10 100 -350 -10, IconGrid 64 10, IconFill left bottom
-Style "*" SlipperyIcon, IconTitle
+Style * IconBox screen w 10 100 -350 -10, IconGrid 64 10, IconFill left bottom
+Style * SlipperyIcon, IconTitle
 
 # ----------------------------------------------------------------------------
 # Switch functions
diff --git a/themes/afterstep/modules/normal-icons/no b/themes/afterstep/modules/normal-icons/no
index b7e4423..8fc1e29 100644
--- a/themes/afterstep/modules/normal-icons/no
+++ b/themes/afterstep/modules/normal-icons/no
@@ -1,3 +1,3 @@
 DestroyFunc FuncFvwmStartNormalIcons
 AddToFunc   FuncFvwmStartNormalIcons
-+ I Style * NoIcon
++ I Style * !Icon
diff --git a/themes/afterstep/modules/styles b/themes/afterstep/modules/styles
index be03e33..92e7143 100644
--- a/themes/afterstep/modules/styles
+++ b/themes/afterstep/modules/styles
@@ -8,7 +8,7 @@ Style FvwmPager-Desker !Title, Sticky, WindowListSkip, CirculateSkip, \
 	!Handles, !Lenience, StaysPut, TitleAtTop
 Style FvwmPager-Single !Title, Sticky, WindowListSkip, CirculateSkip, \
 	!Handles, !Lenience, StaysPut, TitleAtTop
-Style FvwmIconMan !Title, !Handles, Sticky, WindowListSkip, \
+Style FvwmIconMan !Title, !Handles, !Borders, Sticky, WindowListSkip, \
 	CirculateSkip, BorderWidth 0, StaysPut, TitleAtTop 
 
 DestroyFunc FuncFvwmModulesDestroyStyle
diff --git a/themes/afterstep/windowlook b/themes/afterstep/windowlook
index 704eac7..ccf8d45 100644
--- a/themes/afterstep/windowlook
+++ b/themes/afterstep/windowlook
@@ -1,8 +1,8 @@
 FuncFvwmSetFont-WindowTitle * -*-lucida-bold-r-*-*-12-*
 FuncFvwmSetFont-IconTitle   * -*-fixed-medium-r-semicondensed-*-13-*
 
-Style "*"	BorderWidth 1, HandleWidth 1
-Style "*"	FvwmBorder, FirmBorder
+Style *	BorderWidth 1, HandleWidth 1
+Style *	FvwmBorder, FirmBorder
 
 BorderStyle	Simple -- HiddenHandles NoInset
 
-- 
2.11.4.GIT