Update ctwm to 3.8a.

Patch provided by maintainer, Rhialto in PR 35637.

    Changes from version 3.7 to 3.8
    -------------------------------

    1 - Global cleanup

	There were some variables shadowing others, things not being
	safely initialized, that sort of thing.
	[Richard Levitte]

    2 - Fixed several memory leaks found by
	"Nadav Har'El" <nyh@math.technion.ac.il>.
	[Olaf "Rhialto" Seibert]

    3 - Merged in the f.movetitlebar command. By default this is bound to
        alt-left-click in the titlebar.
	[Olaf "Rhialto" Seibert]

    4 - Fixed the following issues:
	Poking at the code, it looks like InitVirtualScreens() is called
	before the configuration file is parsed which would explain what
	I see since there's no attempt to create them after the config
	file read.

	Moving the call after the config parsing causes things to work.

	I've run into a few other issues that I fixed with the attached
	patch:

		- shadow menus on the right screen open the shadow on
		  the left screen
		- shadow menus on the left screen open on top of the
		  window
		- windows on the right screen disappear after startup
	[Todd Kover]

    5 - Adjustments to ctwm.man:
	I noticed a couple of small errors.

	One is that the window list arguments for the opaque
	keywords are now optional, are listed with square brackets
	in the man page.  The other is that the two Threshold
	keywords are shown in the man page as requiring curly-
	brackets, but they are not required or accepted in
	configuration files.
	[Ross Combs]

    6 - improve algoritm to deal with mismatched geometry of virtual
	screens

      - allow windows to be dragged from one virtual screen to another and
	have them switch workspaces appropriately

      - handle restarts properly with virtual screens, including preserving
	where windows were placed within workspaces regardless of which
	virtual screen a window was on; preserve across restarts
	[Todd Kover]

    7 - WMapCreateCurrentBackGround() and WMapCreateDefaultBackGround()
	would skip remaining virtual screens if not all parameters are present.

      - small type errors. [Olaf "Rhialto" Seibert].

    8 - There were some directives in the config file that wanted to set some
	setting for all virtual screens. However since that list is (now) only
	set up after parsing the config file, they failed to work.  Moreover,
	these settings were basically meant to be global to all virtual
	screens, so a better place for them is somewhere in *Scr.  They all
	related to the Workspace Manager, so I moved them from struct
	WorkSpaceWindow to struct WorkSpaceMgr.

	The affected directives are StartInMapState, WMgrVertButtonIndent,
	WMgrHorizButtonIndent, MapWindowCurrentWorkSpace,
	MapWindowDefaultWorkSpace.  The window and icon_name, even though not
	user-settable, were also moved.

	This is basically change #7 above done right.
	[Olaf "Rhialto" Seibert]

    9 - Re-introduced TwmWindow.oldvs, used to avoid calling
	XReparentWindow() when possibe (it messed up the stacking order
	of windows). However, maybe the use of .vs should be rethought a
	bit: in Vanish() it is now set to NULL with the old value kept
	in .oldvs.  However the window is still a child of the same vs.
	Maybe it is better not to set it to NULL and then, when *really*
	changing the virtual screen, .vs can be used instead of .oldvs.

	This whole "virtual screen" thing is unexplained in the manual,
	which even uses it as a synonym for "workspace" already in the
	introduction paragraph. (There also does not seem to be a way
	now to test virtual screens in captive windows) I suspect that
	all this causes lots of confusion, and when cleared up, can
	simplify the code a lot.

	I also fixed up the horrible indentation in the functions
	where I changed something.
	[Olaf "Rhialto" Seibert]

   10 - Fixed interaction between "inner" and "outer" workspace
	selection with "captive" windows. This was because the Gnome
	"_WIN_WORKSPACE" property is used in 2 conflicting ways: for
	client windows it indicates which workspace they are in, for
	root windows it indicates which workspace they show. Captive
	windows are both. Also, the initially selected inner workspace
	is now the first, not the same as the outer workspace (this had
	a different cause).
	[Olaf "Rhialto" Seibert]

   11 - Introduce Scr->XineramaRoot to store the root window that
	encompasses all virtual screen rootwindows. This further reduces
	any need to use RealRoot and/or CaptiveRoot.
	Add a schematic drawing that clarifies the relation between the
	various root-type windows.
	[Olaf "Rhialto" Seibert]

   12 - Get rid of all non-locale code and make I18N the silent default
	(doesn't have to be mentioned any more).
	THIS WILL BREAK CTWM ON OLDER (PRE-LOCALE) ENVIRONMENTS.
	I strongly recommend an upgrade to "post-locale" standards.
	[Richard Levitte]

   13 - Enhance RandomPlacement with a displacement argument, so the
	pseudo-radomness can be of displacements other than +30+30.
	Here's an example for a pretty funky displacement:

		RandomPlacement "on" "-30-100"

	[Richard Levitte]

   14 - Extend the Info window with the geometry seen from the lower
	right corner as well.
	[Richard Levitte]

   15 - Extend the pointer button specification for title buttons
	to take modifiers.
	As part of this change, the following title pointer button
	specification is deprecated:

		Button {j} : {function}

	in favor of the following, for consistency:

		Button {j} = {function}

	The old way still works, but is considered bad form and will
	be removed in ctwm 4.0.
	[Richard Levitte]

   16 - Fix position of buttons in Occupy window, to make them centered.
	(and spread the remaining space evenly in 4).
	[Olaf "Rhialto" Seibert]

   17 - "TwmWindow.group" was once apparently set to 0 when a window had
	no group leader but this was changed to pointing to its own
	window.  This resulted however in many places checking for both
	conditions, and several checking only for 0 which could not
	occur anymore. Changed it back to 0 (so we can now distinguish
	again windows that really indicate themselves as group leader,
	if we wish) and this gave rise to some simplifications.

	Also, there were various loops through all TwmWindows looking
	for a group leader (or a transientfor), I replaced them with
	GetTwmWindow() which uses the Xlib function XFindContext() which
	uses a hash table lookup. This should be more efficient.

	When you change the occupation of a group member window, it is
	now applied to the group leader (which in turn affects all
	members).

	I tried this with ExMH, the only program that uses a real group
	leader that I could find. Iconifying the leader unmaps the
	members. What should "squeezing" do? ExMH also has an icon
	window (see ICCCM 4.1.9, 3rd option) which behaves weirdly; this
	may be a bug in ExMH (see exmh-2.7.2/exmh.BUGS) even though fvwm
	somehow handles it better.
	[Olaf "Rhialto" Seibert]

   18 - When Squeezing a window group leader, unmap the member windows,
	just like happens with iconification.
	[Olaf "Rhialto" Seibert]

   19 - Simplifications c.q. de-duplications of code regarding the
	WorkSpaceManager and Occupation windows. This includes coding
	the layout of these windows only once instead of twice (at
	initialisation and when resizing). If it's wrong now at least it
	should be consistent.
	When changing occupation via functions like
	f.movetonextworkspace, also move complete window groups (just
	like when you do it via the Occupation window).
	Also fixed changing the occupation of the Occupation window.
	Documented (so far) undocumented possibility to edit the labels
	of workspaces on the fly (what use this is, I'm not sure).
	Removed some unused variables.
	[Olaf "Rhialto" Seibert]

   20 - Get rid of the USE_SESSION and X11R6 macros and make them the
	silent default.  Also cleaned out a few references to the macro
	X11R4, which hasn't been used for ages.
	THIS WILL BREAK CTWM ON OLDER (PRE-X11R6) ENVIRONMENTS.
	I strongly recommend an upgrade to a newer X11 release.
	[Richard Levitte]

   21 - Modified the random placement so a negative X displacement has
	the first "random" window start near the right edge instead of
	the right and a negative Y displacement has the first "random"
	window start near the bottom edge instead of the top.
	[Richard Levitte]

4 files changed, 17 insertions, 27 deletions

diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index 583699c930f..1a9e01ebac0 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:40 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/17 08:27:11 obache Exp $
 #
 
-DISTNAME=	ctwm-3.7
-PKGREVISION=	3
+DISTNAME=	ctwm-3.8a
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/
 
diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index 5d1b624f14f..e77a5a76c38 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2006/12/15 18:30:15 jdc Exp $
+$NetBSD: distinfo,v 1.13 2007/02/17 08:27:11 obache Exp $
 
-SHA1 (ctwm-3.7.tar.gz) = 6140e82ec23499146eaab5bf3bd592f92e95683e
-RMD160 (ctwm-3.7.tar.gz) = 9809df2555b3eb2bf0c46c041df8c1c089b67255
-Size (ctwm-3.7.tar.gz) = 1139461 bytes
-SHA1 (patch-aa) = aae47d907fea9d7e5164c5bac7cccc111e18b797
-SHA1 (patch-ac) = 8ccf1e319c0cbe1f2cc8cb941ffc7f8b45814118
+SHA1 (ctwm-3.8a.tar.gz) = c3a31d669bef7dd5ec78d89950c0e575d6c51c77
+RMD160 (ctwm-3.8a.tar.gz) = cc1c3c862c3cfb1d66593d9a95d28ec0bbbbaf3c
+Size (ctwm-3.8a.tar.gz) = 738226 bytes
+SHA1 (patch-ac) = bb4cbcb8e4a68d1f2844aa16e85918aa5368a869
diff --git a/wm/ctwm/patches/patch-aa b/wm/ctwm/patches/patch-aa
deleted file mode 100644
index 07d1195c5a1..00000000000
--- a/wm/ctwm/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/12/15 18:30:15 jdc Exp $
---- gnome.c.dist	2005-06-21 05:35:19.000000000 +0000
-+++ gnome.c	2006-12-15 11:24:46.000000000 +0000
-@@ -23,7 +23,7 @@
- 
- 
- void InitGnome (void) {
--  int curws = 1;
-+  long curws = 1;
-   virtualScreen *vs;
-   Atom _XA_WIN_SUPPORTING_WM_CHECK, _XA_WIN_PROTOCOLS,
-     _XA_WIN_PROTOCOLS_LIST[PROTOCOLS_COUNT], _XA_WIN_DESKTOP_BUTTON_PROXY;
diff --git a/wm/ctwm/patches/patch-ac b/wm/ctwm/patches/patch-ac
index 2d2e5e4de0b..36b21dad6b0 100644
--- a/wm/ctwm/patches/patch-ac
+++ b/wm/ctwm/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2005/10/13 20:20:55 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2007/02/17 08:27:11 obache Exp $
 
---- parse.c.dist	Tue Dec 11 16:38:52 2001
-+++ parse.c	Sat Mar  8 13:34:59 2003
-@@ -2097,7 +2097,7 @@
+--- parse.c.orig	2007-02-16 12:37:42.000000000 +0100
++++ parse.c	2007-02-16 12:37:58.000000000 +0100
+@@ -2128,11 +2128,7 @@
                  dup2(fids[1], 1);       /* stdout = pipe to parent */
                  /* get_defs("m4", dpy, display_name) */
                  tmp_file = m4_defs(dpy, display_name);
--                execlp("m4", "m4", "-s", tmp_file, "-", NULL);
+-                execlp("m4", "m4",
+-#if !defined(__NetBSD__)
+-			"-s",
+-#endif
+-			tmp_file, "-", NULL);
 +                execlp(PATH_TO_M4, "m4", "-s", tmp_file, "-", NULL);
+ 
                  /* If we get here we are screwed... */
                  perror("Can't execlp() m4");
-                 exit(124);