desktop/fvwm95: Updated for version 2.0.43f.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 982 insertions, 13 deletions

diff --git a/desktop/fvwm95/fvwm95-menu.xpm b/desktop/fvwm95/fvwm95-menu.xpm
new file mode 100644
index 000000000000..c55ca5406613
--- /dev/null
+++ b/desktop/fvwm95/fvwm95-menu.xpm
@@ -0,0 +1,125 @@
+/* XPM */
+static char * fvwm-menu_xpm[] = {
+"25 118 4 1",
+" 	c None s None",
+".	c white",
+"X	c #c0c0c0",
+"o	c black",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"    ...       ....       ",
+"    .XXX    ...XXXX      ",
+"    .XXXo  ..XXXXXXX     ",
+"    .XXXo  .XXXXXXXXX    ",
+"    .XXXo  .XXXXXXXXXo   ",
+"    .XXXo ..XXXXXXXXXX   ",
+"    .XXXo .XXXXoooXXXXo  ",
+"    .XXXo .XXXXo  .XXXo  ",
+"    .XXXo .XXXoo  .XXXo  ",
+"    .XXXo..XXXo   .XXXo  ",
+"    .XXXXXXXXXo   .XXXo  ",
+"    .XXXXXXXXXo  ..XXXo  ",
+"     XXXXXXXXXo   XXXoo  ",
+"      ooooooooo    ooo   ",
+"                         ",
+"                         ",
+"         .......         ",
+"       ...XXXXXXX.       ",
+"      ..XXXXXXXXXXX      ",
+"     ..XXXXXXXXXXXXX     ",
+"    ..XXXXXXXXXXXXXXX    ",
+"    .XXXXXXXXXXXXXXXXo   ",
+"    .XXXXoooXXXooXXXXXo  ",
+"    .XXXoo  .XXo  XXXXo  ",
+"    .XXXo  ..XXX  .XXXo  ",
+"    .XXXX...XXXXo .XXXo  ",
+"     XXXXXXXXXXXo .XXXo  ",
+"     .XXXXXXXXXXXo.XXXo  ",
+"      XXXXXXXXXXoo XXoo  ",
+"       XXXXXXXXXo   oo   ",
+"        XXXXXXooo        ",
+"         oooooo          ",
+"                         ",
+"                         ",
+"         ............    ",
+"        ..XXXXXXXXXXXX   ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"         XXXXoooooooooo  ",
+"          XXXo           ",
+"          .XXX.......    ",
+"         ..XXXXXXXXXXX   ",
+"        ..XXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXoooooooooo  ",
+"         XXXXo           ",
+"        ..XXXX.......    ",
+"        .XXXXXXXXXXXXX   ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"         XXXXXXXXXXXXXo  ",
+"          ooooooooooooo  ",
+"        ..               ",
+"        .XX..            ",
+"        .XXXXX...        ",
+"         XXXXXXXXX...    ",
+"          oXXXXXXXXXXX   ",
+"            ooXXXXXXXXo  ",
+"            ...ooXXXXXo  ",
+"        .....XXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXooo  ",
+"        .XXXXXXXooooo    ",
+"        .XXXXXXXo.       ",
+"         XXXXXXXXXX..    ",
+"          ooXXXXXXXXXX   ",
+"             oooXXXXXXo  ",
+"         .....XXXXXXXXo  ",
+"        ..XXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXoooo  ",
+"        .XXXXXXooooo     ",
+"         XXooooo         ",
+"          oo             ",
+"        ..               ",
+"        .X..             ",
+"        .XXXX..          ",
+"         XXXXXXX.        ",
+"          XXXXXXXX..     ",
+"           oXXXXXXXXX    ",
+"             ooXXXXXXX   ",
+"              ..oXXXXXo  ",
+"           ....XXXXXXXo  ",
+"         ...XXXXXXXXXXo  ",
+"        ..XXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXoo  ",
+"        .XXXXXXXXXoooo   ",
+"        .XXXXXXXooo      ",
+"        .XXXXoooo        ",
+"   ...   XXooo           ",
+"   .XXX ..oo             ",
+"   .XXXo.XXX             ",
+"   .XXXo.XXXo            ",
+"   .XXXo.XXXo........    ",
+"   .XXXXXXXXXXXXXXXXXX   ",
+"   .XXXXXXXXXXXXXXXXXXo  ",
+"    XXXXXXXXXXXXXXXXXXo  ",
+"     XXXXXXXXXXXXXXXXXo  ",
+"      XXXXXXXXXXXXXXXXo  ",
+"       ooXXXooooooooooo  ",
+"         XXXo            ",
+"          ooo            ",
+"                         ",
+"                         ",
+"                         ",
+"                         "};
diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild
index 682021a8322b..cf80d297d3a7 100644
--- a/desktop/fvwm95/fvwm95.SlackBuild
+++ b/desktop/fvwm95/fvwm95.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for fvwm95
 
 # Copyright 2014 Tomasz Konojacki <me@xenu.tk>
+# Copyright 2020 Logan Rathbone <poprocks@gmail.com>
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +26,12 @@
 
 PRGNAM=fvwm95
 VERSION=${VERSION:-2.0.43f}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -109,6 +111,14 @@ cp -a Changelog README GPL INSTALL README.rouat fvwm-StackingOrder.html \
   FvwmTaskBar-plugins.patch.README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# plop the old Slackware <= 10.0 default config into /usr/doc as a little Easter Egg
