diff -r 020729/AnotherLevel/0-file-map 071016/AnotherLevel/0-file-map
1c1
< Anotherlevel file map: editted 16/07/01
---
> Anotherlevel file map: editted 16/09/03
16c16
< 		scripts_InitialWindowsSetUp
---
> 		scripts_InitialWindowsSetUp / scripts_InitialWindowsSetUpSmall
17a18
> 		scripts_WebBrowserChoice
63a65
> 		fvwm2rc.comp.animation
69c71,74
< 		fvwm2rc.apps.m4
---
> 		fvwm2rc.javabugsworkaround.m4
> 			ANOTHERLEVEL/bin/toggle-functions
> 				javabugsworkaround
> 		(defunct now) fvwm2rc.apps.m4
Only in 071016/AnotherLevel: BITMAPS
diff -r 020729/AnotherLevel/Xclients 071016/AnotherLevel/Xclients
53c53,55
< 	exec /usr/X11R6/bin/RunWM --AfterStep
---
> 	# RunWM no longer deals with AfterStep
> 	# exec /usr/X11R6/bin/RunWM --AfterStep
> 	exec /usr/X11R6/bin/afterstep
diff -r 020729/AnotherLevel/Xresources/NEDIT-defaults/0README 071016/AnotherLevel/Xresources/NEDIT-defaults/0README
6a7
> either
7a9,11
> or
> 	mv ~/.nedit/nedit.rc nedit-{{version}}
> 
Only in 071016/AnotherLevel/Xresources/NEDIT-defaults: nedit-5.3
Only in 071016/AnotherLevel/Xresources/NEDIT-defaults: nedit-5.4
diff -r 020729/AnotherLevel/Xresources/OPT-Xresources-nedit-5.2 071016/AnotherLevel/Xresources/OPT-Xresources-nedit-5.2
8,14c8,15
< nedit.printCommand: lpr -Plw
< nedit.printCopiesOption:
< nedit.printQueueOption:
< nedit.printNameOption:
< nedit.printHostOption:
< nedit.printDefaultQueue:
< nedit.printDefaultHost:
---
> !!Nedit seems to get this right now
> !nedit.printCommand: lpr -Plw
> !nedit.printCopiesOption:
> !nedit.printQueueOption:
> !nedit.printNameOption:
> !nedit.printHostOption:
> !nedit.printDefaultQueue:
> !nedit.printDefaultHost:
154c155
< 	if ($2 == "}" || $2 == "{" || $2 == "#")\n\
---
> 	if ($2 == "}" || $2 == "{")\n\
584c585
< nedit.autoWrap: None
---
> nedit.autoWrap: Newline
593a595,597
> ! Oh yes it does now! But not bold ones.
> ! nedit.italicHighlightFont: -misc-fixed-medium-o-semicondensed--13-100-100-100-c-60-iso8859-1
> ! However, it is taller than the others!
Only in 071016/AnotherLevel/Xresources: OPT-Xresources-nedit-5.2-04-09-12
Only in 071016/AnotherLevel/Xresources: OPT-Xresources-nedit-5.3
Only in 071016/AnotherLevel/Xresources: OPT-Xresources-nedit-5.3-04-09-12
Only in 071016/AnotherLevel/Xresources: OPT-Xresources-nedit-5.4
Only in 071016/AnotherLevel/Xresources: OPT-Xresources-nedit-5.5
Only in 071016/AnotherLevel/Xresources: Xresources-XClock
Only in 071016/AnotherLevel/bin: advanced-initial-script
diff -r 020729/AnotherLevel/bin/device-and-file-browse 071016/AnotherLevel/bin/device-and-file-browse
6c6
< # Copyright John Latham 2001, 2002
---
> # Copyright John Latham 2001, 2002, 2003, 2005, 2007
8,9c8,9
< # Purpose: to make a menu for browsing CD, floppy, ZIP
< #          and starting/stopping GMC
---
> # Purpose: to make a menu for browsing CD, floppy, ZIP, memstick
> #          and starting/stopping file browser
14c14
< if type gmc > /dev/null 2>&1
---
> if type nautilus > /dev/null 2>&1 -o type gmc > /dev/null 2>&1
17,18c17
<   echo "+ \"Gnome Browser%mini-filemgr.xpm%\" Popup ToggleGMC"
<   echo "+ \"\" nop"
---
>   echo "+ \"File Browser%mini-filemgr.xpm%\" Exec nautilus --no-desktop --browser 2>/dev/null >&2"
23c22
< if grep "^/dev/fd0.*/mnt/floppy" /etc/fstab > /dev/null
---
> if egrep "^/dev/.*/mnt/flash(	| )" /etc/fstab > /dev/null
25c24,25
<   if grep "^/dev/fd0 /mnt/floppy " /etc/mtab > /dev/null
---
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /mnt/flash " /etc/mtab > /dev/null
27c27
<     echo "+ \"Unmount Floppy%mini-filemgr.xpm%\" Exec umount /mnt/floppy"
---
>     echo "+ \"Unmount Flash Disc%mini-filemgr.xpm%\" Exec umount /mnt/flash"
29,30c29,78
<     echo "+ \"Mount Floppy%mini-filemgr.xpm%\" Exec mount /mnt/floppy"
<     echo "+ \"Browse Floppy%mini-filemgr.xpm%\" Exec mount /mnt/floppy && cd /mnt/floppy && $XTERM && cd / && umount /mnt/floppy"
---
>     echo "+ \"Mount Flash Disc%mini-filemgr.xpm%\" Exec mount /mnt/flash"
>     echo "+ \"Browse Flash Disc%mini-filemgr.xpm%\" Exec mount /mnt/flash && cd /mnt/flash && $XTERM && cd / && umount /mnt/flash"
>   fi
> fi
> 
> if egrep "^/dev/.*/mnt/flash1(	| )" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /mnt/flash1 " /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount Flash Disc 1%mini-filemgr.xpm%\" Exec umount /mnt/flash1"
>   else
>     echo "+ \"Mount Flash Disc 1%mini-filemgr.xpm%\" Exec mount /mnt/flash1"
>     echo "+ \"Browse Flash Disc 1%mini-filemgr.xpm%\" Exec mount /mnt/flash1 && cd /mnt/flash1 && $XTERM && cd / && umount /mnt/flash1"
>   fi
> fi
> 
> if egrep "^/dev/.*/mnt/flash2(	| )" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /mnt/flash2 " /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount Flash Disc 2%mini-filemgr.xpm%\" Exec umount /mnt/flash2"
>   else
>     echo "+ \"Mount Flash Disc 2%mini-filemgr.xpm%\" Exec mount /mnt/flash2"
>     echo "+ \"Browse Flash Disc 2%mini-filemgr.xpm%\" Exec mount /mnt/flash2 && cd /mnt/flash2 && $XTERM && cd / && umount /mnt/flash2"
>   fi
> fi
> 
> if grep "^/dev/.*/mnt/usb/1st1" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /mnt/usb/1st1 " /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount 1st USB%mini-filemgr.xpm%\" Exec umount /mnt/usb/1st1"
>   else
>     echo "+ \"Mount 1st USB%mini-filemgr.xpm%\" Exec mount /mnt/usb/1st1"
>     echo "+ \"Browse 1st USB%mini-filemgr.xpm%\" Exec mount /mnt/usb/1st1 && cd /mnt/usb/1st1 && $XTERM && cd / && umount /mnt/usb/1st1"
>   fi
> fi
> 
> if grep "^/dev/.*/mnt/usb/2nd1" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /mnt/usb/2nd1 " /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount 2nd USB%mini-filemgr.xpm%\" Exec umount /mnt/usb/2nd1"
>   else
>     echo "+ \"Mount 2nd USB%mini-filemgr.xpm%\" Exec mount /mnt/usb/2nd1"
>     echo "+ \"Browse 2nd USB%mini-filemgr.xpm%\" Exec mount /mnt/usb/2nd1 && cd /mnt/usb/2nd1 && $XTERM && cd / && umount /mnt/usb/2nd1"
45a94,117
> if grep "/media/cdrom.*managed" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /media/cdrom" /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount CD Rom%mini-filemgr.xpm%\" Exec umount /media/cdrom"
>   else
>     echo "+ \"Mount CD Rom%mini-filemgr.xpm%\" Exec mount /media/cdrom"
>     echo "+ \"Browse CD Rom%mini-filemgr.xpm%\" Exec mount /media/cdrom && cd /media/cdrom && $XTERM && cd / && umount /media/cdrom"
>   fi
> fi
> 
> if grep "/media/cdrecorder.*managed" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/.* /media/cdrecorder" /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount CD Rom%mini-filemgr.xpm%\" Exec umount /media/cdrecorder"
>   else
>     echo "+ \"Mount CD Rom%mini-filemgr.xpm%\" Exec mount /media/cdrecorder"
>     echo "+ \"Browse CD Rom%mini-filemgr.xpm%\" Exec mount /media/cdrecorder && cd /media/cdrecorder && $XTERM && cd / && umount /media/cdrecorder"
>   fi
> fi
> 
54a127,140
>   fi
> fi
> 
> if grep "^/dev/fd0.*/mnt/floppy" /etc/fstab > /dev/null \
>    || grep "^/dev/floppy.*/mnt/floppy" /etc/fstab > /dev/null
> then
>   echo "+ \"\" nop"
>   if grep "^/dev/fd0 /mnt/floppy " /etc/mtab > /dev/null \
>      || grep "^/dev/floppy /mnt/floppy " /etc/mtab > /dev/null
>   then
>     echo "+ \"Unmount Floppy%mini-filemgr.xpm%\" Exec umount /mnt/floppy"
>   else
>     echo "+ \"Mount Floppy%mini-filemgr.xpm%\" Exec mount /mnt/floppy"
>     echo "+ \"Browse Floppy%mini-filemgr.xpm%\" Exec mount /mnt/floppy && cd /mnt/floppy && $XTERM && cd / && umount /mnt/floppy"
Only in 071016/AnotherLevel/bin: device-and-file-browse-07-09-13
diff -r 020729/AnotherLevel/bin/directory-browse 071016/AnotherLevel/bin/directory-browse
34c34
< echo "+ \"Start $XTERM here%mini-xterm.xpm%\" Exec $ANOTHERLEVELUP/bin/favourite-track-exec \"$XTERM at $HERE %mini-xterm.xpm%\" \"cd \\\"$HERE\\\"; $XTERM\""
---
> echo "+ \"&Start $XTERM here%mini-xterm.xpm%\" Exec $ANOTHERLEVELUP/bin/favourite-track-exec \"$XTERM at $HERE %mini-xterm.xpm%\" \"cd \\\"$HERE\\\"; $XTERM\""
diff -r 020729/AnotherLevel/bin/favourite-addedit 071016/AnotherLevel/bin/favourite-addedit
7c7
< # Copyright John Latham 2000, 2001
---
> # Copyright John Latham 2000, 2001, 2002, 2003
65a66
> # This might be function or module, depending on pager bug
diff -r 020729/AnotherLevel/bin/favourite-menu 071016/AnotherLevel/bin/favourite-menu
6c6
< # Copyright John Latham 2000, 2002
---
> # Copyright John Latham 2000, 2002, 2003, 2007
35c35
< + "&Add new favourite" FvwmForm NewFavourite
---
> + "&Add new favourite" Function AddNewFavouriteFunction
38a39,43
> DestroyFunc AddNewFavouriteFunction
> AddToFunc AddNewFavouriteFunction
> # This might be function or module, depending on pager bug
> + "I" FvwmForm NewFavourite
> 
44c49,50
<   | sort | uniq -c | sort -nr | cut -f2- \
---
>   | sort | uniq -c | sed "s,^\( *[0-9]*\) ,\1	,g" \
>   | sort -nr | cut -f2- \
Only in 071016/AnotherLevel/bin: favourite-menu-07-07-17
diff -r 020729/AnotherLevel/bin/filemonitor.pl 071016/AnotherLevel/bin/filemonitor.pl
7c7
< # Copyright John Latham 2000, 2002
---
> # Copyright John Latham 2000, 2002, 2007
20a21,23
> # Colour map problems
> $ReportExceptionPattern .= '|Cannot allocate color';
> 
28a32,46
> 
> # Message from Opera etc..
> $ReportExceptionPattern .= '|Warning: XtRemoveGrab asked to remove a widget not on the list';
> 
> # Message from xon (from hostname actually)
> $ReportExceptionPattern .= '|net-tools 1.60|hostname 1.100 \(2001-04-14\)';
> 
> # Message from xcalc
> $ReportExceptionPattern .= '|Warning: Cannot convert string "calculator" to type Pixmap';
> 
> # Message from thunderbird
> $ReportExceptionPattern .= '|Segmentation fault .*thunderbird';
> 
> # Message from xlock
> $ReportExceptionPattern .= '|Xlib:  extension "GLX" missing on display';
diff -r 020729/AnotherLevel/bin/kill-all-proc 071016/AnotherLevel/bin/kill-all-proc
7c7
< # Copyright John Latham 1999, 2001
---
> # Copyright John Latham 1999, 2001, 2003
21c21
< ps t$ANOTHERLEVELUPTTY c | grep -e " $CommandName" | \
---
> ps t$ANOTHERLEVELUPTTY c | egrep -e " $CommandName($| )" | \
diff -r 020729/AnotherLevel/bin/list-background-preferences 071016/AnotherLevel/bin/list-background-preferences
37a38
> 
38a40
>              "")                   Result="$ANOTHERLEVELUPIMAGES/MANUNI/manuni-ice-blue-to-white-flare-3.jpg" ;;
diff -r 020729/AnotherLevel/bin/make-gnome-menus 071016/AnotherLevel/bin/make-gnome-menus
6c6
< # Copyright John Latham 2002
---
> # Copyright John Latham 2002, 2003, 2004
17a18,36
> # Rewritten September 13th 2003, to deal with new style .desktop files
> # which contain their category inside them instead of using the file path name
> # to determine the menu they go on.
> 
> # Comment September 10th 2004: really these new categories shoule not be
> # treated as a nested structure, but have multiple entries for each item, on in
> # each category! This need to be done...
> 
> searchPaths="
> /etc/X11/applnk
> /usr/share/gnome/apps
> /usr/share/applications
> /usr/share/desktop-menu-patches
> "
> 
> # ??? maybe should exclude menus rather than files?
> #excludeFiles="./Settings/|./Games/"
> excludeFiles="./Settings/"
> #excludeFiles="XXX-NONE-XXX"
19c38
< export tempFile=/tmp/make-gnome-menus-$$
---
> # The single argument specifies the menu prefix
22,28d40
< function searchPath()
< {
<   local path=$1
<   find $path/. -type f -a -name \*.desktop \
<     | sed "s,^$path/*\(.*\)/\([^/]*\).desktop$,\1;;;$path/\1/\2.desktop,g" \
<     | sed "s,^./,$rootMenu.,g" | sed "s,^.;;;,$rootMenu;;;,g"
< } # searchPath
29a42,49
> function findDeskTopFiles()
> {
>   local path
>   for path in $searchPaths
>   do
>     find $path/. -type f -a -name \*.desktop 2>/dev/null
>   done
> }
33,85c53,54
< ( cat << "END-OF-PERL"
<   use strict;
<   while (<>)
<   {
<     chomp;
<     my ($itemMenu, $itemFile) = split /;;;/;
<     $itemMenu =~ s,/,.,g;
<     $itemMenu =~ s, ,_,g;
<     print "$itemMenu $itemFile\n";
<   }
<   __END__
< END-OF-PERL
< 
<   ( searchPath /etc/X11/applnk
<     searchPath /usr/share/gnome/apps \
<       | grep -v "/usr/share/gnome/apps/./Settings/"
<   ) | sort
< 
< ) | perl > $tempFile
< 
< ( cat << "END-OF-PERL"
<   use strict;
<   my @menuList = ();
<   while (my $menuItem = <>)
<   {
<     chomp $menuItem;
<     push @menuList, $menuItem;
<     while ($menuItem =~ /^(.*)\.[^.]*$/)
<     {
<       push @menuList, $1;
<       $menuItem = $1;
<     }
<   }
<   my $previous = "";
<   foreach (sort @menuList)
<   {
<     if ($_ ne $previous && /(.*)\.([^.]*$)/)
<     {
<       my $parentMenu = $1;
<       my $label = $2;
<       $label =~ s/_/ /g;
<       print "AddToMenu	$_	\"$label\"	Title\n";
<       print "AddToMenu	$parentMenu	\"$label\"	Popup	$_\n";
<     }
<     $previous = $_;
<   }
<   __END__
< END-OF-PERL
< 
< cut -f 1 -d " " $tempFile | sort | uniq
< 
< ) | perl
< 
---
> # This perl script takes a list of files from standard input
> # passed in after the script code, below.
88a58,64
> my $true = 1 == 1;
> my $false = ! $true;
> 
> # first line of input is root menu name
> my $rootMenu = <>;
> chomp($rootMenu);
> 
97,99c73,82
<   /([^ ]*) (.*)$/;
<   my $itemMenu = $1;
<   my $itemFile = $2;
---
>   my $itemFile=$_;
> 
>   # split file name into path /./ menu path / filename
>   /([^\.]*)\/\.\/(.*)\/[^\/]*$/;
>   my $itemMenu = $2;
> 
>   # turn . or space into _ and / into . in menu name
>   $itemMenu =~ s/[\. ]/_/g;
>   $itemMenu =~ s/\//./g;
> 
104a88
>   my $includeThisFile = $true;
113a98,127
>     # do not include KDE only items
>     if (/^OnlyShowIn=KDE/i) { $includeThisFile = $false; }
>     # check for a Categories entry
>     if (/^Categories=(.*[^ ]) *$/i)
>     {
>       $itemMenu = $1;
> 
>       # remove certain categories
>       $itemMenu =~ s/(^|;)X-Red-Hat[^;]*(;|$)/;/ig;
> # ??? why does this not get multiple (adjacent?) matches? And so need another one?
>       $itemMenu =~ s/(^|;)X-Red-Hat[^;]*(;|$)/;/ig;
> 
>       $itemMenu =~ s/(^|;)GNOME(;|$)/;/ig;
>       $itemMenu =~ s/(^|;)KDE(;|$)/;/ig;
>       $itemMenu =~ s/(^|;)Application(;|$)/;/ig;
> 
>       # rename certain categories
>       $itemMenu =~ s/(^|;)AudioVideo(;|$)/Multimedia;/ig;
>       $itemMenu =~ s/(^|;)Game(;|$)/Games;/ig;
>       $itemMenu =~ s/(^|;)Utility(;|$)/Utilities;/ig;
> 
>       # remove multiple ;
>       $itemMenu =~ s/; *;*/;/g;
>       # remove trailing ;
>       $itemMenu =~ s/;$//g;
>       # remove leading ;
>       $itemMenu =~ s/^;//g;
>       # turn ; into .
>       $itemMenu =~ s/;/./g;
>     }
115a130
>   # remove quotes from name and comment
122c137
<   if ($name && $exec)
---
>   if ($name && $exec && $includeThisFile)
146a162,167
> 
>       # add on root menu
>       if ($itemMenu eq "") { $itemMenu = $rootMenu; }
>       else                 { $itemMenu = $rootMenu . "." . $itemMenu; }
> 
>       # we prepend a sorting key to get the order right
148c169,184
<       print "AddToMenu	$itemMenu	\"$name \"	Exec	$exec &\n";
---
>       print "2 AddToMenu	$itemMenu	\"$name \"	Exec	$exec &\n";
> 
>       # output menu and sub-menu titles and links
>       # while menuItem has parent . child structure
>       while ($itemMenu =~ /^(.*)\.([^.]*$)/)
>       {
>         my $parentMenu = $1;
>         my $childMenu = $2;
>         my $menuLabel = $childMenu;
>         $menuLabel =~ s/_/ /g;
>         # we prepend a sorting key to get the order right
>         # Note space after $menuLabel below to help sort properly
>         print "1${itemMenu}.1 AddToMenu	$itemMenu	\"$menuLabel \"	Title\n";
>         print "1${itemMenu}.2 AddToMenu	$parentMenu	\"$menuLabel \"	Popup	$itemMenu\n";
>         $itemMenu = $parentMenu;
>       }
154,155c190,193
< cat $tempFile
< ) | perl | sort -f | sed 's, ",",g' | uniq \
---
> echo $rootMenu
> findDeskTopFiles | egrep -v "$excludeFiles"
> ) | perl | sort -f | sed 's, ",",g' | uniq | cut -f2- -d " "
> # -f on sort above is to ignore case
157,158c195
< 
< rm -f $tempFile
---
> # cut above is to remove sort key
Only in 071016/AnotherLevel/bin: make-gnome-menus-03-09-13
Only in 071016/AnotherLevel/bin: options-manager
diff -r 020729/AnotherLevel/bin/preferences 071016/AnotherLevel/bin/preferences
6c6
< # Copyright John Latham 1999, 2000, 2001, 2002
---
> # Copyright John Latham 1999, 2000, 2001, 2002, 2003
96a97
> scripts_WebBrowserChoice
105a107
> scripts_WebBrowserChoice
251a254
> # This might be function or module, depending on pager bug
319a323
> # This might be function or module, depending on pager bug
362a367
>     # This might be function or module, depending on pager bug
412a418
> # This might be function or module, depending on pager bug
diff -r 020729/AnotherLevel/bin/preferences-random 071016/AnotherLevel/bin/preferences-random
154c154
<   grep -v "^$PrefsName\$" $File > $File-new
---
>   grep -v "^$PrefsName\$" $File > $File-new 2>/dev/null
176c176
<   grep -v "^$PrefsName\$" $File > $File-new
---
>   grep -v "^$PrefsName\$" $File > $File-new 2>/dev/null
453c453
<                    > .fvwm2dir/1-random-list-user-new
---
>                    > .fvwm2dir/1-random-list-user-new 2>/dev/null
460c460
<                    > .fvwm2dir/1-random-list-user-new
---
>                    > .fvwm2dir/1-random-list-user-new 2>/dev/null
468c468
<                     > .fvwm2dir/1-random-list-shared-new
---
>                     > .fvwm2dir/1-random-list-shared-new 2>/dev/null
475c475
<                     > .fvwm2dir/1-random-list-shared-new
---
>                     > .fvwm2dir/1-random-list-shared-new 2>/dev/null
diff -r 020729/AnotherLevel/bin/reprocess-components 071016/AnotherLevel/bin/reprocess-components
6c6
< # Copyright John Latham 2001, 2002
---
> # Copyright John Latham 2001, 2002, 2003, 2007
18a19,21
> # N.B: must switch off the changed component rather than just stop1 it
> # so that it really gets started again when switched on
> 
21c24
<        $ANOTHERLEVELUP/bin/toggle-functions -stop1 Pager
---
>        $ANOTHERLEVELUP/bin/toggle-functions -off Pager
27c30
<        $ANOTHERLEVELUP/bin/toggle-functions -stop1 Xbiff
---
>        $ANOTHERLEVELUP/bin/toggle-functions -off Xbiff
32c35
<        $ANOTHERLEVELUP/bin/toggle-functions -stop1 Xclock
---
>        $ANOTHERLEVELUP/bin/toggle-functions -off Xclock
45,56c48,61
< define(\`BASIC_FONT', \`$8')
< define(\`SMALL_FONT', \`$9')
< 
< define(\`WINFORE_COLOR', \`${10}')
< define(\`WINBACK_COLOR', \`${11}')
< define(\`HILIGHTFORE_COLOR', \`${12}')
< define(\`HILIGHTBACK_COLOR', \`${13}')
< 
< define(\`MAIL_SPOOL_DIR', \`${14}')
< define(\`XTERM', \`${15}')
< define(\`NETSCAPE_DEFAULT', \`${16}')
< define(\`FVWM_VERSION', \`${17}')
---
> define(\`GENERAL_FONT_FAMILY', \`$8')
> define(\`BASIC_FONT', \`$9')
> define(\`SMALL_FONT', \`${10}')
> 
> define(\`WINFORE_COLOR', \`${11}')
> define(\`WINBACK_COLOR', \`${12}')
> define(\`HILIGHTFORE_COLOR', \`${13}')
> define(\`HILIGHTBACK_COLOR', \`${14}')
> 
> define(\`MAIL_SPOOL_DIR', \`${15}')
> define(\`XTERM', \`${16}')
> ifelse(\`WEBBROWSER_DEFAULT', \`${17}', \`',
>        \`define(\`WEBBROWSER_DEFAULT', \`${17}')')
> define(\`FVWM_VERSION', \`${18}')
Only in 071016/AnotherLevel/bin: reprocess-components-07-09-13
diff -r 020729/AnotherLevel/bin/scripts-xbiff-choice-support 071016/AnotherLevel/bin/scripts-xbiff-choice-support
7c7
< # Copyright John Latham 2001
---
> # Copyright John Latham 2001, 2007
82c82
<            16) echoTitle ""         "" ;;
---
>            16) echoTitle "true"     "None" ;;
94a95
>             true)            echo 16 ;;
108c109
<     16) Choice="" ;;
---
>     16) Choice="true" ;;
Only in 071016/AnotherLevel/bin: scripts-xbiff-choice-support-07-09-13
diff -r 020729/AnotherLevel/bin/set-version-variations 071016/AnotherLevel/bin/set-version-variations
6c6
< # Copyright John Latham 2002
---
> # Copyright John Latham 2002, 2003
27,35d26
< # Possibly related to the last point: TaskBar does not work unless specify
< # use of iso8859 fonts. Also affects font chosen by FvwmPager.
< 
< case $VERSION in
< 2.4.*) echo "define(\`USE_8859')" ;;
< esac
< 
< 
< ###############################################################################
128,129d118
< BusyCursor DynamicMenu True
< 
147,153d135
< # PipeRead does not permit mouse grab (e.g. for xwd)
< 
< case $VERSION in
< 2.4.*|2.5.*) echo "define(\`PIPEREADKEEPSMOUSE')" ;;
< esac
< 
< ###############################################################################
196a179,268
> esac
> 
> ###############################################################################
> # BusyCursor 
> 
> case $VERSION in
> 2.0.*|2.1.*|2.2.*) cat << "."
> AddToFunc BusyCursorReadOff
> 
> AddToFunc BusyCursorReadDefault
> .
> ;;
> 
> *)                 cat << "."
> BusyCursor DynamicMenu True
> 
> AddToFunc BusyCursorReadOff
> + "I" BusyCursor read off
> 
> AddToFunc BusyCursorReadDefault
> + "I" BusyCursor read on
> 
> BusyCursorReadDefault
> .
> ;;
> esac
> 
> ###############################################################################
> # Java bug work arounds
> 
> case $VERSION in
> 2.0.*|2.1.*|2.2.*) ;;
> *)                 echo "define(\`WANT_JAVA_BUG_WORK_AROUNDS')" ;;
> esac
> 
> ###############################################################################
> # Want animation
> 
> case $VERSION in
> 2.0.*|2.1.*|2.2.*) ;;
> *)                 echo "define(\`WANT_ANIMATION_FEATURES')" ;;
> esac
> 
> ###############################################################################
> # Mouse position variables
> 
> case $VERSION in
> 2.0.*|2.1.*|2.2.*|2.3.*|2.4.*) ;;
> *)                             echo "define(\`MOUSE_POSITION_AVAILABLE')" ;;
> esac
> 
> ###############################################################################
> # UseRootMouseDisable
> # 2.4.* allows mouse clicks during functions to act on the root window
> 
> case $VERSION in
> 2.4.*) echo "define(\`UseRootMouseDisable')" ;;
> esac
> 
> ###############################################################################
> # Layers available or not.
> 
> case $VERSION in
> 2.0.*|2.1.*|2.2.*) ;;
> *)                 echo "define(\`LAYERS_AVAILABLE')" ;;
> esac
> 
> ###############################################################################
> # Weird Pager bug
> # 2.4.* causes FvwmForm to hang when started from PipeRead, if Pager is using
> # pipe file id near to the latest.
> 
> case $VERSION in
> 2.4.*) cat << "."
> DestroyFunc FvwmForm
> AddToFunc FvwmForm
> + "I" PipeRead "$ANOTHERLEVELUP/bin/toggle-functions -stop1 Pager"
> + "I" Module FvwmForm $0
> + "I" PipeRead "$ANOTHERLEVELUP/bin/toggle-functions -start1 Pager"
> .
> ;;
> esac
> 
> ###############################################################################
> # FvwmAnimateIconify: Delay
> # Zoom3D delay has no 1000 multiplier in source code!
> # Looks like it was fixed in 2.5?
> case $VERSION in
> 2.5.*) echo "define(\`FvwmAnimateIconifyDelaySuffix', \`')" ;;
> *)     echo "define(\`FvwmAnimateIconifyDelaySuffix', \`000')" ;;
Only in 071016/AnotherLevel/bin: set-version-variations-07-07-05
Only in 071016/AnotherLevel/bin: time-enabled-command
diff -r 020729/AnotherLevel/bin/toggle-functions 071016/AnotherLevel/bin/toggle-functions
16a17,20
> #	-file <name>
> # 		- use given name instead of toggle-functions for details of
> #		  configuration and user settings.
> #
31c35
< #		  the menu for it
---
> #		  the menu for it, if the function is currently off
35c39
< #		  the menu for it
---
> #		  the menu for it, if the function is currently on
59c63,69
< # 9/8/02: altered load of -menu to be read via PipeRead into, fvwm so that
---
> case $1 in
> -file) FileName="$2"
>        shift 2 ;;
> *)     FileName="toggle-functions" ;;
> esac
> 
> # 9/8/02: altered load of -menu to be read via PipeRead into fvwm so that
64,68c74,78
< test -e $HOME/.fvwm2dir/toggle-functions \
<   && mv $HOME/.fvwm2dir/toggle-functions $HOME/.fvwm2dir/1-toggle-functions
< test -e $HOME/.fvwm2dirAllThemes/toggle-functions \
<   && mv $HOME/.fvwm2dirAllThemes/toggle-functions \
<         $HOME/.fvwm2dirAllThemes/1-toggle-functions
---
> test -e "$HOME/.fvwm2dir/$FileName" \
>   && mv "$HOME/.fvwm2dir/$FileName" "$HOME/.fvwm2dir/1-$FileName"
> test -e "$HOME/.fvwm2dirAllThemes/$FileName" \
>   && mv "$HOME/.fvwm2dirAllThemes/$FileName" \
>         "$HOME/.fvwm2dirAllThemes/1-$FileName"
70c80
< # The above should work right even if a 1-toggle-functions already exists. For
---
> # The above should work right even if a 1-$FileName already exists. For
74,76c84,86
< UserFile=$HOME/.fvwm2dir/1-toggle-functions
< test -e $HOME/.fvwm2dirAllThemes/1-toggle-functions \
<   && UserFile=$HOME/.fvwm2dirAllThemes/1-toggle-functions
---
> UserFile="$HOME/.fvwm2dir/1-$FileName"
> test -e "$HOME/.fvwm2dirAllThemes/1-$FileName" \
>   && UserFile="$HOME/.fvwm2dirAllThemes/1-$FileName"
93c103
<         done < $ANOTHERLEVELUP/toggle-functions
---
>         done < "$ANOTHERLEVELUP/$FileName"
111c121
<           done < $ANOTHERLEVELUP/toggle-functions
---
>           done < "$ANOTHERLEVELUP/$FileName"
129c139
<           done < $ANOTHERLEVELUP/toggle-functions
---
>           done < "$ANOTHERLEVELUP/$FileName"
145c155
<              ON) echo "AddToMenu Toggle$ItemName \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -off $ItemName\""
---
>              ON) echo "AddToMenu Toggle$ItemName \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -off $ItemName\""
147,148c157,158
<                  echo "AddToMenu Toggle${ItemName}_Button \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -off $ItemName\"" ;;
<              *)  echo "AddToMenu Toggle$ItemName \"Start $Title $StartMiniIcon\" PipeRead \"$0 -on $ItemName\""
---
>                  echo "AddToMenu Toggle${ItemName}_Button \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -off $ItemName\"" ;;
>              *)  echo "AddToMenu Toggle$ItemName \"Start $Title $StartMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -on $ItemName\""
150c160
<                  echo "AddToMenu Toggle${ItemName}_Button \"Start $Title $StartMiniIcon\" PipeRead \"$0 -on $ItemName\"" ;;
---
>                  echo "AddToMenu Toggle${ItemName}_Button \"Start $Title $StartMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -on $ItemName\"" ;;
154c164
<        ) < $ANOTHERLEVELUP/toggle-functions
---
>        ) < "$ANOTHERLEVELUP/$FileName"
163a174
>      State=`
170,171c181,182
<             CurrentState=`grep "^$ItemName," $UserFile 2>/dev/null \
<                           | cut -d, -f2`
---
>             CurrentState=\`grep "^$ItemName," $UserFile 2>/dev/null \
>                            | cut -d, -f2\`
172a184
>             echo -n $State
180,196c192,211
<      done < $ANOTHERLEVELUP/toggle-functions
<      while read WhenStart ItemName Title OnCommand OffCommand State
<      do
<        case "$WhenStart" in
<        END) break ;;
<        *) if test "$ItemName" = "$2"
<           then
<             echo "DestroyMenu Toggle$ItemName"
<             echo "DestroyMenu Toggle${ItemName}_Button"
<             OnCommand=`echo $OnCommand`
<             echo "$OnCommand -on"
<             echo "AddToMenu Toggle$ItemName \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -off $ItemName\""
<             echo "AddToMenu Toggle${ItemName}_Button \"*mini-down.xpm*\" Title"
<             echo "AddToMenu Toggle${ItemName}_Button \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -off $ItemName\""
<           fi ;;
<        esac
<      done < $ANOTHERLEVELUP/toggle-functions
---
>      done < "$ANOTHERLEVELUP/$FileName"`
>      if test "$State" = "OFF"
>      then
>        while read WhenStart ItemName Title OnCommand OffCommand State
>        do
>          case "$WhenStart" in
>          END) break ;;
>          *) if test "$ItemName" = "$2"
>             then
>               echo "DestroyMenu Toggle$ItemName"
>               echo "DestroyMenu Toggle${ItemName}_Button"
>               OnCommand=`echo $OnCommand`
>               echo "$OnCommand -on"
>               echo "AddToMenu Toggle$ItemName \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -off $ItemName\""
>               echo "AddToMenu Toggle${ItemName}_Button \"*mini-down.xpm*\" Title"
>               echo "AddToMenu Toggle${ItemName}_Button \"Stop $Title $StopMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -off $ItemName\""
>             fi ;;
>          esac
>        done < "$ANOTHERLEVELUP/$FileName"
>      fi
205a221
>       State=`
212,213c228,229
<              CurrentState=`grep "^$ItemName," $UserFile 2>/dev/null \
<                            | cut -d, -f2`
---
>              CurrentState=\`grep "^$ItemName," $UserFile 2>/dev/null \
>                             | cut -d, -f2\`
214a231
>              echo -n $State
222,238c239,258
<       done < $ANOTHERLEVELUP/toggle-functions
<       while read WhenStart ItemName Title OnCommand OffCommand State
<       do
<         case "$WhenStart" in
<         END) break ;;
<         *) if test "$ItemName" = "$2"
<            then
<              echo "DestroyMenu Toggle$ItemName"
<              echo "DestroyMenu Toggle${ItemName}_Button"
<              OffCommand=`echo $OffCommand`
<              echo "$OffCommand -off"
<              echo "AddToMenu Toggle$ItemName \"Start $Title $StartMiniIcon\" PipeRead \"$0 -on $ItemName\""
<              echo "AddToMenu Toggle${ItemName}_Button \"*mini-down.xpm*\" Title"
<              echo "AddToMenu Toggle${ItemName}_Button \"Start $Title $StartMiniIcon\" PipeRead \"$0 -on $ItemName\""
<            fi ;;
<         esac
<       done < $ANOTHERLEVELUP/toggle-functions
---
>       done < "$ANOTHERLEVELUP/$FileName"`
>       if test "$State" = "ON"
>       then
>         while read WhenStart ItemName Title OnCommand OffCommand State
>         do
>           case "$WhenStart" in
>           END) break ;;
>           *) if test "$ItemName" = "$2"
>              then
>                echo "DestroyMenu Toggle$ItemName"
>                echo "DestroyMenu Toggle${ItemName}_Button"
>                OffCommand=`echo $OffCommand`
>                echo "$OffCommand -off"
>                echo "AddToMenu Toggle$ItemName \"Start $Title $StartMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -on $ItemName\""
>                echo "AddToMenu Toggle${ItemName}_Button \"*mini-down.xpm*\" Title"
>                echo "AddToMenu Toggle${ItemName}_Button \"Start $Title $StartMiniIcon\" PipeRead \"$0 -file \\\"$FileName\\\" -on $ItemName\""
>              fi ;;
>           esac
>         done < "$ANOTHERLEVELUP/$FileName"
>       fi
261c281
<          done < $ANOTHERLEVELUP/toggle-functions
---
>          done < "$ANOTHERLEVELUP/$FileName"
284c304
<         done < $ANOTHERLEVELUP/toggle-functions
---
>         done < "$ANOTHERLEVELUP/$FileName"
298c318
<             cat ) < $ANOTHERLEVELUP/toggle-functions
---
>             cat ) < "$ANOTHERLEVELUP/$FileName"
diff -r 020729/AnotherLevel/bin/try-xterm-colours 071016/AnotherLevel/bin/try-xterm-colours
7c7
< # Copyright John Latham 1999, 2000
---
> # Copyright John Latham 1999, 2000, 2002
16c16
< echo "			Xterm Colour Testing Script (V0.0)"
---
> echo "		Xterm Colour Testing Script (Version 24/8/02)"
24c24
< echo "For the folowing 16 colours (0-15) it is conventional to have colours"
---
> echo "For the following 16 colours (0-15) it is conventional to have colours"
diff -r 020729/AnotherLevel/bin/xlock 071016/AnotherLevel/bin/xlock
6c6
< # Copyright John Latham 2001
---
> # Copyright John Latham 2001, 2002, 2003, 2007
102c102
<                print \"*\" XLOCK \"Command	Exec xlock -nice $NICELEVEL -mode \\\$(Option) -timeelapsed -bg \\\"$BG_COLOR\\\" -fg \\\"$FG_COLOR\\\" -enablesaver -mousemotion -timeout 5\";
---
>                print \"*\" XLOCK \"Command	Exec xlock -nice $NICELEVEL -mode \$(Option) -timeelapsed -bg \\\"$BG_COLOR\\\" -fg \\\"$FG_COLOR\\\" -enablesaver -mousemotion -timeout 5\";
104,105c104,105
<                print \"*\" XLOCK \"Command	Exec xlock -nice $NICELEVEL -erasemode no_fade -mode \\\$(Option) -timeelapsed -bg \\\"$BG_COLOR\\\" -fg \\\"$FG_COLOR\\\" -enablesaver -mousemotion -timeout 5\";
<              print \"*\" XLOCK \"Command	Exec test \\\"\\\$(Option)\\\" != \\\"$XLockUserChoice\\\" && echo \\\"define(\\\\\`XLockUserChoice\', \\\\\`\\\$(Option)\')\\\" > $USER_PREFS_DIR/forms_Xlock\";
---
>                print \"*\" XLOCK \"Command	Exec xlock -nice $NICELEVEL -erasemode no_fade -mode \$(Option) -timeelapsed -bg \\\"$BG_COLOR\\\" -fg \\\"$FG_COLOR\\\" -enablesaver -mousemotion -timeout 5\";
>              print \"*\" XLOCK \"Command	Exec test \\\"\$(Option)\\\" != \\\"$XLockUserChoice\\\" && echo \\\"define(\\\\\`XLockUserChoice', \\\\\`\$(Option)')\\\" > $USER_PREFS_DIR/forms_Xlock\";
110c110
<              print \"*\" XLOCK \"Command	Exec $ANOTHERLEVELUP/bin/kill-all-proc xlock; \\\"exec\\\" xlock -nice $NICELEVEL -mode \\\$(Option) -nolock -inroot -enablesaver\";
---
>              print \"*\" XLOCK \"Command	Exec $ANOTHERLEVELUP/bin/kill-all-proc xlock; \\\"exec\\\" xlock -nice $NICELEVEL -mode \$(Option) -nolock -inroot -enablesaver\";
114c114
<            print \"*\" XLOCK \"Command Exec \\\"exec\\\" xlock -nice $NICELEVEL -mode \\\$(Option) -nolock -enablesaver -mousemotion\";
---
>            print \"*\" XLOCK \"Command Exec \\\"exec\\\" xlock -nice $NICELEVEL -mode \$(Option) -nolock -enablesaver -mousemotion\";
160a161
> # This might be function or module, depending on pager bug
Only in 071016/AnotherLevel/bin: xlock-07-07-17
diff -r 020729/AnotherLevel/bin/xresources 071016/AnotherLevel/bin/xresources
6c6
< # Copyright John Latham 1999, 2001, 2002
---
> # Copyright John Latham 1999, 2001, 2002, 2003, 2004, 2006
36,40c36,48
<   case `strings \`which nedit\` | grep "NEdit Version"` in
<   *5.0*) NeditVersion=5.0 ;;
<   *5.1*) NeditVersion=5.1 ;;
<   *5.2*) NeditVersion=5.2 ;;
<   *)     NeditVersion=5.0 ;;
---
> 
>   NeditVersion=`nedit -version 2>/dev/null | head -1`
>   case $NeditVersion in
>   "NEdit Version "*.*) NeditVersion=`echo $NeditVersion | cut -f 3 -d " "` ;;
>   "NEdit "*.*)         NeditVersion=`echo $NeditVersion | cut -f 2 -d " "` ;;
>   *) case `strings \`which nedit\` | grep "NEdit Version"` in
>      *5.0*) NeditVersion=5.0 ;;
>      *5.1*) NeditVersion=5.1 ;;
>      *5.2*) NeditVersion=5.2 ;;
>      *5.3*) NeditVersion=5.3 ;;
>      *5.4*) NeditVersion=5.4 ;;
>      *)     NeditVersion=5.0 ;;
>      esac ;;
41a50
> 
70c79
<        | xrdb -merge
---
>        | grep -v "^#" | xrdb -merge
73c82,83
<     && xrdb -merge .fvwm2dirAllThemes/scripts_Xresources_XTerm
---
>     && grep -v "^#" .fvwm2dirAllThemes/scripts_Xresources_XTerm \
>        | xrdb -merge
76c86,87
<     && xrdb -merge .fvwm2dir/scripts_Xresources_XTerm_not_colours
---
>     && grep -v "^#" .fvwm2dir/scripts_Xresources_XTerm_not_colours \
>        | xrdb -merge
79,80c90,91
<     && xrdb -merge .fvwm2dirAllThemes/scripts_Xresources_XTerm_not_colours
< 
---
>     && grep -v "^#" .fvwm2dirAllThemes/scripts_Xresources_XTerm_not_colours \
>        | xrdb -merge
89c100,101
<     && xrdb -merge .fvwm2dir/scripts_Xresources_XTerm-TEMP
---
>     && grep -v "^#" .fvwm2dir/scripts_Xresources_XTerm-TEMP \
>     | xrdb -merge
92c104,105
<     && xrdb -merge .fvwm2dirAllThemes/scripts_Xresources_XTerm
---
>     && grep -v "^#" .fvwm2dirAllThemes/scripts_Xresources_XTerm \
>     | xrdb -merge
95c108,109
<     && xrdb -merge .fvwm2dir/scripts_Xresources_XTerm_not_colours-TEMP
---
>     && grep -v "^#" .fvwm2dir/scripts_Xresources_XTerm_not_colours-TEMP \
>     | xrdb -merge
98c112,113
<     && xrdb -merge .fvwm2dirAllThemes/scripts_Xresources_XTerm_not_colours
---
>     && grep -v "^#" .fvwm2dirAllThemes/scripts_Xresources_XTerm_not_colours \
>     | xrdb -merge
114c129
<                    echo -n "\\\" ;;
---
>                    echo -n "\\\\" ;;
diff -r 020729/AnotherLevel/decors/FVWM95 071016/AnotherLevel/decors/FVWM95
14c14
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003 and Red Hat Software, Inc
462,463c462,463
< ifdef(`WantCloseButton', `define(`ButtonAction2', `Close')')
< ifdef(`WantMaximizeButton', `define(`ButtonAction4', `FullMaximize')')
---
> ifdef(`WantCloseButton', `define(`ButtonAction2', `Function ButtonClose')')
> ifdef(`WantMaximizeButton', `define(`ButtonAction4', `Function ButtonFullMaximize')')
465,466c465,466
< ifdef(`WantTallMaximizeButton', `define(`ButtonAction8', `TallMaximize')')
< ifdef(`WantWideMaximizeButton', `define(`ButtonAction0', `WideMaximize')')
---
> ifdef(`WantTallMaximizeButton', `define(`ButtonAction8', `Function ButtonTallMaximize')')
> ifdef(`WantWideMaximizeButton', `define(`ButtonAction0', `Function ButtonWideMaximize')')
608a609,613
> 
> # I wish we could make mozilla appear at 0+0 without interaction
> # But at least make it appear without interaction
> Style Mozilla*	TILECASCADEPLACEMENT
> 
612,619c617,629
< Style "*"       MiniIcon mini-manuni.xpm
< Style "XTerm"	MiniIcon mini-xterm.xpm
< Style "Netscape" MiniIcon mini-nscape.xpm
< Style "nedit"	MiniIcon mini-edit.xpm
< Style "emacs"	MiniIcon mini-edit.xpm
< Style "Calendar" MiniIcon mini-clipboard.xpm
< Style "xcalc"	MiniIcon mini-calc.xpm
< Style "Ddd"	MiniIcon mini-roach.xpm
---
> Style "*"		MiniIcon mini-manuni.xpm
> Style "AcroRead"	MiniIcon mini-pdf.xpm
> Style "AWTapp"		MiniIcon mini-java.xpm
> Style "AWTdialog"	MiniIcon mini-java.xpm
> Style "Calendar"	MiniIcon mini-clipboard.xpm
> Style "Ddd"		MiniIcon mini-roach.xpm
> Style "emacs"		MiniIcon mini-edit.xpm
> Style "nedit"		MiniIcon mini-edit.xpm
> Style "Netscape"	MiniIcon mini-nscape.xpm
> Style "Mozilla"		MiniIcon mini-mozilla.xpm
> Style "Mozilla-bin"	MiniIcon mini-mozilla.xpm
> Style "xcalc"		MiniIcon mini-calc.xpm
> Style "XTerm"		MiniIcon mini-xterm.xpm
621d630
< Style "AcroRead" MiniIcon mini-pdf.xpm
diff -r 020729/AnotherLevel/decors/MWM 071016/AnotherLevel/decors/MWM
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003 and Red Hat Software, Inc
64a65,69
> 
> # I wish we could make mozilla appear at 0+0 without interaction
> # But at least make it appear without interaction
> Style Mozilla*	TILECASCADEPLACEMENT
> 
Only in 020729/AnotherLevel: fvwm2rc.apps.m4
Only in 071016/AnotherLevel: fvwm2rc.comp.animation.m4
Only in 071016/AnotherLevel: fvwm2rc.comp.animation.m4-07-07-05
Only in 071016/AnotherLevel: fvwm2rc.comp.animation.null.m4
diff -r 020729/AnotherLevel/fvwm2rc.comp.bellpitch.m4 071016/AnotherLevel/fvwm2rc.comp.bellpitch.m4
15c15
< # Copyright (C) John Latham 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 2002
diff -r 020729/AnotherLevel/fvwm2rc.comp.pager.m4 071016/AnotherLevel/fvwm2rc.comp.pager.m4
63,67c63
< ifdef(`USE_8859', `
< *FvwmPagerFont -BASIC_FONT-bold-r-*-*-10-*-*-*-*-*-iso8859-1
< ', `
< *FvwmPagerFont -BASIC_FONT-bold-r-*-*-10-*-*-*-*-*-*-*
< ')
---
> *FvwmPagerFont -*-GENERAL_FONT_FAMILY-bold-r-*-*-10-*-*-*-*-*-*-*
92a89
> + "I"	PipeRead "ANOTHERLEVEL/bin/kill-all-proc xload"
98a96
> + "I"	PipeRead "ANOTHERLEVEL/bin/kill-all-proc xload"
diff -r 020729/AnotherLevel/fvwm2rc.comp.wharf.m4 071016/AnotherLevel/fvwm2rc.comp.wharf.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003 and Red Hat Software, Inc
53c53,57
< *FvwmWharf Netscape netscape3.xpm Exec NETSCAPE_DEFAULT &
---
> 
> ifdef(`WEBBROWSER_DEFAULT', `
> *FvwmWharf WebBrowser mozicon50.xpm Exec WEBBROWSER_DEFAULT &
> ')
> 
diff -r 020729/AnotherLevel/fvwm2rc.comp.windowfocus.m4 071016/AnotherLevel/fvwm2rc.comp.windowfocus.m4
15c15
< # Copyright (C) John Latham 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 2001, 2002, 2007 and Red Hat Software, Inc
23a24,25
> + "I" Style "*" ClickToFocusPassesClick
> + "I" Style "*" ClickToFocusRaises
41a44
> + "I" Style "*" MouseFocusClickRaises
59a63
> + "I" Style "*" MouseFocusClickRaises
Only in 071016/AnotherLevel: fvwm2rc.comp.windowfocus.m4-07-09-13
diff -r 020729/AnotherLevel/fvwm2rc.comp.xbiff.m4 071016/AnotherLevel/fvwm2rc.comp.xbiff.m4
15c15
< # Copyright (C) John Latham 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 2001, 2002, 2007 and Red Hat Software, Inc
19a20,22
> # Use true as the program that does nothing.
> define(`XBIFFPROG', `true')
> IfProgramExists(`xbiff', `
20a24,31
> ')
> IfProgramExists(`xmailbox', `
> define(`XBIFFPROG', `xmailbox')
> ')
> IfProgramExists(`xlbiff', `
> define(`XBIFFPROG', `xlbiff')
> ')
> 
25a37,42
> ifelse(XBIFFPROG, `true', `
> define(`XBIFFNAME', `--NONE--')
> define(`XBIFFOPTIONS', `')
> define(`XBIFFWIDTHOVERALL', `0')
> ')
> 
29c46
< define(`XBIFFOPTIONS', `-geometry XBIFFGEOMETRY -bg "WINBACK_COLOR" -fg "WINFORE_COLOR" -xrm xbiff*fullPixmap:flagup -xrm xbiff*emptyPixmap:flagdown')
---
> define(`XBIFFOPTIONS', `-geometry XBIFFGEOMETRY -bg "WINBACK_COLOR" -fg "WINFORE_COLOR" -xrm xbiff*fullPixmap:ANOTHERLEVEL/BITMAPS/flagup -xrm xbiff*emptyPixmap:ANOTHERLEVEL/BITMAPS/flagdown')
42c59
< define(`XBIFFOPTIONS', `-geom +0+0 MAIL_SPOOL_DIR -bg "WINBACK_COLOR" -fg "WINFORE_COLOR" -file MAIL_SPOOL_DIR -scanCommand "frm %s | grep -v \"Mail System Internal Data\" | cat -n | sed \"s,^ *,,\" | sed \"s,	,: ,\" | tail"')
---
> define(`XBIFFOPTIONS', `-fade 5 -geom +0+0 MAIL_SPOOL_DIR -bg "WINBACK_COLOR" -fg "WINFORE_COLOR" -fn "-*-GENERAL_FONT_FAMILY-bold-r-*-*-14-*-*-*-*-*-*-*" -refresh 0 -file MAIL_SPOOL_DIR -scanCommand "frm %s | grep -v \"Mail System Internal Data\" | cat -n | sed \"s,^ *,,\" | sed \"s,	,: ,\" | tail"')
Only in 071016/AnotherLevel: fvwm2rc.comp.xbiff.m4-07-09-13
Only in 071016/AnotherLevel: fvwm2rc.comp.xbiff.m4-07-10-04
diff -r 020729/AnotherLevel/fvwm2rc.comp.xclock.m4 071016/AnotherLevel/fvwm2rc.comp.xclock.m4
15c15
< # Copyright (C) John Latham 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 2001, 2002, 2007 and Red Hat Software, Inc
17a18,19
> #Set the default
> IfProgramExists(`xclock', `
18a21,32
> ')
> IfProgramExists(`astime', `
> define(`XCLOCKPROG', `astime')
> ')
> IfProgramExists(`rclock', `
> define(`XCLOCKPROG', `rclock')
> ')
> IfProgramExists(`xdaliclock', `
> define(`XCLOCKPROG', `xdaliclock')
> ')
> 
> 
Only in 071016/AnotherLevel: fvwm2rc.comp.xclock.m4-07-09-13
diff -r 020729/AnotherLevel/fvwm2rc.components.m4 071016/AnotherLevel/fvwm2rc.components.m4
32a33,40
> 
> ifelse(WM_STYLE, `FVWM95', `
> ifdef(`WANT_ANIMATION_FEATURES', `
> readFile(`fvwm2rc.comp.animation')
> ', `
> readFile(`fvwm2rc.comp.animation.null')
> ')
> ')
diff -r 020729/AnotherLevel/fvwm2rc.decors.m4 071016/AnotherLevel/fvwm2rc.decors.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003, 2005 and Red Hat Software, Inc
63,65d62
< FvwmAlias(`FullMaximize',`Maximize 100 97')
< FvwmAlias(`TallMaximize',`Maximize 0 97')
< FvwmAlias(`WideMaximize',`Maximize 100 0')
100c97
< define(`StartNonInteractiveProgramInRxvt',`IfProgramExistsOrError(ProgramName($1),RXVT `-T $2\ --\ Use\ Meta-PgUp/Dn\ to\ Scroll -n $2 ifelse($3,,,`-name $3') -e sh -c "$1 && read waitforreturn"')')
---
> define(`StartNonInteractiveProgramInRxvt',`IfProgramExistsOrError(ProgramName($1),RXVT `-T $2\ --\ Use\ Meta-PgUp/Dn\ to\ Scroll -n $2 ifelse($3,,,`-name $3') -e sh -c "$1 ; read waitforreturn"')')
111a109,130
> 
> AddToFunc BasicFullMaximize
> + "I" Maximize 100 97
> 
> AddToFunc BasicTallMaximize
> + "I" Maximize 0 97
> 
> AddToFunc BasicWideMaximize
> + "I" Maximize 100 0
> 
> AddToFunc ButtonFullMaximize
> + "C" Function BasicFullMaximize
> 
> AddToFunc ButtonTallMaximize
> + "C" Function BasicTallMaximize
> 
> AddToFunc ButtonWideMaximize
> + "C" Function BasicWideMaximize
> 
> AddToFunc ButtonClose
> + "C" Close
> 
335,342c354,366
< IfElseProgramExists(`/usr/X11R6/bin/RunWM', `
< ifelse(WM_STYLE, `FVWM95', `',  `+  "FVWM 95"		ReallyRestartWm /usr/X11R6/bin/RunWM.Fvwm95')
< ifelse(WM_STYLE, `MWM', `',     `+  "Lesstif WM"	ReallyRestartWm /usr/X11R6/bin/RunWM.MWM')
< IfProgramExists(`afterstep',	`+  "AfterStep"		ReallyRestartWm /usr/X11R6/bin/RunWM.AfterStep')
< IfProgramExists(`wmaker',	`+  "WindowMaker"	ReallyRestartWm /usr/X11R6/bin/RunWM.WindowMaker')
< ', `
< ifelse(WM_STYLE, `FVWM95', `',  `+  "FVWM 95"		Function RestartFvwm95')
< ifelse(WM_STYLE, `MWM', `',     `+  "Lesstif WM"	Function RestartMwm')
---
> 
> ifelse(WM_STYLE, `FVWM95', `', `
> IfElseProgramExists(`/usr/X11R6/bin/RunWM.Fvwm95',     `+  "FVWM 95"           ReallyRestartWm /usr/X11R6/bin/RunWM.Fvwm95',
>                                                        `+  "FVWM 95"           Function RestartFvwm95')')
> ifelse(WM_STYLE, `MWM', `', `
> IfElseProgramExists(`/usr/X11R6/bin/RunWM.MWM',        `+  "Lesstif WM"        ReallyRestartWm /usr/X11R6/bin/RunWM.MWM',
>                                                        `+  "Lesstif WM"        Function RestartMwm')')
> 
> IfElseProgramExists(`usr/X11R6/bin/RunWM.AfterStep',   `+  "AfterStep"         ReallyRestartWm /usr/X11R6/bin/RunWM.AfterStep', `
> IfProgramExists(`afterstep',                           `+  "AfterStep"         Function RestartAfterStep')')
> 
> IfElseProgramExists(`usr/X11R6/bin/RunWM.WindowMaker', `+ "WindowMaker"        ReallyRestartWm /usr/X11R6/bin/RunWM.WindowMaker', `
> IfProgramExists(`wmaker',                              `+ "WindowMaker"        Function RestartWindowMaker')')
351c375,383
< ')
---
> 
> AddToFunc RestartAfterStep
> + "I" Exec echo AfterStep > USER_WM_STYLE
> + "I" Function ReallyRestartWm afterstep
> 
> AddToFunc RestartWindowMaker
> + "I" Exec echo WindowMaker > USER_WM_STYLE
> + "I" Function ReallyRestartWm wmaker
> 
Only in 071016/AnotherLevel: fvwm2rc.decors.m4-05-09-14
diff -r 020729/AnotherLevel/fvwm2rc.defines.m4 071016/AnotherLevel/fvwm2rc.defines.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003, 2007 and Red Hat Software, Inc
201a202,203
> # If we wanted line numbers on by default, we would have this geometry
> #define(`INITXEDITORNeditOPTIONS', `-geometry 80x48+5+97')
208,211c210
< #now netscape
< IfProgramExists(`netscape', `define(`NETSCAPE', `netscape')')
< IfProgramExists(`netscape-navigator', `define(`NETSCAPE', `netscape-navigator')')
< IfProgramExists(`netscape-communicator', `define(`NETSCAPE', `netscape-communicator')')
---
> #now netscape / mozilla
213,214c212,216
< define(`NETSCAPE_DEFAULT', `NETSCAPE NETSCAPEOPTIONS')
< define(`NETSCAPEOPTIONS', `-geometry +0+0 -no-about-splash')
---
> define(`WEBBROWSER_DEFAULTNetscapeOPTIONS', `-geometry +0+0 -no-about-splash')
> define(`WEBBROWSER_DEFAULTMozillaOPTIONS', `')
> define(`WEBBROWSER_DEFAULTOperaOPTIONS', `')
> define(`WEBBROWSER_DEFAULTFirefoxOPTIONS', `')
> define(`WEBBROWSER_DEFAULTThunderFireOPTIONS', `')
222c224
< define(`START_BROWSER')
---
> define(`START_WEBBROWSER')
294a297,354
> #Now see which web browsers are available
> 
> IfProgramExists(`netscape', `
> define(`WEBBROWSERNetscape', `netscape')
> define(`WEBBROWSER_DEFAULTNetscape',
>        `netscape WEBBROWSER_DEFAULTNetscapeOPTIONS')
> define(`WEBBROWSER_CHOICE', `Netscape')
> ')
> 
> IfProgramExists(`netscape-navigator', `
> define(`WEBBROWSERNetscape', `netscape-navigator')
> define(`WEBBROWSER_DEFAULTNetscape',
>        `netscape-navigator WEBBROWSER_DEFAULTNetscapeOPTIONS')
> define(`WEBBROWSER_CHOICE', `Netscape')
> ')
> 
> IfProgramExists(`netscape-communicator', `
> define(`WEBBROWSERNetscape', `netscape-communicator')
> define(`WEBBROWSER_DEFAULTNetscape',
>        `netscape-communicator WEBBROWSER_DEFAULTNetscapeOPTIONS')
> define(`WEBBROWSER_CHOICE', `Netscape')
> ')
> 
> IfProgramExists(`mozilla', `
> define(`WEBBROWSERMozilla', `mozilla')
> define(`WEBBROWSER_DEFAULTMozilla', `mozilla WEBBROWSER_DEFAULTMozillaOPTIONS')
> define(`WEBBROWSER_CHOICE', `Mozilla')
> ')
> 
> IfProgramExists(`opera', `
> define(`WEBBROWSEROpera', `opera')
> define(`WEBBROWSER_DEFAULTOpera', `opera WEBBROWSER_DEFAULTOperaOPTIONS')
> define(`WEBBROWSER_CHOICE', `Opera')
> ')
> 
> IfProgramExists(`firefox', `
> define(`WEBBROWSERFirefox', `firefox')
> define(`WEBBROWSER_DEFAULTFirefox', `firefox WEBBROWSER_DEFAULTFirefoxOPTIONS')
> define(`WEBBROWSER_CHOICE', `Firefox')
> IfProgramExists(`thunderbird', `
> define(`WEBBROWSERThunderFire', `thunderbird & firefox')
> define(`WEBBROWSER_DEFAULTThunderFire', `thunderbird & firefox WEBBROWSER_DEFAULTThunderFireOPTIONS')
> define(`WEBBROWSER_CHOICE', `ThunderFire')
> ')
> ')
> 
> #Now get the users choice of web browser (if any)
> readFile(`scripts_WebBrowserChoice')
> 
> #Now define the web browser if available
> ifdef(`WEBBROWSER'WEBBROWSER_CHOICE, `
> define(`WEBBROWSER_PROGRAM', `WEBBROWSER'WEBBROWSER_CHOICE)
> define(`WEBBROWSER_BROWSE_URL', `WEBBROWSER'WEBBROWSER_CHOICE $1)
> define(`WEBBROWSER_DEFAULT', `WEBBROWSER_DEFAULT'WEBBROWSER_CHOICE)
> ', `
> define(`WEBBROWSER_BROWSE_URL', `RXVT -e sh -c "echo No browser defined, cannot browse $1; echo Press return to continue; read X"')
> ')
> 
431a492,494
> # N.B: this is the old Red Hat AnotherLevel definition, which is being phased
> # out, partly because FVWM 2.4 has a problem with TaskBar and Pager when there
> # is not a full set of hyphens in the font name
433a497,502
> 
> # This is the new AnotherLevelUp definition, which is being phased in, but:
> # a full review of fonts is intended in AnotherLevelUp, and this may 
> # may cause a wholesale change of approach when it happens.
> define(`GENERAL_FONT_FAMILY', helvetica)
> 
Only in 071016/AnotherLevel: fvwm2rc.defines.m4-07-09-12
diff -r 020729/AnotherLevel/fvwm2rc.defstyles.m4 071016/AnotherLevel/fvwm2rc.defstyles.m4
72a73,75
> ifdef(`LAYERS_AVAILABLE', `
> Style "gmc-desktop-icon"	Layer
> ')
diff -r 020729/AnotherLevel/fvwm2rc.forms.m4 071016/AnotherLevel/fvwm2rc.forms.m4
15c15
< # Copyright (C) John Latham 1998, 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1998, 1999, 2000, 2001, 2002, 2003, 2007 and Red Hat Software, Inc
114c114
< *AboutText              "AnotherLevelUp enhancements by John Latham, (C) 1998, 1999, 2000, 2001, 2002"
---
> *AboutText              "AnotherLevelUp enhancements by John Latham, (C) 1998 - 2007"
116c116
< *AboutText		"Department of Computer Science, Victoria University of Manchester, U.K."
---
> *AboutText		"School of Computer Science, The University of Manchester, U.K."
140c140
< *AboutCommand		Exec NETSCAPE ALU_WEB_SITE
---
> *AboutCommand		Exec WEBBROWSER_BROWSE_URL(ALU_WEB_SITE)
175c175
< *AcknowledgeCommand	Exec NETSCAPE http://www.digitalblasphemy.com
---
> *AcknowledgeCommand	Exec WEBBROWSER_BROWSE_URL(http://www.digitalblasphemy.com)
202c202
< foreach(APPLICATION,`(emacs,xemacs,xload,netscape,XTERM)',`
---
> foreach(APPLICATION,`(emacs,xemacs,xload,WEBBROWSER_PROGRAM,XTERM)',`
301a302
> 
303c304,312
< *CaptureCommand     CaptureCommand "$(file)" "$(Options)"
---
> # Must not use a function for CaptureCommand,
> # because of mouse grab during functions.
> # This configuration works with FVWM 2.2, 2.4 and 2.5
> *CaptureCommand     Function BusyCursorReadOff
> *CaptureCommand     Current [Capture] Iconify
> *CaptureCommand     PipeRead "xwd -out \"$(file)\" $(Options); >/dev/null"
> *CaptureCommand     Prev [Capture] Iconify
> *CaptureCommand     Function BusyCursorReadDefault
> 
310,317d318
< AddToFunc CaptureCommand
< ifdef(`PIPEREADKEEPSMOUSE', `
< + "I" Exec exec xwd -out "$0" $1
< ', `
< + "I" Current [Capture] Iconify
< + "I" PipeRead "exec xwd -out \"$0\" $1 > /dev/null"
< + "I" Prev [Capture] Iconify
< ')
diff -r 020729/AnotherLevel/fvwm2rc.init.m4 071016/AnotherLevel/fvwm2rc.init.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003 and Red Hat Software, Inc
53a54
> + "I" Module FvwmCommandS
103c104,105
< + "I" Exec XTERM +ut -geometry +PctOfScreenInPixelsX(15)+PctOfScreenInPixelsY(15)
---
> #+ "I" Exec XTERM +ut -geometry +PctOfScreenInPixelsX(15)+PctOfScreenInPixelsY(15)
> + "I" Exec XTERM +ut -geometry +0+PctOfScreenInPixelsY(15)
106,109c108,115
< syscmd(`test "$USER" = "root"')dnl
< ifelse(sysval,0,+ "I" Exec control-panel,)
< ifdef(`START_BROWSER', `+ "I" Exec NETSCAPE_DEFAULT
< ')dnl
---
> # control-panel has disappeared by RH7.3, so it is time to remove this.
> #syscmd(`test "$USER" = "root"')dnl
> #ifelse(sysval,0,+ "I" Exec control-panel,)
> 
> ifdef(`START_WEBBROWSER', `
> ifdef(`WEBBROWSER_DEFAULT', `
> + "I" Exec WEBBROWSER_DEFAULT
> ')')
128a135,146
> + "I" Function ExecuteAdvancedInitialScript
> 
> ####################################################################
> # Advanced initial script
> 
> AddToFunc EditAdvancedInitialScript
> + "I" Exec ANOTHERLEVEL/bin/advanced-initial-script "XEDITOR"
> 
> AddToFunc ExecuteAdvancedInitialScript
> + "I" Exec ANOTHERLEVEL/bin/advanced-initial-script -execute
> 
> 
176c194
< + "I" PipeRead "ANOTHERLEVEL/bin/reprocess-components \"$0\" \"ANOTHERLEVEL\" \"WIDTH\" \"USER\" \"HOME\" \"USER_PREFS_DIR\" \"USER_ALL_THEMES_PREFS_DIR\" \"NICELEVEL\" \"BASIC_FONT\" \"SMALL_FONT\" \"WINFORE_COLOR\" \"WINBACK_COLOR\" \"HILIGHTFORE_COLOR\" \"HILIGHTBACK_COLOR\" \"MAIL_SPOOL_DIR\" \"XTERM\" \"NETSCAPE_DEFAULT\" \"FVWM_VERSION\" "
---
> + "I" PipeRead "ANOTHERLEVEL/bin/reprocess-components \"$0\" \"ANOTHERLEVEL\" \"WIDTH\" \"USER\" \"HOME\" \"USER_PREFS_DIR\" \"USER_ALL_THEMES_PREFS_DIR\" \"NICELEVEL\" \"GENERAL_FONT_FAMILY\" \"BASIC_FONT\" \"SMALL_FONT\" \"WINFORE_COLOR\" \"WINBACK_COLOR\" \"HILIGHTFORE_COLOR\" \"HILIGHTBACK_COLOR\" \"MAIL_SPOOL_DIR\" \"XTERM\" \"WEBBROWSER_DEFAULT\" \"FVWM_VERSION\" "
Only in 071016/AnotherLevel: fvwm2rc.javabugsworkaround.m4
diff -r 020729/AnotherLevel/fvwm2rc.keys.m4 071016/AnotherLevel/fvwm2rc.keys.m4
15c15
< # Copyright (C) John Latham 1999 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2005 and Red Hat Software, Inc
90,91c90,91
< Key Up		A	CS	TallMaximize
< Key Right	A	CS	WideMaximize
---
> Key Up		A	CS	Function BasicTallMaximize
> Key Right	A	CS	Function BasicWideMaximize
diff -r 020729/AnotherLevel/fvwm2rc.m4 071016/AnotherLevel/fvwm2rc.m4
43c43,44
< divert
---
> divert(1)dnl
> # Divert to be able to discard initial stuff if using the cache
202,203c203,205
< # Using a cache file
< # If settings have not changed since last time, then just copy saved file
---
> # Read the release date as put on the start menu
> include(ANOTHERLEVEL`/version-release.m4')
> #`ALU_VERSION'=ALU_VERSION
205,207c207,209
< changequote(,)
< define(ALU_RC_FILE, esyscmd(echo -n `ls -t /tmp/fvwmrc*|head -1`))
< changequote(`,')
---
> readFile(`fvwm2rc.hostvariants')dnl
> divert(1)dnl
> # Divert to be able to discard initial stuff if using the cache 
209c211,212
< readFile(`fvwm2rc.hostvariants')
---
> # Using a cache file
> # If settings have not changed since last time, then just copy saved file
210a214
> changecom(%%%)
213,214c217,218
< define(`CACHE_FILE', USER_PREFS_DIR`/0-cache-'HOSTVARIANT)
< define(`CACHE_SIGNATURE_FILE', USER_PREFS_DIR`/0-cache-'HOSTVARIANT`-signature')
---
> define(`CACHE_FILE', USER_PREFS_DIR`/0-cache-'HOSTVARIANT-WIDTH)
> define(`CACHE_SIGNATURE_FILE', USER_PREFS_DIR`/0-cache-'HOSTVARIANT-WIDTH`-signature')
215a220
> # See if settings stored in cache signature are now different
218c223
< OSTYPE VERSION RELEASE
---
> OSTYPE ALU_VERSION VERSION RELEASE
224c229,234
< ifelse(esyscmd(ls -t USER_ALL_THEMES_PREFS_DIR/[a-zA-Z]* USER_PREFS_DIR/[a-zA-Z]* CACHE_FILE ANOTHERLEVEL/version-release.m4 2>/dev/null|head -1),
---
> # Cache settings are not changed.
> # Now check the cache file is complete.
> ifelse(esyscmd(tail -1 CACHE_FILE 2>/dev/null), `#End of cache
> ', `
> # Now check cache file is the latest file in user directory.
> ifelse(esyscmd(ls -t USER_ALL_THEMES_PREFS_DIR/[a-zA-Z]* USER_PREFS_DIR/[a-zA-Z]* CACHE_FILE 2>/dev/null|head -1),
226a237
> # Great! Use the cache file: change local settings, then output it and exit.
228,229c239,240
< #esyscmd(sed "s|SetEnv ANOTHERLEVELUPTTY .*|SetEnv ANOTHERLEVELUPTTY ANOTHERLEVELTTY|g" < CACHE_FILE > ALU_RC_FILE)dnl
< esyscmd(sed \
---
> define(`TempFile', maketemp(`/tmp/ALU-cache-XXXXXX'))
> syscmd(sed \
235c246,250
<   < CACHE_FILE > ALU_RC_FILE)dnl
---
>   < CACHE_FILE > TempFile)dnl
> # Switch to normal output and dump out the editted cache
> divert(0)dnl
> undivert(TempFile)dnl
> syscmd(rm TempFile)dnl
237,239c252,260
< ')
< ')
< ')
---
> ')dnl
> ')dnl
> ')dnl
> ')dnl
> changecom(#)
> # switch to normal output
> divert(0)
> # Output the stuff delayed so far
> undivert(1)
251a273
> # Not using the cache file
275,277d296
< # Read the release date as put on the start menu
< include(ANOTHERLEVEL`/version-release.m4')
< 
280c299
< # This is ued by error file monitor to find most recent restart text
---
> # This is used by error file monitor to find most recent restart text
308a328
> define(`XSNOW_OPTIONS2', esyscmd(`echo "'XSNOW_OPTIONS2`"|sed "s,-slc [a-z]*,,g"'))
313,316d332
< #Now the most general user options
< readFile(`fvwm2rc.options')
< 
< 
335a352,357
> ###############################################################################
> #Now the most general user options
> readFile(`fvwm2rc.options')
> 
> 
> ###############################################################################
366a389,398
> AddToFunc "SessionInitFunction"
> + "I" SetupFunction
> + "I" StartupFunction
> + "I" EndSetupFunction
> 
> AddToFunc "SessionRestartFunction"
> + "I" SetupFunction
> + "I" EndSetupFunction
> 
> 
417c449,458
< # Save output file to cache
---
> # Save output file to cache (if enabled)
> # grep out all the comments, and if that succeeds, add #End of cache on end.
> # also save the cache signature
> 
> # The last matching file in /tmp is assumed to be the file being produced
> # by M4 -- this is not reliable enough! ???
> changequote(,)
> define(ALU_RC_FILE, esyscmd(echo -n `ls -t /tmp/fvwmrc*|head -1`))
> changequote(`,')
> 
420c461
< syscmd(egrep -v "^ *#|^ *$" ALU_RC_FILE > CACHE_FILE)
---
> syscmd((egrep -v "^ *#|^ *$" ALU_RC_FILE && echo "#End of cache" ) > CACHE_FILE)
424c465
<        echo "OSTYPE VERSION RELEASE" >> CACHE_SIGNATURE_FILE;
---
>        echo "OSTYPE ALU_VERSION VERSION RELEASE" >> CACHE_SIGNATURE_FILE;
Only in 071016/AnotherLevel: fvwm2rc.m4-07-09-13
diff -r 020729/AnotherLevel/fvwm2rc.menus.feelsettings.m4 071016/AnotherLevel/fvwm2rc.menus.feelsettings.m4
36c36
< `MenuAndButtonEntryLM(&Auto Raise,raise2,hand_up_3d,COMP_AUTORAISE_MENU_ENTRY)')
---
> `MenuAndButtonEntryLM(Auto &Raise,raise2,hand_up_3d,COMP_AUTORAISE_MENU_ENTRY)')
39a40,42
> 
> ifdef(`COMP_ANIMATION_MENU_ENTRY',
> `MenuAndButtonEntryLM(&Animation Features,cat,,COMP_ANIMATION_MENU_ENTRY)')
diff -r 020729/AnotherLevel/fvwm2rc.menus.m4 071016/AnotherLevel/fvwm2rc.menus.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003 and Red Hat Software, Inc
55d54
< 
71c70
< + "A.L.U. (ALU_RELEASE)... MiniTitleIcon(manuni)" Function PopupStoredPreferences
---
> + "A.L.U. (ALU_VERSION)... MiniTitleIcon(manuni)" Function PopupStoredPreferences
79c78,80
< MenuAndButtonEntryLM(New &Netscape,nscape,,Exec  NETSCAPE_DEFAULT)
---
> ifdef(`WEBBROWSER_DEFAULT', `
> MenuAndButtonEntryLM(New Web &Browser (WEBBROWSER_CHOICE),www,,Exec WEBBROWSER_DEFAULT)
> ')
83a85,89
> ifdef(`WANT_JAVA_BUG_WORK_AROUNDS', `
> readFile(`fvwm2rc.javabugsworkaround')
> MenuAndButtonEntryLM(&Java bugs work arounds,java,,PopUp JavaBugWorkAroundsMenu)
> ')
> 
89c95
< MenuAndButtonEntryLM(My &Favourites,run,,Popup FavouritesAndShellBrowserMenu)
---
> MenuAndButtonEntryLM(Shell browser and &Favourites,run,,Popup FavouritesAndShellBrowserMenu)
112,114c118,120
< 
< # seek for big applications already on disk...
< readFile(`fvwm2rc.apps')
---
> # Now defunct
> # # seek for big applications already on disk...
> # readFile(`fvwm2rc.apps')
diff -r 020729/AnotherLevel/fvwm2rc.menus.preferences.m4 071016/AnotherLevel/fvwm2rc.menus.preferences.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2003 and Red Hat Software, Inc
66c66
< MenuAndButtonEntryLM(&Initial Netscape,nscape,,FvwmScript InitialWindowsSetUpSmall)
---
> MenuAndButtonEntryLM(&Initial Windows,windows,windows,FvwmScript InitialWindowsSetUpSmall)
68a69
> MenuAndButtonEntryLM(&Web Browser Choice,www,,FvwmScript WebBrowserChoice)
diff -r 020729/AnotherLevel/fvwm2rc.menus.systemutilities.m4 071016/AnotherLevel/fvwm2rc.menus.systemutilities.m4
24c24
< MenuAndButtonEntryLM(&Root shell,penguin,,Exec StartProgramInColorXterm(sh -c su,"Root Window"))
---
> MenuAndButtonEntryLM(&Root shell,penguin,,Exec StartProgramInColorXterm(sh -c "su -","Root Window"))
28c28
< MenuAndButtonEntryLM(&Msgs,doc1,,Exec nice -NICELEVEL RXVT -geometry 80x8+520-2 -T Msgs -fn SMALL_FONT -e nice -NICELEVEL tail -8 -f MESSAGE_LOG)
---
> MenuAndButtonEntryLM(&Msgs,doc1,,Exec nice -NICELEVEL RXVT -geometry 80x8+0+0 -T Msgs -fn SMALL_FONT -e nice -NICELEVEL less +F MESSAGE_LOG)
diff -r 020729/AnotherLevel/fvwm2rc.menus.windowoperations.m4 071016/AnotherLevel/fvwm2rc.menus.windowoperations.m4
36,38c36,38
< MenuAndButtonEntryLM(Ma&ximize/Reset,maxfull,,FullMaximize)
< MenuAndButtonEntryLM(Maximize &Tall/Reset,maxtall,,TallMaximize)
< MenuAndButtonEntryLM(Maximize &Wide/Reset,maxwide,,WideMaximize)
---
> MenuAndButtonEntryLM(Ma&ximize/Reset,maxfull,,Function BasicFullMaximize)
> MenuAndButtonEntryLM(Maximize &Tall/Reset,maxtall,,Function BasicTallMaximize)
> MenuAndButtonEntryLM(Maximize &Wide/Reset,maxwide,,Function BasicWideMaximize)
80c80
< + "Ma&ximize"       		FullMaximize
---
> + "Ma&ximize"       		Function BasicFullMaximize
diff -r 020729/AnotherLevel/fvwm2rc.modules.m4 071016/AnotherLevel/fvwm2rc.modules.m4
15c15
< # Copyright (C) John Latham 1999, 2000, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2000, 2001, 2002, 2007 and Red Hat Software, Inc
84a85,86
> 
> changecom(%%%)
86,87c88,91
< *FvwmTaskBar: IconFore MENUFORE_COLOR
< *FvwmTaskBar: IconBack MENUBACK_COLOR
---
> *FvwmTaskBar: IconFore White
> *FvwmTaskBar: IconBack Black
> #*FvwmTaskBar: IconFore Black
> #*FvwmTaskBar: IconBack White
88a93
> changecom(#)
105,112c110,118
< ifdef(`USE_8859', `
< *FvwmTaskBarFont -BASIC_FONT-medium-r-*-*-FONT_SIZE-*-*-*-*-*-iso8859-1
< *FvwmTaskBarSelFont -BASIC_FONT-bold-r-*-*-FONT_SIZE-*-*-*-*-*-iso8859-1
< ', `
< *FvwmTaskBarFont -BASIC_FONT-medium-r-*-*-FONT_SIZE-*-*-*-*-*-*-*
< *FvwmTaskBarSelFont -BASIC_FONT-bold-r-*-*-FONT_SIZE-*-*-*-*-*-*-*
< ')
< *FvwmTaskBarAction Click1 Focus,Iconify -1,Focus,Raise
---
> 
> #*FvwmTaskBarFont -*-GENERAL_FONT_FAMILY-medium-r-*-*-FONT_SIZE-*-*-*-*-*-*-*
> # Make it bold so that white on black shows up better
> *FvwmTaskBarFont -*-GENERAL_FONT_FAMILY-bold-r-*-*-FONT_SIZE-*-*-*-*-*-*-*
> *FvwmTaskBarSelFont -*-GENERAL_FONT_FAMILY-bold-r-*-*-FONT_SIZE-*-*-*-*-*-*-*
> 
> # Advised in 2.4 to not use comma style in Click actions
> #*FvwmTaskBarAction Click1 Focus,Iconify -1,Focus,Raise
> *FvwmTaskBarAction Click1 Function TaskBarActionClick1
116,117c122,126
< *FvwmTaskBarAction Click2 Focus,Iconify 1,Prev [!FvwmTaskBar Maximized !Iconic] FullMaximize,Iconify -1,FullMaximize,Focus
< *FvwmTaskBarAction Click3 Focus,Iconify 1
---
> #*FvwmTaskBarAction Click2 Focus,Iconify 1,Prev [!FvwmTaskBar Maximized !Iconic] FullMaximize,Iconify -1,FullMaximize,Focus,Raise
> #fvwm2.5 -- now need this
> *FvwmTaskBarAction Click2 Function TaskBarActionClick2
> #*FvwmTaskBarAction Click3 Focus,Iconify 1
> *FvwmTaskBarAction Click3 Function TaskBarActionClick3
118a128
> *FvwmTaskBarShowTransients
123c133
< *FvwmTaskBarStartName Start
---
> *FvwmTaskBarStartName Main
134a145,164
> 
> 
> AddToFunc TaskBarActionClick1
> + "I" Focus
> + "I" Iconify -1
> + "I" Focus
> + "I" Raise
> 
> AddToFunc TaskBarActionClick2
> + "I" Focus
> + "I" Iconify 1
> + "I" Prev [!FvwmTaskBar Maximized !Iconic] Function BasicFullMaximize
> + "I" Iconify -1
> + "I" Function BasicFullMaximize
> + "I" Focus
> 
> AddToFunc TaskBarActionClick3
> + "I" Focus
> + "I" Iconify 1
> 
Only in 071016/AnotherLevel: fvwm2rc.modules.m4-07-09-13
diff -r 020729/AnotherLevel/fvwm2rc.mouse.m4 071016/AnotherLevel/fvwm2rc.mouse.m4
60a61,68
> 
> Mouse 0		R	A	Nop
> 
> ifdef(`UseRootMouseDisable', `
> Mouse 1		R   	A       PipeRead "ANOTHERLEVEL/bin/time-enabled-command Menu StartMenu Nop"
> Mouse 2		R	A	PipeRead "ANOTHERLEVEL/bin/time-enabled-command WindowList Alphabetic"
> Mouse 3		R	A	PipeRead "ANOTHERLEVEL/bin/time-enabled-command Menu ROOT_MENU Nop"
> ', `
62c70
< Mouse 2		R	A	WindowList
---
> Mouse 2		R	A	WindowList Alphabetic
63a72
> ')
diff -r 020729/AnotherLevel/fvwm2rc.storedprefs.m4 071016/AnotherLevel/fvwm2rc.storedprefs.m4
15c15
< # Copyright (C) John Latham 1999, 2001, 2002 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2001, 2002, 2003 and Red Hat Software, Inc
66c66
< + "I"  Exec NETSCAPE ALU_WEB_SITE_THEMES
---
> + "I"  Exec WEBBROWSER_BROWSE_URL(ALU_WEB_SITE_THEMES)
diff -r 020729/AnotherLevel/fvwm2rc.welcome.m4 071016/AnotherLevel/fvwm2rc.welcome.m4
34c34
< *WelcomeText	"A warm welcome to AnotherLevelUp - a FVWM2 configuration"
---
> *WelcomeText	"A warm welcome to AnotherLevelUp - a configuration for FVWM"
Only in 071016/AnotherLevel: javabugsworkaround
Only in 071016/AnotherLevel/scripts: AdvancedInitialScript
diff -r 020729/AnotherLevel/scripts/InitialWindowsSetUp 071016/AnotherLevel/scripts/InitialWindowsSetUp
14c14
< # Copyright (C) John Latham 1999 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2002, 2003, 2007
57,59c57,67
< 
<   ChangeTitle 15 {Start Browser (Netscape)}
<   Set $TMP = {START_BROWSER}
---
>   Set $WebBrowser = (GetOutput {grep WEBBROWSER_CHOICE .fvwm2dir/scripts_WebBrowserChoice 2>/dev/null | cut -f3 -d"\`" | cut -f1 -d "'" } 1 1)
>   If $WebBrowser == {None} Then
>   Begin
>    HideWidget 15
>    HideWidget 45
>   End
>   If $WebBrowser == {} Then
>     Set $WebBrowser = {ThunderFire}
>   Set $Tmp = {Start Web Browser (} $WebBrowser { - see choices on Preferences menu)}
>   ChangeTitle 15 $Tmp
>   Set $TMP = {START_WEBBROWSER}
208c216
<    Set $TMP2={START_BROWSER}
---
>    Set $TMP2={START_WEBBROWSER}
210c218
<    Set $TMP2={NETSCAPEOPTIONS}
---
>    Set $TMP2={WEBBROWSER_DEFAULT} $WebBrowser {OPTIONS}
295c303
<     Set $TMP={NETSCAPEOPTIONS}
---
>     Set $TMP2={WEBBROWSER_DEFAULT} $WebBrowser {OPTIONS}
348c356
<     Set $TMP={NETSCAPEOPTIONS}
---
>     Set $TMP2={WEBBROWSER_DEFAULT} $WebBrowser {OPTIONS}
425a434,450
> 
> Widget 9
> Property
>  Size 50 30
>  Position 870 560
>  Type PushButton
>  Title {Edit Advanced Script}
> Main
>  Case message of
>   SingleClic :
>   Begin
>     Do {FvwmScript AdvancedInitialScript}
>     Do {Exec $ANOTHERLEVELUP/bin/kill-all-fvwm-script InitialWindowsSetUp}
>     Quit
>   End
> End
> 
Only in 071016/AnotherLevel/scripts: InitialWindowsSetUp-07-09-16
diff -r 020729/AnotherLevel/scripts/InitialWindowsSetUpSmall 071016/AnotherLevel/scripts/InitialWindowsSetUpSmall
14c14
< # Copyright (C) John Latham 2000 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 2000, 2002, 2003
64,66c64,74
< 
<   ChangeTitle 15 {Start Browser (Netscape)}
<   Set $TMP = {START_BROWSER}
---
>   Set $WebBrowser = (GetOutput {grep WEBBROWSER_CHOICE .fvwm2dir/scripts_WebBrowserChoice 2>/dev/null | cut -f3 -d"\`" | cut -f1 -d "'" } 1 1)
>   If $WebBrowser == {None} Then
>   Begin
>    HideWidget 15
>    HideWidget 45
>   End
>   If $WebBrowser == {} Then
>     Set $WebBrowser = {ThunderFire}
>   Set $Tmp = {Start WebBrowser (} $WebBrowser { - see choices on Preferences menu)}
>   ChangeTitle 15 $Tmp
>   Set $TMP = {START_WEBBROWSER}
217c225
<    Set $TMP2={START_BROWSER}
---
>    Set $TMP2={START_WEBBROWSER}
219c227
<    Set $TMP2={NETSCAPEOPTIONS}
---
>    Set $TMP2={WEBBROWSER_DEFAULT} $WebBrowser {OPTIONS}
306c314
<     Set $TMP={NETSCAPEOPTIONS}
---
>     Set $TMP={WEBBROWSER_DEFAULT} $WebBrowser {OPTIONS}
360c368
<     Set $TMP={NETSCAPEOPTIONS}
---
>     Set $TMP={WEBBROWSER_DEFAULT} $WebBrowser {OPTIONS}
436a445,460
>   End
> End
> 
> Widget 9
> Property
>  Size 50 30
>  Position 200 260
>  Type PushButton
>  Title {Edit Advanced Script}
> Main
>  Case message of
>   SingleClic :
>   Begin
>     Do {FvwmScript AdvancedInitialScript}
>     Do {Exec $ANOTHERLEVELUP/bin/kill-all-fvwm-script InitialWindowsSetUp}
>     Quit
Only in 071016/AnotherLevel/scripts: InitialWindowsSetUpSmall-07-09-16
diff -r 020729/AnotherLevel/scripts/ScreenSetup 071016/AnotherLevel/scripts/ScreenSetup
275a276
>  BackColor {Red}
283a285,290
>    Set $BColor = {#} (NumToHex (GetValue 20) 2) {0000}
>    ChangeBackColor 20 $BColor
>    Set $BColor = {#00} (NumToHex (GetValue 21) 2) {00}
>    ChangeBackColor 21 $BColor
>    Set $BColor = {#0000} (NumToHex (GetValue 22) 2) {}
>    ChangeBackColor 22 $BColor
298a306
>  BackColor {Green}
314a323
>  BackColor {Blue}
Only in 071016/AnotherLevel/scripts: WebBrowserChoice
Only in 071016/AnotherLevel/scripts: WebBrowserChoice-07-09-16
diff -r 020729/AnotherLevel/scripts/XSnow 071016/AnotherLevel/scripts/XSnow
14c14
< # Copyright (C) John Latham 1999 and Red Hat Software, Inc
---
> # Copyright (C) John Latham 1999, 2007 and Red Hat Software, Inc
209c209,211
<     ChangeTitle 22 {-slc black -santa 1 -santaspeed 2}
---
>     # 6/1/03: The -slc option is now obsolete
>     # ChangeTitle 22 {-slc black -santa 1 -santaspeed 2}
>     ChangeTitle 22 {-santa 1 -santaspeed 2}
244c246
<     Set $Input=(GetOutput {grep XSNOW_OPTIONS2 .fvwm2dir/scripts_XSnow 2>/dev/null| cut -f3 -d"\`" | cut -f1 -d "'" } 1 -1 )
---
>     Set $Input=(GetOutput {grep XSNOW_OPTIONS2 .fvwm2dir/scripts_XSnow 2>/dev/null| cut -f3 -d"\`" | cut -f1 -d "'" | sed "s,-slc [a-z]*,,g"} 1 -1 )
Only in 071016/AnotherLevel/scripts: XSnow-07-09-13
diff -r 020729/AnotherLevel/toggle-functions 071016/AnotherLevel/toggle-functions
14a15,19
> N,AllAnimation,All Animation Features,Function ToggleAllAnimationOn,Function ToggleAllAnimationOff,ON
> R,IconifyAnimation,Hide/Restore Animation,Function ToggleIconifyAnimationOn,Function ToggleIconifyAnimationOff,ON
> R,MaximizeAnimation,Maximize Animation,Function ToggleMaximizeAnimationOn,Function ToggleMaximizeAnimationOff,ON
> R,AddWindowAnimation,Add Window Animation,Function ToggleAddWindowAnimationOn,Function ToggleAddWindowAnimationOff,ON
> R,WindowShadeAnimation,Window Shade Animation,Function ToggleWindowShadeAnimationOn,Function ToggleWindowShadeAnimationOff,ON
20c25
< # R means started after restart and start up
---
> # R means started after restart and startup
26a32,34
> # September 2007: GMC obsolete if nautilus installed.
> 
> IfProgramExists(`nautilus', `', `
29c37
< + "I"	Exec gmc 2>/dev/null
---
> + "I"   Exec gmc 2>/dev/null
33c41,42
< + "I"	Exec ANOTHERLEVEL/bin/kill-all-proc gmc
---
> + "I"   Exec ANOTHERLEVEL/bin/kill-all-proc gmc
> ')
48a58
> + "I"	Style "Monitor of file*" Sticky
Only in 071016/AnotherLevel: toggle-functions-07-09-13
Only in 071016/AnotherLevel: ttt-WEBBROWSER_DEFAULT
Only in 071016/AnotherLevel: ttt.log
diff -r 020729/AnotherLevel/version-release.m4 071016/AnotherLevel/version-release.m4
1c1
< define(`ALU_RELEASE', `29/07/02-4')
---
> define(`ALU_VERSION', `16/10/07-1')
diff -r 020729/ICONS/README.gjb.originals 071016/ICONS/README.gjb.originals
49a50,67
> 
> -------------------------------------------
> 
> 15/9/03: An exception to the above: I have just copied the mini-icon
> 
> 	/usr/lib/mozilla-1.2.1/icons/mozicon16.xpm
> 
> to
> 	mini-mozilla.xpm
> 
> This does contain a copyright notice, which I have preserved. I hope
> mozilla.org does not mind this copy of convenience!
> 
> Ditto for
> 
> 	/usr/lib/mozilla-1.2.1/icons/mozicon50.xpm
> 
> -------------------------------------------
Only in 071016/ICONS: mini-book1.xpm
Only in 071016/ICONS: mini-book2.xpm
Only in 071016/ICONS: mini-books.xpm
Only in 071016/ICONS: mini-cat.xpm
Only in 071016/ICONS: mini-java.xpm
Only in 071016/ICONS: mini-mozilla.xpm
Only in 071016/ICONS: mini-ofolder.xpm
Only in 071016/ICONS: mini-shade.xpm
Only in 071016/ICONS: mini-www.xpm
Only in 071016/ICONS: mozicon50.xpm