Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)

7 files changed, 68 insertions, 880 deletions

diff --git a/source/xap/fvwm/doinst.sh b/source/xap/fvwm/doinst.sh
index 57a23d6f5..087da9e3e 100644
--- a/source/xap/fvwm/doinst.sh
+++ b/source/xap/fvwm/doinst.sh
@@ -10,4 +10,5 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config etc/X11/fvwm2/system.fvwm2rc.new
+# Might need this later
+#config etc/X11/fvwm2/system.fvwm2rc.new
diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild
index 7906a4731..b04223c75 100755
--- a/source/xap/fvwm/fvwm.SlackBuild
+++ b/source/xap/fvwm/fvwm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,8 @@
 
 
 PKGNAM=fvwm
-VERSION=${VERSION:-2.4.20}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,6 +35,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -46,20 +46,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
-cd ${PKGNAM}-$VERSION || exit 1
 
-# Make sure ownerships and permissions are sane:
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -67,36 +69,37 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc/X11/fvwm2 \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
   --mandir=/usr/man \
-  --enable-multibyte \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --disable-bidi \
   --program-prefix= \
   --program-suffix= \
-  --enable-extras \
   --build=$ARCH-slackware-linux
 
-# Build and install:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Add some ancient icons:
+# Add some ancient icons.  The fvwm95 sample config still uses these.
 ( cd $PKG ; tar xzf $CWD/ancient-icons.tar.gz )
 
+# This script is called from the xinitrc:
+zcat $CWD/startfvwm2.gz > $PKG/usr/bin/startfvwm2
+chmod 755 $PKG/usr/bin/startfvwm2
+
+# This stuff appears to be misplaced junk:
+rm -rf $PKG/usr/share/doc
+
 # Add a few more things:
 mkdir -p $PKG/etc/X11/xinit
 zcat $CWD/xinitrc.fvwm2.gz > $PKG/etc/X11/xinit/xinitrc.fvwm2
 chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm2
-mkdir -p $PKG/etc/X11/fvwm2
-zcat $CWD/system.fvwm2rc.gz > $PKG/etc/X11/fvwm2/system.fvwm2rc.new
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/X11
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/X11 && rm -rf fvwm2 )
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/X11 && ln -sf ../../../etc/X11/fvwm2 fvwm2 )
+#zcat $CWD/system.fvwm2rc.gz > $PKG/etc/system.fvwm2rc.new
 
-# Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
@@ -109,27 +112,30 @@ if [ -d $PKG/usr/man ]; then
           ln -s $( readlink $eachpage ).gz $eachpage.gz
           rm $eachpage
         done