+cat $CWD/fvwm95rc-slack10_0.in | sed -e "s,@libdir@,/usr/lib${LIBDIRSUFFIX},g" \
+	> $PKG/usr/doc/$PRGNAM-$VERSION/fvwm95rc-slack10_0
+
+# ... this also needs to be there for the Start button to work:
+install -m 644 $CWD/fvwm95-menu.xpm \
+	$PKG/usr/lib${LIBDIRSUFFIX}/X11/pixmaps/fvwm95-menu.xpm
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/desktop/fvwm95/fvwm95.info b/desktop/fvwm95/fvwm95.info
index b2e1f1933aee..6864bbe3e8e1 100644
--- a/desktop/fvwm95/fvwm95.info
+++ b/desktop/fvwm95/fvwm95.info
@@ -6,5 +6,5 @@ MD5SUM="b6d10d18b957f0abfdc46a7f4f040d64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Tomasz Konojacki"
-EMAIL="me@xenu.tk"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/desktop/fvwm95/fvwm95rc-slack10_0.in b/desktop/fvwm95/fvwm95rc-slack10_0.in
new file mode 100644
index 000000000000..01f59a4af943
--- /dev/null
+++ b/desktop/fvwm95/fvwm95rc-slack10_0.in
@@ -0,0 +1,825 @@
+#
+# Default system.fvwm95rc for Slackware Linux
+#
+# ...you have found the SBo fvwm95 Easter Egg! This fvwm95rc is slightly
+# modified from the version included with the Slackware 10.0 source tree (the
+# final Slackware release to include fvwm95) in 2020 by Logan Rathbone
+# <poprocks@gmail.com> while hopefully retaining the spirit of the original.
+#
+# If you would like to use this configuration, copy this file to ~/.fvwm95rc
+
+#========================================================================#
+
+#
+# Fonts - one for window titles, another for icons, and another for the menus
+#
+WindowFont	-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
+IconFont	fixed
+MenuFont   	-adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
+
+#
+# Set the default window colors. The syntax is:
+#  DefaultColors winforecolor winbackcolor titleforecolor titlebackcolor
+# where:
+#  winbackcolor    is the background (border) color of all windows,
+#                  including the menu windows 
+#  winforecolor    is used for the menu text
+#  titlebackcolor  is the background color used for title bars of 
+#                  non selected windows
+#  titleforecolor  is the color of the title text of non selected windows
+#
+DefaultColors   Black #c3c3c3 #c3c3c3 grey51
+
+#
+# Text and background color for the title bar of the active (selected) window
+#
+HilightColors   White #000080
+
+#
+# Text and background color for the title bar of sticky windows
+#
+StickyColors    grey51 #60c080
+
+# You can also use the Style command to set the colors of individual
+# title bars of some non-selected windows
+
+#Style "*" ForeColor #c3c3c3
+#Style "*" BackColor grey51
+
+#========================================================================#
+
+#
+# Set up the major operating modes
+#
+
+Style "*" ClickToFocus
+# If we use the FvwmTaskBar we don't need the icons :-)
+# Style "..." Icon is also commented below.
+Style "*" NoIcon
+Style "*" MWMFunctions
+Style "*" HintOverride
+Style "*" MWMDecor
+
+OpaqueMoveSize 100
+EdgeScroll 100 100
+EdgeResistance 10000 0
+
+#
+# RandomPlacement prevents user interaction while placing windows:
+#
+Style "*" RandomPlacement
+
+#
+# NoPPosition instructs fvwm to ignore the PPosition field in window 
+# geometry hints. Emacs annoyingly sets PPosition to (0,0)!
+#
+Style "*" NoPPosition
+
+#========================================================================#
+
+#
+# Set the desk top size in units of physical screen size
+#
+DeskTopSize 3x2
+
+#========================================================================#
+
+#
+# Module path and paths to the icons
+# ModulePath is a colon-separated list, just like regular unix PATH
+#
+ModulePath @libdir@/X11/fvwm95/
+PixmapPath @libdir@/X11/pixmaps/
+IconPath   @libdir@/X11/mini-icons/
+
+#========================================================================#
+
+# Set the decoration styles and window options
+# Order is important!!!!
+# If compatible styles are set for a single window in multiple Style
+# commands, then the styles are ORed together. If conflicting styles
+# are set, the last one specified is used.
+
+# These commands should command before any menus or functions are defined,
+# and before the internal pager is started.
+
+#
+# Default border and handle widths
+#
+Style "*" BorderWidth 5, HandleWidth 5
+
+Style "Fvwm*"        NoTitle, Sticky, WindowListSkip
+Style "Fvwm Pager"   StaysOnTop, NoHandles
+Style "FvwmBanner"   StaysOnTop
+Style "FvwmButtons"  NoTitle, NoHandles, Sticky, WindowListSkip,BorderWidth 5
+Style "*lock"        NoTitle, NoHandles, Sticky, WindowListSkip
+Style "xbiff"        NoTitle,            Sticky, WindowListSkip
+
+#
+# Some mini-icons for the title bar
+#
+Style "*"         TitleIcon mini-x2.xpm
+Style "*xterm*"   TitleIcon mini-term.xpm
+Style "rxvt"      TitleIcon mini-term.xpm
+Style "xcalc"     TitleIcon mini-calc.xpm
+Style "xsession"  TitleIcon mini-bx2.xpm
+Style "xv"        TitleIcon mini-xv.xpm
+Style "Netscape"  TitleIcon mini-nscape.xpm
+Style "xmag"      TitleIcon mini-zoom.xpm
+Style "textedit"  TitleIcon mini-edit.xpm
+Style "tkps"      TitleIcon mini-run.xpm
+Style "Ghostview" TitleIcon mini-gv.xpm
+Style "Xcolorsel" TitleIcon mini-colors.xpm
+Style "IDL*"      TitleIcon mini-zoom.xpm
+Style "xeyes"     TitleIcon mini-eyes.xpm
+Style "*fm*"      TitleIcon mini-filemgr.xpm
+# xman resource names
+Style "topBox"    TitleIcon mini-book1.xpm
+Style "help"      TitleIcon mini-book2.xpm
+Style "manualBrowser" TitleIcon mini-book2.xpm
+# xpaint resource names
+Style "xpaint"    TitleIcon mini-paint.xpm
+Style "Canvas"    TitleIcon mini-paint.xpm
+Style "fatbits"   TitleIcon mini-paint.xpm
+Style "filebrowser" TitleIcon mini-paint.xpm
+
+#Style "rxvt"       Icon  term.xpm
+#Style "xterm"      Icon xterm.xpm
+#Style "Appointment" Icon datebook.xpm
+#Style "xcalc"      Icon rcalc.xpm
+#Style "xbiff"      Icon mail1.xpm
+#Style "xmh"        Icon mail1.xpm, StartsOnDesk 2
+#Style "xman"	   Icon xman.xpm
+#Style "xvgr"	   Icon graphs.xpm
+#Style "matlab"	   Icon math4.xpm
+#Style "xmag"	   Icon mag_glass.xpm
+#Style "xgraph"	   Icon graphs.xpm
+#Style "xv"         Icon xview.xpm
+#Style "FvwmButtons"  Icon toolbox.xpm
+#Style "xconsole"   Icon koala.xpm
+#Style "xsession"   Icon koala.xpm
+#Style "textedit"   Icon textedit.xpm
+#Style "gv"  Icon gv.xpm
+
+#========================================================================#
+
+#
+# Stuff to do at start-up
+#
+
+AddToFunc "InitFunction"    "I" Exec xsetroot -solid cyan4 &
+#+                          "I" Module FvwmBanner
++                           "I" Module FvwmButtons
++                           "I" Module FvwmTaskBar
+#+                          "I" Module FvwmPager 0 3
+
+AddToFunc "RestartFunction" "I" Module FvwmButtons
++                           "I" Module FvwmTaskBar
+#+                          "I" Module FvwmPager 0 3
+
+
+#========================================================================#
+
+# Now define some handy complex functions
+
+#
+# This one moves and then raises the window if you drag the mouse,
+# only raises the window if you click, or does a full maximize if 
+# you double click
+#
+AddToFunc "Move-or-Raise" "M" Move
++                         "M" Raise
++                         "C" Raise
++                         "D" Maximize 100 100
+
+#
+# This one moves and then lowers the window if you drag the mouse,
+# only lowers the window if you click, or does a RaiseLower if you double 
+# click
+#
+AddToFunc "Move-or-Lower" "M" Move
++                         "M" Lower
++                         "C" Lower
++                         "D" RaiseLower
+
+#
+# This one moves or (de)iconifies:
+#
+AddToFunc "Move-or-Iconify" "M" Move
++                           "D" Iconify
+
+#
+# This one resizes and then raises the window if you drag the mouse,
+# only raises the window if you click,  or does a RaiseLower if you double 
+# click
+#
+AddToFunc "Resize-or-Raise" "M" Resize
++                           "M" Raise
++                           "C" Raise
++                           "D" RaiseLower
+
+
+#========================================================================#
+
+#
+# Now define the menus - defer bindings until later
+#
+
+# This is for the Start menu of the FvwmTaskBar
+
+DestroyMenu "StartMenu"
+AddToMenu "StartMenu@fvwm95-menu.xpm@^#808080^"
++ "Manual Pages     %mini-book1.xpm%"       Exec    xman &
++ "Magnifying Glass %mini-zoom.xpm%" 	    Exec    xmag &
++ ""                                        Nop 
++ "Accessories%mini-hammer.xpm%"            Popup   Accessories
++ "Applications     %mini-x2.xpm%"          Popup   Applications
++ "File Managers    %mini-filemgr.xpm%"     Popup   Filemanagers
++ "Games            %mini-happy.xpm%"       Popup   Games
++ "Shells           %mini-term.xpm"         Popup   Shells
++ ""                                        Nop 
++ "Lock Screen      %mini-lock.xpm%"        Popup   Screenlock
++ "Screensaver      %mini-display.xpm%"     Popup   Screensaver
++ ""                                        Nop
++ "Refresh Screen   %mini-ray.xpm%"         Refresh
++ ""                                        Nop
++ "Exit Fvwm95      %mini-stop.xpm%"        Popup   Quit-Verify
+
+DestroyMenu "Shells"
+AddToMenu "Shells"
++ "Xterm	(7x14 font)%mini-term.xpm%" 		Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold -title "Color xterm" &
++ "Large Xterm	(10x20 font)%mini-term.xpm%" 	Exec xterm -sb -sl 500 -j -ls -fn 10x20 &
++ ""					    	Nop
++ "Rxvt	(7x14 font)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
++ "Large Rxvt	(10x20 font)%mini-term.xpm%" 	Exec rxvt -font 10x20 -ls &
+
+DestroyMenu "Screensaver"
+AddToMenu "Screensaver"
++ "Blank%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode blank &
++ "Random%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode random &
++ ""				Nop
++ "Ant%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode ant &
++ "Ball%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode ball &
++ "Bat%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode bat &
++ "Blot%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode blot &
++ "Bomb%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode bomb &
++ "Bouboule%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode bouboule &
++ "Bob%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
++ "Bounce%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode bounce &
++ "Braid%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode braid &
++ "Bug%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode bug &
++ "Bubble%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode bubble &
++ "Clock%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode clock &
++ "Coral%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode coral &
++ "Crystal%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode crystal &
++ "Daisy%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode daisy &
++ "Dclock%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode dclock &
++ "Deco%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode deco &
++ "Demon%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode demon &
++ "Dilemma%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode dilemma &
++ "Drift%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode drift &
++ "More"                        PopUp ScreenSaver2
+
+DestroyMenu "Screensaver2"
+AddToMenu "Screensaver2"
++ "Eyes%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode eyes &
++ "Fadeplot%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode fadeplot &
++ "Flag%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode flag &
++ "Flame%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode flame &
++ "Forest%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode forest &
++ "Galaxy%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode galaxy &
++ "Geometry%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode geometry &
++ "Grav%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode grav &
++ "Helix%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode helix &
++ "Hop%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode hop   &
++ "Hyper%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode hyper &
++ "Ico%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode ico &
++ "Ifs%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode ifs &
++ "Julia%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode julia &
++ "Kaleid%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode kaleid &
++ "Laser%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode laser &
++ "Life%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode life   &
++ "Life1d%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode life1d &
++ "Life3d%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode life3d &
++ "Lightning%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode lightning &
++ "Lisa%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode lisa &
++ "Lissie%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode lissie &
++ "Loop%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode loop &
++ "More"                        PopUp ScreenSaver3
+
+DestroyMenu "Screensaver3"
+AddToMenu "Screensaver3"
++ "Mandelbrot%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode mandelbrot &
++ "Marquee%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode marquee &
++ "Maze%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode maze &
++ "Mountain%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode mountain &
++ "Munch%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode munch &
++ "Nose%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode nose &
++ "Pacman%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode pacman &
++ "Penguin%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-linux.xbm -batchcount 7 &
++ "Penrose%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode penrose &
++ "Petal%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode petal &
++ "Puzzle%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode puzzle &
++ "Pyro%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode pyro &
++ "Qix%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode qix &
++ "Roll%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode roll &
++ "Rotor%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode rotor &
++ "Shape%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode shape &
++ "Sierpinski%mini-bball.xpm%"  Exec xlock -nolock -nice 0 -mode sierpinski &
++ "Slip%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode slip &
++ "Sphere%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode sphere &
++ "Spiral%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode spiral &
++ "Spline%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode spline &
++ "Star%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode star &
++ "Strange%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode strange &
++ "More"                        PopUp ScreenSaver4
+
+DestroyMenu "Screensaver4"
+AddToMenu "Screensaver4"
++ "Swarm%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode swarm &
++ "Swirl%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode swirl &
++ "Triangle%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode triangle &
++ "Tube%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode tube &
++ "Turtle%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode turtle &
++ "Vines%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode vines &
++ "Voters%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode voters &
++ "Wator%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode wator &
++ "Wire%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode wire &
++ "World%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode world &
++ "Worm%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode worm &
+
+DestroyMenu "Screenlock"
+AddToMenu "Screenlock"
++ "Blank%mini-bball.xpm%" 	Exec xlock -nice 0 -mode blank &
++ "Random%mini-bball.xpm%"	Exec xlock -nice 0 -mode random &
++ ""				Nop
++ "Ant%mini-bball.xpm%"  	Exec xlock -nice 0 -mode ant &
++ "Ball%mini-bball.xpm%"  	Exec xlock -nice 0 -mode ball &
++ "Bat%mini-bball.xpm%"  	Exec xlock -nice 0 -mode bat &
++ "Blot%mini-bball.xpm%"	Exec xlock -nice 0 -mode blot &
++ "Bomb%mini-bball.xpm%"	Exec xlock -nice 0 -mode bomb &
++ "Bouboule%mini-bball.xpm%"	Exec xlock -nice 0 -mode bouboule &
++ "Bob%mini-bball.xpm%"   	Exec xlock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
++ "Bounce%mini-bball.xpm%" 	Exec xlock -nice 0 -mode bounce &
++ "Braid%mini-bball.xpm%" 	Exec xlock -nice 0 -mode braid &
++ "Bug%mini-bball.xpm%"   	Exec xlock -nice 0 -mode bug &
++ "Bubble%mini-bball.xpm%"   	Exec xlock -nice 0 -mode bubble &
++ "Clock%mini-bball.xpm%" 	Exec xlock -nice 0 -mode clock &
++ "Coral%mini-bball.xpm%" 	Exec xlock -nice 0 -mode coral &
++ "Crystal%mini-bball.xpm%" 	Exec xlock -nice 0 -mode crystal &
++ "Daisy%mini-bball.xpm%" 	Exec xlock -nice 0 -mode daisy &
++ "Dclock%mini-bball.xpm%" 	Exec xlock -nice 0 -mode dclock &
++ "Deco%mini-bball.xpm%" 	Exec xlock -nice 0 -mode deco &
++ "Demon%mini-bball.xpm%" 	Exec xlock -nice 0 -mode demon &
++ "Dilemma%mini-bball.xpm%" 	Exec xlock -nice 0 -mode dilemma &
++ "Drift%mini-bball.xpm%" 	Exec xlock -nice 0 -mode drift &
++ "More"                        PopUp Screenlock2
+
+DestroyMenu "Screenlock2"
+AddToMenu "Screenlock2"
++ "Eyes%mini-bball.xpm%" 	Exec xlock -nice 0 -mode eyes &
++ "Fadeplot%mini-bball.xpm%" 	Exec xlock -nice 0 -mode fadeplot &
++ "Flag%mini-bball.xpm%" 	Exec xlock -nice 0 -mode flag &
++ "Flame%mini-bball.xpm%" 	Exec xlock -nice 0 -mode flame &
++ "Forest%mini-bball.xpm%" 	Exec xlock -nice 0 -mode forest &
++ "Galaxy%mini-bball.xpm%" 	Exec xlock -nice 0 -mode galaxy &
++ "Geometry%mini-bball.xpm%" 	Exec xlock -nice 0 -mode geometry &
++ "Grav%mini-bball.xpm%" 	Exec xlock -nice 0 -mode grav &
++ "Helix%mini-bball.xpm%" 	Exec xlock -nice 0 -mode helix &
++ "Hop%mini-bball.xpm%"   	Exec xlock -nice 0 -mode hop   &
++ "Hyper%mini-bball.xpm%" 	Exec xlock -nice 0 -mode hyper &
++ "Ico%mini-bball.xpm%" 	Exec xlock -nice 0 -mode ico &
++ "Ifs%mini-bball.xpm%" 	Exec xlock -nice 0 -mode ifs &
++ "Julia%mini-bball.xpm%" 	Exec xlock -nice 0 -mode julia &
++ "Kaleid%mini-bball.xpm%" 	Exec xlock -nice 0 -mode kaleid &
++ "Laser%mini-bball.xpm%" 	Exec xlock -nice 0 -mode laser &
++ "Life%mini-bball.xpm%"  	Exec xlock -nice 0 -mode life   &
++ "Life1d%mini-bball.xpm%"  	Exec xlock -nice 0 -mode life1d &
++ "Life3d%mini-bball.xpm%"  	Exec xlock -nice 0 -mode life3d &
++ "Lightning%mini-bball.xpm%"  	Exec xlock -nice 0 -mode lightning &
++ "Lisa%mini-bball.xpm%"  	Exec xlock -nice 0 -mode lisa &
++ "Lissie%mini-bball.xpm%"  	Exec xlock -nice 0 -mode lissie &
++ "Loop%mini-bball.xpm%"  	Exec xlock -nice 0 -mode loop &
++ "More"                        PopUp Screenlock3
+
+DestroyMenu "Screenlock3"
+AddToMenu "Screenlock3"
++ "Mandelbrot%mini-bball.xpm%" 	Exec xlock -nice 0 -mode mandelbrot &
++ "Marquee%mini-bball.xpm%"  	Exec xlock -nice 0 -mode marquee &
++ "Maze%mini-bball.xpm%" 	Exec xlock -nice 0 -mode maze &
++ "Mountain%mini-bball.xpm%"	Exec xlock -nice 0 -mode mountain &
++ "Munch%mini-bball.xpm%"	Exec xlock -nice 0 -mode munch &
++ "Nose%mini-bball.xpm%"  	Exec xlock -nice 0 -mode nose &
++ "Pacman%mini-bball.xpm%"  	Exec xlock -nice 0 -mode pacman &
++ "Penguin%mini-bball.xpm%"   	Exec xlock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-linux.xbm -batchcount 7 &
++ "Penrose%mini-bball.xpm%"  	Exec xlock -nice 0 -mode penrose &
++ "Petal%mini-bball.xpm%"  	Exec xlock -nice 0 -mode petal &
++ "Puzzle%mini-bball.xpm%"  	Exec xlock -nice 0 -mode puzzle &
++ "Pyro%mini-bball.xpm%"  	Exec xlock -nice 0 -mode pyro &
++ "Qix%mini-bball.xpm%"   	Exec xlock -nice 0 -mode qix &
++ "Roll%mini-bball.xpm%" 	Exec xlock -nice 0 -mode roll &
++ "Rotor%mini-bball.xpm%" 	Exec xlock -nice 0 -mode rotor &
++ "Shape%mini-bball.xpm%" 	Exec xlock -nice 0 -mode shape &
++ "Sierpinski%mini-bball.xpm%"  Exec xlock -nice 0 -mode sierpinski &
++ "Slip%mini-bball.xpm%"  	Exec xlock -nice 0 -mode slip &
++ "Sphere%mini-bball.xpm%" 	Exec xlock -nice 0 -mode sphere &
++ "Spiral%mini-bball.xpm%" 	Exec xlock -nice 0 -mode spiral &
++ "Spline%mini-bball.xpm%" 	Exec xlock -nice 0 -mode spline &
++ "Star%mini-bball.xpm%" 	Exec xlock -nice 0 -mode star &
++ "Strange%mini-bball.xpm%" 	Exec xlock -nice 0 -mode strange &
++ "More"                        PopUp Screenlock4
+
+DestroyMenu "Screenlock4"
+AddToMenu "Screenlock4"
++ "Swarm%mini-bball.xpm%" 	Exec xlock -nice 0 -mode swarm &
++ "Swirl%mini-bball.xpm%" 	Exec xlock -nice 0 -mode swirl &
++ "Triangle%mini-bball.xpm%" 	Exec xlock -nice 0 -mode triangle &
++ "Tube%mini-bball.xpm%" 	Exec xlock -nice 0 -mode tube &
++ "Turtle%mini-bball.xpm%" 	Exec xlock -nice 0 -mode turtle &
++ "Vines%mini-bball.xpm%" 	Exec xlock -nice 0 -mode vines &
++ "Voters%mini-bball.xpm%" 	Exec xlock -nice 0 -mode voters &
++ "Wator%mini-bball.xpm%"  	Exec xlock -nice 0 -mode wator &
++ "Wire%mini-bball.xpm%"  	Exec xlock -nice 0 -mode wire &
++ "World%mini-bball.xpm%" 	Exec xlock -nice 0 -mode world &
++ "Worm%mini-bball.xpm%" 	Exec xlock -nice 0 -mode worm &
+
+DestroyMenu "Games"
+AddToMenu "Games"
++ "Maze%mini-maze.xpm%"         Exec maze &
++ "Spider%mini-espada.xpm%"     Exec spider &
++ "Chess%mini-slon.xpm%"        Exec xboard &
++ "Xlander%mini-xlander.xpm%"   Exec xlander &
++ "Xmahjongg%mini-xmahjongg.xpm%" Exec xmahjongg &
++ "Workman%mini-cdlabel.xpm%"	Exec workman &
++ "" Nop
++ "Amusements"                  Popup Amusements
+
+DestroyMenu "Amusements"
+AddToMenu "Amusements"
+#+ "Xcat%mini-cat.xpm%"   	Exec xcat &
++ "Xeyes%mini-eyes.xpm%"        Exec xeyes &
++ "Xlogo%mini-bx2.xpm%"         Exec xlogo &
++ "Xroach%mini-roach.xpm%"      Exec xroach &
++ "Xsnow%mini-xsnow.xpm%"       Exec xsnow &
++ "Stop Xsnow%mini-stop.xpm%"	Exec killall xsnow &
+
+DestroyMenu "Accessories"
+AddToMenu "Accessories"
++ "Font viewer (xfontsel)%mini-font.xpm%"  Exec xfontsel &
++ "Manual pages%mini-book1.xpm%"        Exec xman &
++ "Magnifying glass%mini-zoom.xpm%"     Exec xmag &
++ "Oclock%mini-clock.xpm%"              Exec oclock &
++ "Running Processes (Top)%mini-run.xpm%"	Exec xterm -font 7x14 -T Top -n Top -e top &
++ "System load%mini-perf.xpm%"          Exec xload &
++ "Xclipboard%mini-clipboard.xpm%" Exec xclipboard &
++ "Xclock%mini-clock.xpm%"              Exec xclock &
+
+DestroyMenu "Applications"
+AddToMenu "Applications"
++ "Emacs%mini-edit.xpm%"        Exec emacs &
++ "NcFTP%mini-ftp.xpm%"         Exec xterm -name NcFtp -T FTP -ls -fn 7x14 -e ncftp &
++ "GIMP%mini-camera.xpm%"       Exec gimp &
++ "Gv%mini-gv.xpm%"		Exec gv &
++ "Gnuplot%mini-zoom.xpm%"      Exec xterm -T "Gnuplot" -name Gnuplot -fn 7x14 -e gnuplot &
++ "Netscape%mini-nscape.xpm%"	Exec netscape &
++ "Pine%mini-mail.xpm%"  	Exec xterm -name Mail -T Mail -ls -fn 7x14 -e pine -i &
++ "Xv%mini-xv.xpm%"		Exec xv &
++ "Xedit%mini-edit.xpm%" 	Exec xedit &
++ "Xfig%mini-xfig.xpm%"         Exec xfig &
++ "Xfractint%mini-fractal.xpm%"	Exec xterm -font 7x14 -e xfractint map=chroma &
++ "Xpaint%mini-paint.xpm%"	Exec xpaint &
++ "Xpdf%mini-pdf.xpm%"          Exec xpdf &
++ "Xxgdb%mini-bug2.xpm%"	Exec xxgdb &
+
+DestroyMenu "Filemanagers"
+AddToMenu "Filemanagers"
++ "TkDesk%mini-desktop.xpm%"	Exec tkdesk &
++ "Xfilemanager%mini-filemgr.xpm%" Exec xfilemanager &
++ "Xfm%mini-filemgr.xpm%"	Exec xfm &
+
+#
+# This menu is invoked as a sub-menu - it allows you to quit,
+# restart, or switch to another WM.
+#
+DestroyMenu "Quit-Verify"
+AddToMenu "Quit-Verify"
++ "Quit fvwm95%mini-exclam.xpm%"        Quit
++ "" 					Nop
++ "Restart Fvwm95%mini-turn.xpm%"	Restart fvwm95
++ "" 					Nop
++ "Start fvwm2%mini-windows.xpm%"	Restart fvwm2
++ "Start mwm%mini-mwm.xpm%"		Restart mwm
++ "Start olvwm%mini-olwm.xpm%"		Restart /usr/openwin/bin/olvwm
++ "Start olwm%mini-olwm.xpm%"		Restart /usr/openwin/bin/olwm
++ "Start twm%mini-twm.xpm%"		Restart twm
+
+#
+# Provides a list of modules to fire off
+#
+DestroyMenu "Module-Popup"
+AddToMenu "Module-Popup"
+#+ "Audio"                               Module FvwmAudio
++ "Banner%mini.fvwm.xpm%"               Module FvwmBanner
++ "Button Bar%mini-ball.xpm%"		Module FvwmButtons
++ "Button Bar (Mini)%mini-ball.xpm%"	Module FvwmButtons MiniButtons
+#+ "Clean-Up%mini-pencil.xpm%"           Module FvwmClean
+#+ "Configure%mini-hammer.xpm%"          Module FvwmConfig
++ "Debug%mini-bug2.xpm%"		Module FvwmDebug
++ "Task bar%mini-exp.xpm%"		Module FvwmTaskBar
++ "Identify%mini-question.xpm%"		Module FvwmIdent
++ "Save Desktop%mini-desktop.xpm%"	Module FvwmSaveDesk
++ "Pager%mini-pager.xpm%"		Module FvwmPager 0 3
++ "Window List%mini-windows.xpm%"	Module FvwmWinList
++ "Talk%mini-exclam.xpm%"		Module FvwmTalk
+
+#
+# This menu will fire up some very common utilities
+#
+DestroyMenu "Utilities"
+AddToMenu "Utilities@utilities-menu.xpm@^white^"
++ "Running Processes (Top)%mini-run.xpm%"	Exec xterm -font 7x14 -T Top -n Top -e top &
++ "Calculator%mini-calc.xpm%"		Exec xcalc &
++ "Manual pages%mini-book1.xpm%" 	Exec xman &
++ "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
++ "Oclock%mini-clock.xpm%" 		Exec oclock &
++ ""					Nop
++ "Applications%mini-x2.xpm%"		Popup Applications
++ "File Managers%mini-filemgr.xpm%"     Popup Filemanagers
++ "Games%mini-happy.xpm%"		Popup Games
++ "Shells%mini-term.xpm"		Popup Shells
++ ""					Nop
++ "Screensaver%mini-display.xpm%"	Popup Screensaver
++ "Lock Screen%mini-lock.xpm%"		Popup Screenlock
++ ""					Nop
++ "Modules%mini-modules.xpm%"		Popup Module-Popup
++ ""					Nop
++ "Refresh Screen%mini-ray.xpm%"	Refresh
++ ""					Nop
++ "Exit Fvwm95%mini-stop.xpm%"		Popup Quit-Verify
+
+#
+# This defines the most common window operations
+#
+DestroyMenu "Window"
+AddToMenu "Window" "Window Ops" Title
++ "&Move%mini-move.xpm%"        Function Move-or-Raise
++ "&Resize%mini-resize.xpm%"    Function Resize-or-Raise
++ "R&aise%mini-raise.xpm%"      Raise
++ "&Lower%mini-lower.xpm%"      Lower
++ "(De)Iconify"                 Iconify
++ "(Un)Stick"                   Stick
++ "(Un)Maximize%mini-max1.xpm%" Function maximize_func
++ ""                            Nop
++ "Kill%mini-bomb.xpm%"         Destroy
++ "&Close%mini-cross.xpm%"      Delete
++ ""                            Nop
++ "Switch to..."                WindowList
++ "Refresh Screen%mini-ray.xpm%" Refresh
+
+#
+# A trimmed down version of "Window Ops", good for binding to decorations
+#
+AddToMenu "Window-Ops2" "&Restore"        Iconify -1
++                       "&Move"           Move-or-Raise
++                       "&Size"           Resize-or-Raise
++                       "Mi&nimize"       Iconify 1
++                       "Ma&ximize"       Maximize 100 100
++                       ""                Nop
++                       "&Kill"           Destroy
++                       "&Close	Alt+F4"   Delete
+
+#========================================================================#
+
+#
+# One more complex function - couldn't be defined earlier because it used 
+# pop-up menus
+#
+# This creates the "system" menu for the title-bar window-ops
+# pop-up
+#
+AddToFunc "window_ops_func" "C" PopUp Window-Ops2
++              "M" PopUp Window-Ops2
++              "D" Delete  
+
+
+#========================================================================#
+
+#
+# Mouse bindings
+#
+
+# First, for the mouse in the root window
+# Button 1 gives the Utilities menu
+# Button 2 gives the Window Ops menu
+# Button 3 gives the WindowList (like TwmWindows)
+# I use the AnyModifier (A) option for the modifier field, so you can hold down
+# any shift-control-whatever combination you want!
+
+#     Button	Context Modifi 	Function
+Mouse 1		R   	A       Menu "Utilities" Nop
+Mouse 2		R    	A       Menu "Window Ops" Nop
+Mouse 3         R       A       WindowList
+#Mouse 3	R    	A      	Module "winlist" FvwmWinList transient
+
+# Now the title bar buttons
+# Any button in the left title-bar button gives the window ops menu
+# Any button in the first right title-bar button Iconifies the window
+# Any button in the second title-bar button full-maximizes
+# Any button in the third (rightmost) title-bar button closes
+# Note the use of "Mouse 0" for AnyButton.
+
+#     Button	Context Modif 	Function
+Mouse 0		1    	A      	Function "window_ops_func"
+Mouse 1         2       A       Delete
+Mouse 0		4    	A     	Maximize 100 100
+Mouse 0		6    	A     	Iconify
+
+#
+# Now the rest of the frame
+# Here I invoke my complex functions for Move-or-lower, Move-or-raise,
+# and Resize-or-Raise. 
+#
+# Button 1 in the corner pieces, with any modifiers, gives resize or raise
+Mouse 1		F	A	Function "Resize-or-Raise"
+# Button 1 in the title, sides, or icon, w/ any modifiers, gives move or raise
+Mouse 1		TS	A	Function "Move-or-Raise"
+
+# Button 1 in an icons gives move for a drag, de-iconify for a double-click,
+# nothing for a single click
+# Button 2 in an icon, w/ any modifiers, gives de-iconify
+Mouse 1		I	A	Function "Move-or-Iconify"
+Mouse 2		I	A	Iconify
+
+# Button 2 in the corners, sides, or title-bar gives the window ops menu
+Mouse 2		FST	A	Function "window_ops_func"
+
+# Button 3 anywhere in the decoration (except the title-bar buttons)
+# does a raise-lower
+Mouse 3		TSIF	A	RaiseLower
+
+# Button 3 in the window, with the Modifier-1 key (usually alt or diamond)
+# gives Raise-Lower. Used to use control here, but that interferes with xterm
+Mouse 3         W       M       RaiseLower
+
+#========================================================================#
+
+# Now some keyboard shortcuts.
+
+# Arrow Keys
+# press arrow + control anywhere, and scroll by 1 page
+Key Left	A	C	Scroll -100 0
+Key Right	A	C	Scroll +100 +0
+Key Up		A	C	Scroll +0   -100
+Key Down	A	C	Scroll +0   +100
+
+# press arrow + meta key, and scroll by 1/10 of a page
+Key Left	A	M	Scroll -10 +0
+Key Right	A	M	Scroll +10 +0
+Key Up		A	M	Scroll +0   -10
+Key Down	A	M	Scroll +0   +10
+
+# press shift arrow + control anywhere, and move the pointer by 1% of a page
+Key Left	A	SC	CursorMove -1 0
+Key Right	A	SC	CursorMove +1 +0
+Key Up		A	SC	CursorMove +0   -1
+Key Down	A	SC	CursorMove +0   +1
+
+# press shift arrow + meta key, and move the pointer by 1/10 of a page
+Key Left	A	SM	CursorMove -10 +0
+Key Right	A	SM	CursorMove +10 +0
+Key Up		A	SM	CursorMove +0   -10
+Key Down	A	SM	CursorMove +0   +10
+
+# Keyboard accelerators
+Key F1		A	M	Popup "Utilities"
+Key F1		A	M	Popup "Utilities"
+Key F2		A	M	Popup "Window Ops"
+Key F3		A	M	Module "WindowList" FvwmWinList 
+Key F4		A	M	Iconify
+Key F5		A	M	Move
+Key F6		A	M	Resize
+Key F7		A	M	CirculateUp
+Key F8		A	M	CirculateDown
+
+#Page Up/Dapge Down keys are used to scroll by one desktop page
+# in any context, press page up/down + control
+# in root context, just pressing page up/down is OK
+# 
+# I prefer the non-wrapping scroll. These are for example purposes only
+#Key Next	A       C       Scroll 100000 0
+#Key Next	R       N       Scroll 100000 0  
+#Key Prior	A       C       Scroll -100000 0
+#Key Prior	R       N       Scroll -100000 0
+
+Key Tab         A       M       Prev Focus
+Key Tab         A       MS      Next Focus
+
+Key Escape      A       C       WindowList
+
+#========================================================================#
+
+# Definitions used by the modules
+
+#------------------ Pager
+*FvwmPagerBack grey60
+*FvwmPagerFore black
+*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*FvwmPagerHilight #c3c3c3
+*FvwmPagerGeometry -1-1
+*FvwmPagerLabel 0 Desktop
+*FvwmPagerSmallFont 5x8
+
+#------------------ FvwmButtons
+*FvwmButtonsFore Black
+*FvwmButtonsBack #c3c3c3
+*FvwmButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+# Geometry - really likes to pick its own size, but giving a position is OK
+*FvwmButtonsGeometry -5-34
+# Layout: specify rows or columns, not both
+*FvwmButtonsRows 1
+
+# Define the buttons to use.....
+*FvwmButtons xclock  NULL  Swallow "xclock" Exec xclock -bg \#c3c3c3 -geometry -1500-1500 -padding 0 &
+#*GoodStuff xcmap   NULL        Swallow "xcmap" xcmap -geometry -1500-1500
+*FvwmButtons (2x1) load NULL     Swallow "xload" Exec nice -16 xload -nolabel -bg grey60 -update 5 -geometry -1500-1500
+*FvwmButtons Netscape nscape.xpm Exec "Netscape" netscape &
+*FvwmButtons xterm   rterm.xpm   Exec    "Color xterm" xterm -ls -sb -fn 7x14 -title "Color xterm" &
+*FvwmButtons xfm     Xfm.xpm     Exec    "Xfm" xfm -title "File Manager" &
+#*FvwmButtons textedit textedit.xpm Exec  "Textedit" textedit &
+*FvwmButtons xcalc   rcalc.xpm   Exec    "Calculator" xcalc &
+*FvwmButtons xv   xv.xpm   Exec    "xv" xv &
+#*FvwmButtons ghostview   gv.xpm      Exec    "ghostview" ghostview &
+#*FvwmButtons netscape nscape.xpm Exec    "Netscape" netscape -geometry 920x650+90+5
+*FvwmButtons kill    rbomb.xpm   Destroy
+#*FvwmButtons (2x1) - whatever    SwallowModule Exec "Desktop" FvwmPager 0 0
+*FvwmButtons (2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
+
+#------------------ MiniButtons
+
+Style "MiniButtons"  NoTitle,NoHandles,Sticky,StaysOnTop,WindowListSkip,BorderWidth 0
+
+*MiniButtonsFore Black
+*MiniButtonsBack #c0c0c0
+*MiniButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*MiniButtonsGeometry -5+5
+*MiniButtonsRows 1
+*MiniButtonsPadding 1 1
+
+*MiniButtons -   mini-nscape.xpm      Exec    "Netscape" netscape -geometry 790x543+0+0 &
+*MiniButtons -   mini-term.xpm        Exec    "XTerm" xterm -ls -sb -fn 7x14 -title "Color xterm" &
+*MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm -title "File Manager" &
+*MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
+#*MiniButtons -   mini-gv.xpm          Exec    "ghostview" ghostview &
+*MiniButtons -   mini-xv.xpm          Exec    "xv" xv &
+*MiniButtons -   mini-bomb.xpm        Destroy
+
+#------------------ Identify
+*FvwmIdentBack #000080
+*FvwmIdentFore Yellow
+*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
+
+#------------------ FvwmWinList
+*FvwmWinListBack #c3c3c3
+*FvwmWinListFore Black
+*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*FvwmWinListAction Click1 Iconify -1,Focus
+*FvwmWinListAction Click2 Iconify
+*FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
+*FvwmWinListUseSkipList
+*FvwmWinListGeometry +0-1
+        
+#------------------ FvwmTaskBar
+#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,StaysOnTop,WindowListSkip,CirculateSkip
+# I don't like the taskbar to stay to top, since it covers the bottom
+# part of Netscape in full-screen mode:
+#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,WindowListSkip,CirculateSkip
+
+*FvwmTaskBarGeometry +0-0
+*FvwmTaskBarFore Black
+*FvwmTaskBarBack #c3c3c3
+*FvwmTaskBarTipsFore black
+#*FvwmTaskBarTipsBack bisque
+*FvwmTaskBarTipsBack #c3c3c3
+*FvwmTaskBarFont -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
+*FvwmTaskBarSelFont -adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*FvwmTaskBarAction Click1 Iconify -1,Raise,Focus
+*FvwmTaskBarAction Click2 Iconify
+*FvwmTaskBarAction Click3 Module "FvwmIdent" FvwmIdent
+*FvwmTaskBarUseSkipList
+*FvwmTaskBarAutoStick
+*FvwmTaskBarStartName Start
+*FvwmTaskBarStartMenu StartMenu
+# Just for fun, let's use the Linux penguin for the Start button:
+*FvwmTaskBarStartIcon mini-penguin.xpm
+#*FvwmTaskBarStartIcon mini-exp.xpm
+*FvwmTaskBarShowTips
+*FvwmTaskBarMailProg xterm -e mail
+
+# Show Date in Taskbar (this fixes a Slackware bug that was reported in 2003...
+# better 17 years too late than never ;-)
+*FvwmTaskBarGoodyLoadablePlugins /usr/lib64/X11/fvwm95/plugins
+*FvwmTaskBarGoodyLoadableSymbol ShowDateModuleSymbol
+*FvwmTaskBarGoodyLoadableId .DATE
+*FvwmTaskBarShowDateModuleTip.DATE Date
+*FvwmTaskBarShowDateModuleCommand.DATE Exec xmessage `date`
+*FvwmTaskBarShowDateModuleClockFormat.DATE %H:%M
diff --git a/desktop/fvwm95/xinitrc.fvwm95 b/desktop/fvwm95/xinitrc.fvwm95
index b08bba433985..17a7670ee6b8 100644
--- a/desktop/fvwm95/xinitrc.fvwm95
+++ b/desktop/fvwm95/xinitrc.fvwm95
@@ -1,29 +1,38 @@
 #!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+# Slackware FVWM95 xinitrc script
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
+# Uncomment this if you would like fvwm95 to launch in a dbus session.
+#dbus_cmd="dbus-launch --exit-with-session"
+
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
-    /usr/bin/xrdb -merge $sysresources
+    xrdb -merge $sysresources
 fi
 
 if [ -f $sysmodmap ]; then
-    /usr/bin/xmodmap $sysmodmap
+    xmodmap $sysmodmap
 fi
 
 if [ -f $userresources ]; then
-    /usr/bin/xrdb -merge $userresources
+    xrdb -merge $userresources
 fi
 
 if [ -f $usermodmap ]; then
-    /usr/bin/xmodmap $usermodmap
+    xmodmap $usermodmap
 fi
 
-# start some nice programs
+# start fvwm95
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  ck-launch-session $dbus_cmd /usr/bin/fvwm95
+else
+  $dbus_cmd /usr/bin/fvwm95
+fi
 
-exec /usr/bin/fvwm95