-        gzip -9 *.*
+        gzip -9 *.?
       )
     done
   )
 fi
 
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+# Install some documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL INSTALL.fvwm NEWS README \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-( cd docs
-  cp -a \
-    ANNOUNCE BUGS DEVELOPERS FAQ TODO color_combos error_codes fvwm.lsm m4_hacks \
-    $PKG/usr/doc/${PKGNAM}-$VERSION
-)
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/xap/fvwm/fvwm.colormap.diff b/source/xap/fvwm/fvwm.colormap.diff
deleted file mode 100644
index 2d2eac94c..000000000
--- a/source/xap/fvwm/fvwm.colormap.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./fvwm/colormaps.c.orig	Mon Sep 13 14:10:25 1999
-+++ ./fvwm/colormaps.c	Mon Sep 13 14:12:03 1999
-@@ -90,10 +90,13 @@
-   /* Reinstall the colormap that we think should be installed,
-    * UNLESS and unrecognized window has the focus - it might be
-    * an override-redirect window that has its own colormap. */
--  if((ReInstall)&&(Scr.UnknownWinFocused == None))
--    {
--      XInstallColormap(dpy,last_cmap);
--    }
-+  /* Commented out, since although this behavior is an X standard, it breaks
-+   * xlockmore and some other nifty programs, and having it this way doesn't
-+   * cause any problems that I'm aware of. */
-+  /* if((ReInstall)&&(Scr.UnknownWinFocused == None)) */
-+  /*  { */
-+  /*    XInstallColormap(dpy,last_cmap); */
-+  /*  } */
- }
- 
- /************************************************************************
diff --git a/source/xap/fvwm/slack-desc b/source/xap/fvwm/slack-desc
index 77995d921..2d2a9ef5f 100644
--- a/source/xap/fvwm/slack-desc
+++ b/source/xap/fvwm/slack-desc
@@ -13,7 +13,7 @@ fvwm: X11.  It is a derivative of twm, redesigned to minimize memory
 fvwm: consumption, provide a 3-D look to window frames, and provide a simple
 fvwm: virtual desktop.
 fvwm:
-fvwm:
+fvwm: Homepage:  http://www.fvwm.org
 fvwm:
 fvwm:
 fvwm:
diff --git a/source/xap/fvwm/startfvwm2 b/source/xap/fvwm/startfvwm2
new file mode 100644
index 000000000..b9d001d11
--- /dev/null
+++ b/source/xap/fvwm/startfvwm2
@@ -0,0 +1,23 @@
+#!/bin/sh
+#  startfvwm2 v1.0
+
+########################################################################
+##  Start DBUS session bus                                            ##
+########################################################################
+
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+   eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
+
+
+########################################################################
+##  Start fvwm2 Window Manager                                        ##
+########################################################################
+
+
+exec /usr/bin/fvwm2
+
+
+########################################################################
+
diff --git a/source/xap/fvwm/system.fvwm2rc b/source/xap/fvwm/system.fvwm2rc
deleted file mode 100644
index 863643a43..000000000
--- a/source/xap/fvwm/system.fvwm2rc
+++ /dev/null
@@ -1,822 +0,0 @@
-#
-# Default system.fvwm2rc for Slackware Linux, adapted from the version
-# for fvwm95 (i.e. beware of non-functional commented-out options)
-#
-
-#========================================================================#
-
-#
-# Fonts - one for window titles, another for icons, and another for the menus
-#
-WindowFont	-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
-IconFont	fixed
-MenuStyle black grey76 grey30 -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* fvwm
-
-#
-# 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
-#
-
-# Let's comment this out and be more UNIX-like :^)
-# 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
-
-#========================================================================#
-
-# 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 "SeaMonkey"  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" Module FvwmButtons
-+                           "I" Module FvwmButtons MiniButtons
-+                           "I" Module FvwmPager 0 0
-
-AddToFunc "RestartFunction"
-#+                           "I" Module FvwmButtons
-+                           "I" Module FvwmButtons MiniButtons
-+                           "I" Module FvwmPager 0 0
-
-#========================================================================#
-
-# 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"
-+ "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 Fvwm2       %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 &
-+ "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 -bitmap /usr/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
-#+ "Bounce%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode bounce &
-+ "\"Bob\"%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 -bitmap /usr/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 -bitmap /usr/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
-#+ "Bounce%mini-bball.xpm%" 	Exec xlock -nice 0 -mode bounce &
-+ "\"Bob\"%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 -bitmap /usr/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 &
-+ "SeaMonkey%mini-nscape.xpm%"	Exec seamonkey &
-+ "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 &
-+ "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 &
-+ "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 fvwm2%mini-exclam.xpm%"        Quit
-+ "" 					Nop
-+ "Restart Fvwm2%mini-turn.xpm%"	Restart fvwm2
-+ "" 					Nop
-+ "Start fvwm95%mini-exp.xpm%"		Restart fvwm95
-+ "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 0
-#+ "Window List%mini-windows.xpm%"	Module FvwmWinList
-#+ "Talk%mini-exclam.xpm%"		Module FvwmTalk
-
-AddToMenu Module-Popup  "FvwmModules"   Title
-+                       "Identify"      Module  FvwmIdent
-+                       "Talk"          Module  FvwmTalk
-+                       ""              Nop
-+                       "Button-Bar"    Module  FvwmButtons
-+                       "Pager"         Module  FvwmPager 0 0
-+                       "Pager (2 desks)" Module  FvwmPager 0 1
-+                       "WinList"       Module  FvwmWinList
-+                       ""              Nop
-+                       "Banner"        Module  FvwmBanner
-+                       "ScrollBar"     Module  FvwmScroll 50 50
-+                       "Background"    Module  FvwmBacker
-+                       "AutoRaise"     Module  FvwmAuto 200 Raise Nop
-+                       "Stop AutoRaise" KillModule FvwmAuto
-+                       ""              Nop
-+                       "IconBox"       Module  FvwmIconBox
-+                       "IconMan"       Module  FvwmIconMan
-+                       ""              Nop
-+                       "Form - Rlogin"      Module FvwmForm Rlogin
-+                       "Form - MyFvwmTalk"  Module FvwmForm MyFvwmTalk
-+                       "Form - QuitVerify"  Module FvwmForm QuitVerify
-
-#
-# This menu will fire up some very common utilities
-#
-DestroyMenu "Utilities"
-AddToMenu "Utilities"
-+ ""					Nop
-+ "Xterm%mini-term.xpm%" 		Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold &
-+ "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 Fvwm2%mini-stop.xpm%"		Popup Quit-Verify
-
-#
-# This defines the most common window operations
-#
-DestroyMenu "Window Ops"
-AddToMenu "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
-# Note the use of "Mouse 0" for AnyButton.
-
-#     Button	Context Modif 	Function
-Mouse 0 	1       A       Function "window_ops_func"
-Mouse 0 	2       A       Maximize 100 100
-Mouse 0 	4       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 -3-27
-*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-5
-# Layout: specify rows or columns, not both
-*FvwmButtonsRows 1
-
-# Define the buttons to use.....
-*FvwmButtons xclock  clock.xpm   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 SeaMonkey nscape.xpm Exec "SeaMonkey" seamonkey &
-*FvwmButtons xterm   rterm.xpm   Exec    "xterm" xterm -ls -sb -fn 7x14 &
-*FvwmButtons xfm     Xfm.xpm     Exec    "Xfm" xfm &
-#*FvwmButtons textedit textedit.xpm Exec  "Textedit" textedit &
-*FvwmButtons xcalc   rcalc.xpm   Exec    "Calculator" xcalc &
-*FvwmButtons xv   xv.xpm   Exec    "xv" xv &
-#*FvwmButtons gv   gv.xpm      Exec    "gv" gv &
-#*FvwmButtons seamonkey nscape.xpm Exec    "SeaMonkey" seamonkey -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    "SeaMonkey" seamonkey -geometry 790x543+0+0 &
-*MiniButtons -   mini-term.xpm        Exec    "XTerm" xterm -ls -sb -fn 7x14 &
-*MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm &
-*MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
-#*MiniButtons -   mini-gv.xpm          Exec    "gv" gv &
-*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 SeaMonkey 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
-*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
diff --git a/source/xap/fvwm/xinitrc.fvwm2 b/source/xap/fvwm/xinitrc.fvwm2
index 788a4e43a..c0fb46b0f 100644
--- a/source/xap/fvwm/xinitrc.fvwm2
+++ b/source/xap/fvwm/xinitrc.fvwm2
@@ -28,8 +28,8 @@ fi
 
 xsetroot -solid SteelBlue
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-  ck-launch-session fvwm2
+  ck-launch-session /usr/bin/startfvwm2
 else
-  fvwm2
+  dbus-launch --exit-with-session /usr/bin/startfvwm2
 fi