From dd6f1b6268ef1c44b5c46c93129d610f830f0637 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:43:15 +0000
Subject: [PATCH 01/45] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8cca39f..cf137eb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := wmx
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From dd9b4a031a34d24779bd0d928fd867a96fbc1d71 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo@fedoraproject.org>
Date: Tue, 2 Mar 2010 01:06:16 +0000
Subject: [PATCH 02/45] fixed directory ownership (BZ 569408)

---
 wmx.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wmx.spec b/wmx.spec
index 51b80cb..10663a3 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -49,10 +49,14 @@ configurable options.
 %defattr(-,root,root)
 %doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
-%{_datadir}/*
+%{_datadir}/%{name}
+%{_datadir}/xsessions/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Mar 01 2010 Gabriel Somlo <somlo@cmu.edu> 7-6
+- fixed directory ownership (BZ 569408)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 8b9bf9e09bb8573a771d770d9744b490e75a1780 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:23:19 +0000
Subject: [PATCH 03/45] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 import.log               |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cf137eb..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wmx
-# $Id$
-NAME := wmx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 324f196..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-wmx-7-1_fc10:HEAD:wmx-7-1.fc10.src.rpm:1231785276

From 700b0fb3252e405e54b642ad9bfa6495170d6840 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo@hedwig.ini.cmu.edu>
Date: Tue, 7 Dec 2010 13:59:28 -0500
Subject: [PATCH 04/45] explicitly link against libfontconfig (BZ 660741)

---
 .gitignore      | 2 ++
 Xclients.wmx.sh | 0
 sources         | 2 +-
 wmx.spec        | 7 +++++--
 4 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 Xclients.wmx.sh

diff --git a/.gitignore b/.gitignore
index d5912b7..9394757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 wmx-defaults-1.tar.gz
 wmx-7.tar.gz
+/wmx-7.tar.gz
+/wmx-defaults-1.tar.gz
diff --git a/Xclients.wmx.sh b/Xclients.wmx.sh
old mode 100755
new mode 100644
diff --git a/sources b/sources
index decc05b..2fbb285 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
 e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz
+a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
diff --git a/wmx.spec b/wmx.spec
index 10663a3..93ac183 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -28,7 +28,7 @@ configurable options.
 %patch1 -p1
 
 %build
-%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
+%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11 LIBS=-lfontconfig
 %{__make} %{?_smp_mflags}
 %{__cc} -o xnodecor %{SOURCE5} -Werror -lX11
 
@@ -54,6 +54,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Tue Dec 07 2010 Gabriel Somlo <somlo@cmu.edu> 7-7
+- explicitly link against libfontconfig (BZ 660741)
+
 * Mon Mar 01 2010 Gabriel Somlo <somlo@cmu.edu> 7-6
 - fixed directory ownership (BZ 569408)
 

From ec81a16f00dde5d3d68710a1576aeae9d7e5468c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 20:55:39 -0600
Subject: [PATCH 05/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 93ac183..3bdd964 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -54,6 +54,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Dec 07 2010 Gabriel Somlo <somlo@cmu.edu> 7-7
 - explicitly link against libfontconfig (BZ 660741)
 

From 0358deff303ff31374a3f4a93ef83c97a9ac839b Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo@hedwig.ini.cmu.edu>
Date: Mon, 9 Jan 2012 16:27:49 -0500
Subject: [PATCH 06/45] update to latest svn checkout

---
 .gitignore              |   1 +
 sources                 |   2 +-
 wmx-7-20120109svn.patch | 612 ++++++++++++++++++++++++++++++++++++++++
 wmx-7-cfg.patch         |  27 +-
 wmx-7-composite.patch   | 227 ---------------
 wmx.spec                |  20 +-
 xnodecor.c              | 141 ---------
 7 files changed, 647 insertions(+), 383 deletions(-)
 create mode 100644 wmx-7-20120109svn.patch
 delete mode 100644 wmx-7-composite.patch
 delete mode 100644 xnodecor.c

diff --git a/.gitignore b/.gitignore
index 9394757..f7ed618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ wmx-defaults-1.tar.gz
 wmx-7.tar.gz
 /wmx-7.tar.gz
 /wmx-defaults-1.tar.gz
+/wmx-defaults-2.tar.gz
diff --git a/sources b/sources
index 2fbb285..00e81f9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz
-a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
+70892929426891facc252520784d9840  wmx-defaults-2.tar.gz
diff --git a/wmx-7-20120109svn.patch b/wmx-7-20120109svn.patch
new file mode 100644
index 0000000..9883625
--- /dev/null
+++ b/wmx-7-20120109svn.patch
@@ -0,0 +1,612 @@
+diff -NarU5 wmx-7/Channel.C SVN/wm2-2012-01-09/trunk/wmx/Channel.C
+--- wmx-7/Channel.C	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Channel.C	2012-01-09 11:05:39.676384280 -0500
+@@ -16,96 +16,102 @@
+     { " ### ", "#   #", "#   #", " ### ", "#   #", "#   #", " ### " },
+     { " ### ", "#   #", "#   #", " ####", "    #", "   # ", " ##  " }
+ };
+ 
+ 
+-void WindowManager::flipChannel(Boolean statusOnly, Boolean flipDown,
+-				Boolean quickFlip, Client *push)
++Window WindowManager::createNumberWindow(int screen, const char *colour)
+ {
+-    int x, y, i, sc;
+-    if (!CONFIG_CHANNEL_SURF) return;
+-
+-    for (sc = 0; sc < screensTotal(); sc++)
+-    {
+-	if (!m_channelWindow[sc]) {
+-
+-	XColor nearest, ideal;
+-
+-	    if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
+-			      CONFIG_CHANNEL_NUMBER, &nearest, &ideal)) {
++    XColor nearest, ideal;
++            
++    if (!XAllocNamedColor(display(), DefaultColormap(display(), screen),
++                          colour, &nearest, &ideal)) {
+ 	    
+-		if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
+-				  "black", &nearest, &ideal)) {
++        if (!XAllocNamedColor(display(), DefaultColormap(display(), screen),
++                              "black", &nearest, &ideal)) {
+ 		
+-		fatal("Couldn't allocate green or black");
+-	    }
+-	}
+-
+-	XSetWindowAttributes wa;
+-	wa.background_pixel = nearest.pixel;
+-	wa.override_redirect = True;
+-	
+-	    m_channelWindow[sc] = XCreateWindow
+-		(display(), mroot(sc),
+-		 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent,
+-	     CopyFromParent, CWOverrideRedirect | CWBackPixel, &wa);
+-	}
++            fatal("Couldn't allocate requested numeral colour or black");
++        }
+     }
++            
++    XSetWindowAttributes wa;
++    wa.background_pixel = nearest.pixel;
++    wa.override_redirect = True;
++	
++    Window w = XCreateWindow
++        (display(), mroot(screen),
++         0, 0, 1, 1, 0, CopyFromParent, CopyFromParent,
++         CopyFromParent, CWOverrideRedirect | CWBackPixel, &wa);
+ 
+-    int nextChannel;
++    return w;
++}
+ 
+-    if (statusOnly) nextChannel = m_currentChannel;
+-    else {
+-	if (!flipDown) {
+-	    nextChannel = m_currentChannel + 1;
+-	    if (nextChannel > m_channels) nextChannel = 1;
+-	} else {
+-	    nextChannel = m_currentChannel - 1;
+-	    if (nextChannel < 1) nextChannel = m_channels;
+-	}
+-    }
+ 
++int WindowManager::shapeNumberWindow(Window w, int n, int minDigits)
++{
++    int i, x, y;
+     XRectangle r;
+     Boolean first = True;
+     char number[7];
+-    sprintf(number, "%d", nextChannel);
++    sprintf(number, "%0*d", minDigits, n);
+ 
+     for (i = 0; i < (int)strlen(number); ++i) {
+ 	for (y = 0; y < 7; ++y) {
+ 	    for (x = 0; x < 5; ++x) {
+ 		if (numerals[number[i]-'0'][y][x] != ' ') {
+-/*		    
+-		    r.x = i * 110 + x * 20; r.y = y * 20;
+-		    r.width = r.height = 20;
+- */      
++
+                     r.x = 10 + (i * 6 + x) * CONFIG_CHANNEL_NUMBER_SIZE;
+                     r.y = y * CONFIG_CHANNEL_NUMBER_SIZE;
+                     r.width = r.height = CONFIG_CHANNEL_NUMBER_SIZE;
+-                    for(sc = 0; sc < screensTotal(); sc++)
+-                    {
++
+ 		    XShapeCombineRectangles
+-                          (display(), m_channelWindow[sc], ShapeBounding,
++                          (display(), w, ShapeBounding,
+                            0, 0, &r, 1, first ? ShapeSet : ShapeUnion,
+                            YXBanded);
+-                    }
++
+ 		    first = False;
+ 		}
+ 	    }
+ 	}
+     }
+ 
+-    for(sc = 0; sc < screensTotal(); sc++) {
+-/*
+-        XMoveResizeWindow(display(), m_channelWindow[sc],
+-			  DisplayWidth(display(), sc) - 30 -
+-		      110 * strlen(number), 30, 500, 160);
+- */
++    return (5 * CONFIG_CHANNEL_NUMBER_SIZE + 10) * strlen(number);
++}
++    
++    
++void WindowManager::flipChannel(Boolean statusOnly, Boolean flipDown,
++				Boolean quickFlip, Client *push)
++{
++    int wid, i, sc;
++    if (!CONFIG_CHANNEL_SURF) return;
++
++    for (sc = 0; sc < screensTotal(); sc++) {
++	if (!m_channelWindow[sc]) {
++            m_channelWindow[sc] = createNumberWindow(sc, CONFIG_CHANNEL_NUMBER);
++	}
++    }
++
++    int nextChannel;
++
++    if (statusOnly) nextChannel = m_currentChannel;
++    else {
++	if (!flipDown) {
++	    nextChannel = m_currentChannel + 1;
++	    if (nextChannel > m_channels) nextChannel = 1;
++	} else {
++	    nextChannel = m_currentChannel - 1;
++	    if (nextChannel < 1) nextChannel = m_channels;
++	}
++    }
++
++    for (sc = 0; sc < screensTotal(); sc++) {
++
++        wid = shapeNumberWindow(m_channelWindow[sc], nextChannel, 1);
+ 
+         XMoveResizeWindow(display(), m_channelWindow[sc],
+-                          DisplayWidth(display(), sc) - 30 -
+-                          (5 * CONFIG_CHANNEL_NUMBER_SIZE + 10) *
+-                          strlen(number), 30, 500, 160);
++                          DisplayWidth(display(), sc) - 30 - wid,
++                          30, 500, 160);
++
+ 	XMapRaised(display(), m_channelWindow[sc]);
+     }
+ 
+     if (!statusOnly) {
+ 
+@@ -228,5 +234,38 @@
+     if (m_channels <= channel) {
+         m_channels = channel + 1;
+         netwmUpdateChannelList();
+     }
+ }
++
++void
++WindowManager::updateClock()
++{
++    time_t t;
++    struct tm *lt;
++
++    fprintf(stderr, "updateClock\n");
++
++    time(&t);
++    lt = localtime(&t);
++    
++    if (!m_clockWindow[0]) {
++        m_clockWindow[0] = createNumberWindow(0, CONFIG_CLOCK_NUMBER);
++        m_clockWindow[1] = createNumberWindow(0, CONFIG_CLOCK_NUMBER);
++    }
++
++    shapeNumberWindow(m_clockWindow[0], lt->tm_hour, 2);
++    shapeNumberWindow(m_clockWindow[1], lt->tm_min, 2);
++    
++    XMoveResizeWindow(display(), m_clockWindow[0],
++                      30, 30, 500, 160);
++    
++    XMoveResizeWindow(display(), m_clockWindow[1],
++                      30, 9 * CONFIG_CHANNEL_NUMBER_SIZE + 30, 500, 160);
++
++    XMapWindow(display(), m_clockWindow[0]);
++    XLowerWindow(display(), m_clockWindow[0]);
++
++    XMapWindow(display(), m_clockWindow[1]);
++    XLowerWindow(display(), m_clockWindow[1]);
++}
++
+diff -NarU5 wmx-7/Config.h SVN/wm2-2012-01-09/trunk/wmx/Config.h
+--- wmx-7/Config.h	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Config.h	2012-01-09 11:05:39.679384449 -0500
+@@ -77,12 +77,11 @@
+ // Spawn a temporary new shell between the wm and each new process?
+ #define CONFIG_EXEC_USING_SHELL   False
+ 
+ // What to run to get a new window (from the "New" menu option)
+ #define CONFIG_NEW_WINDOW_LABEL "New"
+-#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+-//#define CONFIG_NEW_WINDOW_COMMAND "/home/ccannam/.wmx/terminal"
++#define CONFIG_NEW_WINDOW_COMMAND "x-terminal-emulator"
+ #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
+ // or, for example,
+ //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
+ // alternatively,
+ #define CONFIG_DISABLE_NEW_WINDOW_COMMAND (DynamicConfig::config.disableNew())
+@@ -146,10 +145,18 @@
+ // if False, behaviour will be as in wm2 (stretching the background
+ // image only).
+ 
+ #define CONFIG_RESIZE_UPDATE      True
+ 
++// If USE_COMPOSITE is true, wmx will enable composite redirects for
++// all windows if the Composite extension is present.  This should
++// make no difference at all to the appearance or behaviour of wmx,
++// but it may make it substantially faster with modern video cards
++// that optimise rendering more than old-fashioned window operations.
++
++#define CONFIG_USE_COMPOSITE      True
++
+ // If RAISELOWER_ON_CLICK is True, clicking on the title of the
+ // topmost window will lower instead of raising it (patch due to
+ // Kazushi (Jam) Marukawa)
+ 
+ #define CONFIG_RAISELOWER_ON_CLICK	False
+@@ -253,14 +260,12 @@
+ // at all, define it to CONFIG_NO_BUTTON.
+ #define CONFIG_NO_BUTTON 999
+ #define CONFIG_CLIENTMENU_BUTTON  Button1
+ #define CONFIG_COMMANDMENU_BUTTON Button2
+ #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
+-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
+-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+-//#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
+-//#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
++#define CONFIG_PREVCHANNEL_BUTTON Button5 // flip channel, when over frame
++#define CONFIG_NEXTCHANNEL_BUTTON Button4 // flip channel, when over frame
+ 
+ 
+ // ==============================
+ // Section III. Colours and fonts
+ // ==============================
+@@ -321,10 +326,11 @@
+ #define CONFIG_TAB_BACKGROUND     (DynamicConfig::config.tabBackground())
+ #define CONFIG_FRAME_BACKGROUND   (DynamicConfig::config.frameBackground())
+ #define CONFIG_BUTTON_BACKGROUND  (DynamicConfig::config.frameBackground())
+ #define CONFIG_BORDERS            "black"
+ #define CONFIG_CHANNEL_NUMBER	  "green"
++#define CONFIG_CLOCK_NUMBER       "gray90"
+ 
+ #define CONFIG_MENU_FOREGROUND    (DynamicConfig::config.tabForeground())
+ #define CONFIG_MENU_BACKGROUND    (DynamicConfig::config.tabBackground())
+ #define CONFIG_MENU_BORDERS       "black"
+ 
+@@ -361,14 +367,14 @@
+ #define CONFIG_USE_CHANNEL_MENU   False
+ 
+ // FLIP_DELAY is the length of time the big green number stays in the
+ // top-right when flipping channels, before the windows reappear.
+ // QUICK_FLIP_DELAY is the equivalent figure used when flipping with
+-// the Alt-Fn keys.  Milliseconds.
++// the Alt-Fn keys or mouse wheel.  Milliseconds.
+ 
+ #define CONFIG_FLIP_DELAY         1000
+-#define CONFIG_QUICK_FLIP_DELAY   200
++#define CONFIG_QUICK_FLIP_DELAY   500
+ 
+ // Set MAD_FEEDBACK for skeletal representations of windows when
+ // flicking through the client menu and changing channels.  The DELAY
+ // is how long skeletal feedback has to persist before wmx decides to
+ // post the entire window contents instead; if it's negative, the
+@@ -377,30 +383,36 @@
+ // delay of 0ms.
+ 
+ #define CONFIG_MAD_FEEDBACK       (DynamicConfig::config.useFeedback())
+ #define CONFIG_FEEDBACK_DELAY     (DynamicConfig::config.feedbackDelay())
+ 
+-// Groups are fun. you can bind a bunch of windows to a number key
+-// and when you press CONFIG_ALT_KEY_MASK and the number key
+-// all the windows of that group are raised.
+-
+ // Position of the geometry window:
+ // X < 0 left, X > 0 right,  X = 0 center
+ // Y < 0 top,  Y > 0 bottom, Y = 0 center
+ #define CONFIG_GEOMETRY_X_POS     0
+ #define CONFIG_GEOMETRY_Y_POS     0
+ 
++// Groups are fun. you can bind a bunch of windows to a number key
++// and when you press CONFIG_ALT_KEY_MASK and the number key
++// all the windows of that group are raised.
++
+ // You bind a window to a group by pressing the 
+ // CONFIG_ALT_KEY_MASK + CONFIG_GROUP_ADD + a number key
+ 
+ // if you press CONFIG_ALT_KEY_MASK + CONFIG_GROUP_REMOVE_ALL
+ // + a number key that group is cleared of all windows.
+ 
+ #define CONFIG_GROUPS             True
+ #define CONFIG_GROUP_ADD          ControlMask  
+ #define CONFIG_GROUP_REMOVE_ALL   ShiftMask
+ 
++// Set CLOCK if you want wmx to display a clock permanently in the
++// background at top-left of screen 0.  Use CONFIG_CLOCK_NUMBER
++// to control the colour of the clock digits.
++
++#define CONFIG_CLOCK              False
++
+ // This lets you choose whether to keep the regular wmx
+ // mouse button behaviour, or go w/ the GNOME-described one.
+ // If this is True, the left mouse button (button1) lets you 
+ // select 1 or more gmc 'icons' and drag them around etc,
+ // the right mouse button (button3) pops up the GNOME 
+diff -NarU5 wmx-7/configure SVN/wm2-2012-01-09/trunk/wmx/configure
+--- wmx-7/configure	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/configure	2012-01-09 11:05:39.668383824 -0500
+@@ -3018,10 +3018,87 @@
+ 
+ fi
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
++echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
++if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lXcomposite  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char XCompositeQueryExtension ();
++int
++main ()
++{
++return XCompositeQueryExtension ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
++echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
++if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBXCOMPOSITE 1
++_ACEOF
++
++  LIBS="-lXcomposite $LIBS"
++
++else
++
++    echo "Warning: Xcomposite library not found"
++    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
++
++fi
++
++
++
+ { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
+ echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+diff -NarU5 wmx-7/configure.in SVN/wm2-2012-01-09/trunk/wmx/configure.in
+--- wmx-7/configure.in	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/configure.in	2012-01-09 11:05:39.674384166 -0500
+@@ -37,10 +37,16 @@
+ AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [], [
+     echo "Warning: Xpm library not found"
+     echo "Please either install the Xpm library and headers, or ensure you have CONFIG_USE_PIXMAPS set to False in Config.h"
+     ])
+ 
++dnl Composite is necessary if CONFIG_USE_COMPOSITE
++AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [], [
++    echo "Warning: Xcomposite library not found"
++    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
++    ])
++
+ dnl SM and ICE are necessary if CONFIG_USE_SESSION_MANAGER
+ AC_CHECK_LIB(SM, SmcOpenConnection)
+ AC_CHECK_LIB(ICE, IceConnectionNumber)
+ 
+ dnl Freetype: actually only needed if CONFIG_USE_XFT
+diff -NarU5 wmx-7/Events.C SVN/wm2-2012-01-09/trunk/wmx/Events.C
+--- wmx-7/Events.C	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Events.C	2012-01-09 11:05:39.672384052 -0500
+@@ -142,15 +142,23 @@
+ 
+     if (!m_signalled) {
+ 
+     waiting:
+ 
+-	if (m_channelChangeTime > 0) {
++	if (m_channelChangeTime > 0 || CONFIG_CLOCK) {
++
+ 	    Time t = timestamp(True);
+-	    if (t >= m_channelChangeTime) {
++
++	    if (m_channelChangeTime > 0 && t >= m_channelChangeTime) {
+ 		instateChannel();
+ 	    }
++
++            if (CONFIG_CLOCK && (m_clockUpdateTime == CurrentTime ||
++                                 t >= m_clockUpdateTime + 60000)) {
++                m_clockUpdateTime = t;
++                updateClock();
++            }
+ 	}
+ 
+ 	if (QLength(m_display) > 0) {
+ 	    XNextEvent(m_display, e);
+ 	    return;
+diff -NarU5 wmx-7/Makefile.in SVN/wm2-2012-01-09/trunk/wmx/Makefile.in
+--- wmx-7/Makefile.in	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Makefile.in	2012-01-09 11:05:39.670383938 -0500
+@@ -43,10 +43,15 @@
+ 	cp wmx @bindir@/wmx
+ 	-chmod 0755 @bindir@/wmx
+ 	-chown root:wheel @bindir@/wmx
+ 	-rm -f @bindir@/wmx.old
+ 
++install-rpm:
++	mkdir -p $(DESTDIR)/usr/bin/
++	cp wmx $(DESTDIR)/usr/bin/wmx
++
++
+ # DO NOT DELETE -- make depend depends on it
+ Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
+  Manager.h listmacro.h background.xpm
+ Buttons.o: Buttons.C Manager.h General.h Config.h listmacro.h Client.h \
+  Border.h Rotated.h Menu.h
+diff -NarU5 wmx-7/Manager.C SVN/wm2-2012-01-09/trunk/wmx/Manager.C
+--- wmx-7/Manager.C	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Manager.C	2012-01-09 11:05:39.678384393 -0500
+@@ -13,10 +13,14 @@
+ #include <sys/wait.h>
+ 
+ #include "Cursors.h"
+ #include <X11/cursorfont.h>
+ 
++#ifdef CONFIG_USE_COMPOSITE
++#include <X11/extensions/Xcomposite.h>
++#endif
++
+ Atom    Atoms::wm_state;
+ Atom    Atoms::wm_changeState;
+ Atom    Atoms::wm_protocols;
+ Atom    Atoms::wm_delete;
+ Atom    Atoms::wm_takeFocus;
+@@ -285,10 +289,12 @@
+ 
+     m_channels = 2;
+     m_currentChannel = 1;
+     m_channelChangeTime = 0;
+     m_channelWindow = 0;
++    m_clockWindow = 0;
++    m_clockUpdateTime = CurrentTime;
+ 
+     Atoms::wm_state      = XInternAtom(m_display, "WM_STATE",            False);
+     Atoms::wm_changeState= XInternAtom(m_display, "WM_CHANGE_STATE",     False);
+     Atoms::wm_protocols  = XInternAtom(m_display, "WM_PROTOCOLS",        False);
+     Atoms::wm_delete     = XInternAtom(m_display, "WM_DELETE_WINDOW",    False);
+@@ -338,11 +344,22 @@
+ 
+     initialiseScreen();
+     if (m_screensTotal > 1) {
+         fprintf(stderr, "\n     Detected %d screens.", m_screensTotal);
+     }
+-    
++   
++#ifdef CONFIG_USE_COMPOSITE
++    int ev, er;
++    if (XCompositeQueryExtension(m_display, &ev, &er)) {
++        fprintf(stderr, "\n     Enabling composite extension.\n");
++        for (int i = 0; i < m_screensTotal; ++i) {
++            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
++                                         CompositeRedirectAutomatic);
++        }
++    }
++#endif
++ 
+     XSetSelectionOwner(m_display, Atoms::wmx_running,
+ 		       None, timestamp(True)); // used to have m_menuWindow
+     XSync(m_display, False);
+     m_initialising = False;
+     m_returnCode = 0;
+@@ -517,11 +534,12 @@
+   
+     m_root = (Window *) malloc(m_screensTotal * sizeof(Window));
+     m_defaultColormap = (Colormap *) malloc(m_screensTotal * sizeof(Colormap));
+ //    m_minimumColormaps = (int *) malloc(m_screensTotal * sizeof(int));
+     m_channelWindow = (Window *) malloc(m_screensTotal * sizeof(Window));
+-    
++    m_clockWindow = (Window *) malloc(2 * sizeof(Window));
++
+     for (i = 0 ; i < m_screensTotal ; i++) {
+ 
+         m_screenNumber = i;
+ 	m_channelWindow[i] = 0;
+ 
+@@ -570,10 +588,14 @@
+ 
+         XChangeWindowAttributes(m_display, m_root[i], CWCursor | CWEventMask, &attr);
+         XSync(m_display, False);
+     }
+ 
++    for (i = 0; i < 2; ++i) {
++        m_clockWindow[i] = 0;
++    }
++
+     m_screenNumber = 0;
+ }
+ 
+ 
+ unsigned long WindowManager::allocateColour(int screen, const char *name,
+diff -NarU5 wmx-7/Manager.h SVN/wm2-2012-01-09/trunk/wmx/Manager.h
+--- wmx-7/Manager.h	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Manager.h	2012-01-09 11:05:39.682384620 -0500
+@@ -150,16 +150,22 @@
+ 
+     int m_channels;
+     int m_currentChannel;	// from 1 to ...
+     void flipChannel(Boolean statusOnly, Boolean flipDown,
+ 		     Boolean quickFlip, Client *push); // bleah!
++    Window createNumberWindow(int screen, const char *colour);
++    int shapeNumberWindow(Window w, int number, int minDigits); // returns width in pixels
+     void instateChannel();
+     void createNewChannel();
+     void checkChannel(int);
+     Time m_channelChangeTime;
+     Window *m_channelWindow;
+ 
++    void updateClock();
++    Window *m_clockWindow;
++    Time m_clockUpdateTime;
++
+     Boolean m_looping;
+     int m_returnCode;
+ 
+     static Boolean m_initialising;
+     static int errorHandler(Display *, XErrorEvent *);
+diff -NarU5 wmx-7/Menu.C SVN/wm2-2012-01-09/trunk/wmx/Menu.C
+--- wmx-7/Menu.C	2009-01-09 06:18:03.000000000 -0500
++++ SVN/wm2-2012-01-09/trunk/wmx/Menu.C	2012-01-09 11:05:39.673384109 -0500
+@@ -54,10 +54,14 @@
+ 	    tokstr = 0;
+ 	    
+ 	    FcPattern *pattern = FcPatternCreate();
+ 	    FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi);
+ 	    FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
++
++#ifndef FC_WEIGHT_REGULAR
++#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM
++#endif
+ 	    FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR);
+ 	    FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE);
+ 	    FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);
+ 
+ 	    FcResult result = FcResultMatch;
diff --git a/wmx-7-cfg.patch b/wmx-7-cfg.patch
index b6ce74b..be40c73 100644
--- a/wmx-7-cfg.patch
+++ b/wmx-7-cfg.patch
@@ -1,7 +1,20 @@
 diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
---- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ wmx-7/Config.h	2009-01-13 13:23:31.000000000 -0500
-@@ -93,11 +93,11 @@
+--- wmx-7.orig/Config.h	2012-01-09 16:07:03.610039637 -0500
++++ wmx-7/Config.h	2012-01-09 16:07:46.408474496 -0500
+@@ -77,11 +77,11 @@
+ // Spawn a temporary new shell between the wm and each new process?
+ #define CONFIG_EXEC_USING_SHELL   False
+ 
+ // What to run to get a new window (from the "New" menu option)
+ #define CONFIG_NEW_WINDOW_LABEL "New"
+-#define CONFIG_NEW_WINDOW_COMMAND "x-terminal-emulator"
++#define CONFIG_NEW_WINDOW_COMMAND "/usr/bin/xterm"
+ #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
+ // or, for example,
+ //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
+ // alternatively,
+ #define CONFIG_DISABLE_NEW_WINDOW_COMMAND (DynamicConfig::config.disableNew())
+@@ -92,11 +92,11 @@
   
  // Directory under $HOME in which to look for commands for the
  // middle-button menu
@@ -14,7 +27,7 @@ diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
  #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
   
  // Focus possibilities.
-@@ -126,11 +126,11 @@
+@@ -125,11 +125,11 @@
  
  // Number of pixels off the screen you have to push a window
  // before the manager notices the window is off-screen (the higher
@@ -27,7 +40,7 @@ diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
  // other window edges as well as the edges of the screen
  
  #define CONFIG_BUMP_EVERYWHERE    True
-@@ -185,11 +185,11 @@
+@@ -192,11 +192,11 @@
  
  // This is the key for wm controls: e.g. Alt/Left and Alt/Right to
  // flip channels, and Alt/Tab to switch windows.  (On my 105-key
@@ -40,7 +53,7 @@ diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -329,11 +329,11 @@
+@@ -335,11 +335,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  
  // Pixel width for the bit of frame to the left of the window and the
@@ -53,7 +66,7 @@ diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
  // ========================
  // Section IV. Flashy stuff
  // ========================
-@@ -342,11 +342,11 @@
+@@ -348,11 +348,11 @@
  // in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
  // will be too.  The latter screws up in palette-based visuals, but
  // should be okay in true-colour.
diff --git a/wmx-7-composite.patch b/wmx-7-composite.patch
deleted file mode 100644
index fa9520f..0000000
--- a/wmx-7-composite.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -NarU5 wmx-7.orig/Config.h wm2-wmx-trunk/wmx/Config.h
---- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ wm2-wmx-trunk/wmx/Config.h	2009-01-19 13:49:50.000000000 -0500
-@@ -146,10 +146,18 @@
- // if False, behaviour will be as in wm2 (stretching the background
- // image only).
- 
- #define CONFIG_RESIZE_UPDATE      True
- 
-+// If USE_COMPOSITE is true, wmx will enable composite redirects for
-+// all windows if the Composite extension is present.  This should
-+// make no difference at all to the appearance or behaviour of wmx,
-+// but it may make it substantially faster with modern video cards
-+// that optimise rendering more than old-fashioned window operations.
-+
-+#define CONFIG_USE_COMPOSITE      True
-+
- // If RAISELOWER_ON_CLICK is True, clicking on the title of the
- // topmost window will lower instead of raising it (patch due to
- // Kazushi (Jam) Marukawa)
- 
- #define CONFIG_RAISELOWER_ON_CLICK	False
-@@ -253,14 +261,12 @@
- // at all, define it to CONFIG_NO_BUTTON.
- #define CONFIG_NO_BUTTON 999
- #define CONFIG_CLIENTMENU_BUTTON  Button1
- #define CONFIG_COMMANDMENU_BUTTON Button2
- #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
--#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
--#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
--//#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
--//#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-+#define CONFIG_PREVCHANNEL_BUTTON Button5 // flip channel, when over frame
-+#define CONFIG_NEXTCHANNEL_BUTTON Button4 // flip channel, when over frame
- 
- 
- // ==============================
- // Section III. Colours and fonts
- // ==============================
-diff -NarU5 wmx-7.orig/configure wm2-wmx-trunk/wmx/configure
---- wmx-7.orig/configure	2009-01-09 06:18:03.000000000 -0500
-+++ wm2-wmx-trunk/wmx/configure	2009-01-19 11:57:15.000000000 -0500
-@@ -3018,10 +3018,87 @@
- 
- fi
- 
- 
- 
-+{ echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
-+echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXcomposite  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XCompositeQueryExtension ();
-+int
-+main ()
-+{
-+return XCompositeQueryExtension ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
-+if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBXCOMPOSITE 1
-+_ACEOF
-+
-+  LIBS="-lXcomposite $LIBS"
-+
-+else
-+
-+    echo "Warning: Xcomposite library not found"
-+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
-+
-+fi
-+
-+
-+
- { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
- echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
- if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-diff -NarU5 wmx-7.orig/configure.in wm2-wmx-trunk/wmx/configure.in
---- wmx-7.orig/configure.in	2009-01-09 06:18:03.000000000 -0500
-+++ wm2-wmx-trunk/wmx/configure.in	2009-01-19 11:57:15.000000000 -0500
-@@ -37,10 +37,16 @@
- AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [], [
-     echo "Warning: Xpm library not found"
-     echo "Please either install the Xpm library and headers, or ensure you have CONFIG_USE_PIXMAPS set to False in Config.h"
-     ])
- 
-+dnl Composite is necessary if CONFIG_USE_COMPOSITE
-+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [], [
-+    echo "Warning: Xcomposite library not found"
-+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
-+    ])
-+
- dnl SM and ICE are necessary if CONFIG_USE_SESSION_MANAGER
- AC_CHECK_LIB(SM, SmcOpenConnection)
- AC_CHECK_LIB(ICE, IceConnectionNumber)
- 
- dnl Freetype: actually only needed if CONFIG_USE_XFT
-diff -NarU5 wmx-7.orig/Makefile.in wm2-wmx-trunk/wmx/Makefile.in
---- wmx-7.orig/Makefile.in	2009-01-09 06:18:03.000000000 -0500
-+++ wm2-wmx-trunk/wmx/Makefile.in	2009-01-19 14:12:30.000000000 -0500
-@@ -43,10 +43,15 @@
- 	cp wmx @bindir@/wmx
- 	-chmod 0755 @bindir@/wmx
- 	-chown root:wheel @bindir@/wmx
- 	-rm -f @bindir@/wmx.old
- 
-+install-rpm:
-+	mkdir -p $(DESTDIR)/usr/bin/
-+	cp wmx $(DESTDIR)/usr/bin/wmx
-+
-+
- # DO NOT DELETE -- make depend depends on it
- Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
-  Manager.h listmacro.h background.xpm
- Buttons.o: Buttons.C Manager.h General.h Config.h listmacro.h Client.h \
-  Border.h Rotated.h Menu.h
-diff -NarU5 wmx-7.orig/Manager.C wm2-wmx-trunk/wmx/Manager.C
---- wmx-7.orig/Manager.C	2009-01-09 06:18:03.000000000 -0500
-+++ wm2-wmx-trunk/wmx/Manager.C	2009-01-19 13:49:50.000000000 -0500
-@@ -13,10 +13,14 @@
- #include <sys/wait.h>
- 
- #include "Cursors.h"
- #include <X11/cursorfont.h>
- 
-+#ifdef CONFIG_USE_COMPOSITE
-+#include <X11/extensions/Xcomposite.h>
-+#endif
-+
- Atom    Atoms::wm_state;
- Atom    Atoms::wm_changeState;
- Atom    Atoms::wm_protocols;
- Atom    Atoms::wm_delete;
- Atom    Atoms::wm_takeFocus;
-@@ -242,10 +246,21 @@
-     if (!m_display) fatal("can't open display");
- 
-     m_shell = (char *)getenv("SHELL");
-     if (!m_shell) m_shell = NewString("/bin/sh");
- 
-+#ifdef CONFIG_USE_COMPOSITE
-+    int ev, er;
-+    if (XCompositeQueryExtension(m_display, &ev, &er)) {
-+        fprintf(stderr, "\n     Enabling composite extension.\n");
-+        for (int i = 0; i < m_screensTotal; ++i) {
-+            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
-+                                         CompositeRedirectAutomatic);
-+        }
-+    }
-+#endif
-+
-     // find out what the Alt keycode and thus modifier mask are
-     int kpk = 0;
-     int kmin = 0;
-     int kmax = 0;
-     XDisplayKeycodes(m_display, &kmin, &kmax);
-diff -NarU5 wmx-7.orig/Menu.C wm2-wmx-trunk/wmx/Menu.C
---- wmx-7.orig/Menu.C	2009-01-09 06:18:03.000000000 -0500
-+++ wm2-wmx-trunk/wmx/Menu.C	2009-01-19 14:12:30.000000000 -0500
-@@ -54,10 +54,14 @@
- 	    tokstr = 0;
- 	    
- 	    FcPattern *pattern = FcPatternCreate();
- 	    FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi);
- 	    FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-+
-+#ifndef FC_WEIGHT_REGULAR
-+#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM
-+#endif
- 	    FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR);
- 	    FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE);
- 	    FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);
- 
- 	    FcResult result = FcResultMatch;
diff --git a/wmx.spec b/wmx.spec
index 3bdd964..8672162 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,18 +1,21 @@
+%define checkout 20120109svn
+
 Name: wmx
 Version: 7
-Release: 8%{?dist}
+Release: 9.%{checkout}%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
 URL: http://www.all-day-breakfast.com/wmx/
 Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
-Source1: wmx-defaults-1.tar.gz
+Source1: wmx-defaults-2.tar.gz
 Source2: background.xpm
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
-Source5: xnodecor.c
-Patch0: wmx-7-composite.patch
+Patch0: wmx-7-20120109svn.patch
 Patch1: wmx-7-cfg.patch
+#wmx's 'New' button is hardcoded to start an xterm, better make sure we have it:
+Requires: xterm
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
@@ -30,14 +33,12 @@ configurable options.
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11 LIBS=-lfontconfig
 %{__make} %{?_smp_mflags}
-%{__cc} -o xnodecor %{SOURCE5} -Werror -lX11
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx
-%{__install} -D -m 0755 xnodecor %{buildroot}%{_bindir}/xnodecor
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
-%{__install} -m 0755 wmx-defaults-1/* %{buildroot}%{_datadir}/%{name}
+%{__install} -m 0755 wmx-defaults-2/* %{buildroot}%{_datadir}/%{name}
 %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup
 %{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/wmx.desktop
 %{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh
@@ -54,6 +55,11 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Jan 09 2012 Gabriel Somlo <somlo@cmu.edu> 7-9.20120109svn
+- upgrade to latest svn checkout
+- updated defaults
+- dropped xnodecor
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/xnodecor.c b/xnodecor.c
deleted file mode 100644
index 91ed79c..0000000
--- a/xnodecor.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright 1998 by Vadim Kolontsov			
- * All rights reserved
- *
- * Distribute freely, except: don't remove my name from the source or
- * documentation (don't take credit for my work), mark your changes (don't
- * get me blamed for your possible bugs), don't alter or remove this
- * notice.  May be sold if buildable source is provided to buyer.  No
- * warrantee of any kind, express or implied, is included with this
- * software; use at your own risk, responsibility for damages (if any) to
- * anyone resulting from the use of this software rests entirely with the
- * user.
- *
- * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
- * I'll try to keep a version up to date.  I can be reached as follows:
- *
- * Vadim Kolontsov <sb@123.org>
- *-----------------------------------------------------------------------
- * This program sets attribute "override_redirect" to True for any window
- * you've specified (using window name). Window Managers should ignore
- * such windows; it's useful, for example, if you're using wmx Window Manager,
- * and want to have a clock on every virtual screen and without any
- * borders. Just add the following string to your X-startfile (after
- * starting watch app):
- *
- *   xnodecor -w watch
- *
- * (assuming that your watch application has a window named "watch")
- *  
- * For details see http://sb.123.org/xnodecor.html
- *
- * Tested on FreeBSD 2.2.2, XFree86 3.2, wmx-4
- *
- * Compilation:
- * 
- *    gcc -o xnodecor xnodecor.c -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 */
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
- 
-#define WAIT_DEFAULT	0
-#define WAIT_TIMEOUT	15
-#define VERBOSE_DEFAULT	0
-
-int main(int argc, char *argv[])
-{
-   Display *d;
-   Window w1, w2, *wins;
-   int c;
-   XSetWindowAttributes a;
-   char *name, *program_name, *display_name = NULL;
-   unsigned int i, n, found = 0,
-   	        f_wait = WAIT_DEFAULT, 
-	    	f_verbose = VERBOSE_DEFAULT,
-		delay = WAIT_TIMEOUT;
-
-   if (argv && argv[0] && *argv[0])
-      program_name = (program_name = rindex(argv[0], '/')) ?
-	 (*++program_name ? program_name : "xnodecor") : argv[0];
-
-   while ((c = getopt(argc, argv, "vd:wt:h")) != EOF)
-      switch (c)
-      {
-	 case 'd':
-	    display_name = strdup(optarg);
-	    break;
-
-	 case 'w':
-	    f_wait = f_wait ? 0 : 1;
-	    break;
-	    
-	 case 'v':
-	    f_verbose = f_verbose ? 0 : 1;
-	    break;
-	    
-	 case 't':
-	    delay = atoi(optarg);
-	    break;
-
-	 case 'h':
-	 default:
-	    fprintf(stderr, "Usage: %s [options] window-name\n\n"
-		  	    "   -d display	specify alternative display\n"
-			    "   -w		wait for specified window (default: %swait)\n"
-			    "   -t n		timeout for waiting (default: %d sec)\n"
-			    "   -v		verbose mode (default: %s)\n"
- 			    "   -h		this help\n\n", program_name, 
-			    f_wait ? "" : "no ", delay, 
-			    f_verbose ? "on" : "off");
-	    exit(0);
-      }
-
-   argc -= optind;
-   argv += optind;
-   
-   if (argc != 1)
-   {
-      fprintf(stderr, "%s: Window name not specified\n", program_name);
-      exit(1);
-   }
-
-   d = XOpenDisplay(display_name);
-   if (!d)
-   {
-      fprintf(stderr, "%s: Can't open display\n", program_name);
-      exit(1);
-   }
-
-   do
-   {
-      if (XQueryTree(d, RootWindow(d, 0), &w1, &w2, &wins, &n) == 0)
-      {
-	 fprintf(stderr, "%s: XQueryTree failed\n", program_name);
-	 exit(1);
-      }
-      
-      found = 0;
-      for (i = 0; i < n; i++)
-	 if (XFetchName(d, wins[i], &name))
-	 {
-	    if (f_verbose) printf("%s\n", name);
-	    if (!strcmp(name, argv[0]))
-	    {
-	       if (f_verbose) printf("(found!)\n");
-
-	       a.override_redirect = 1;
-	       XChangeWindowAttributes(d, wins[i], CWOverrideRedirect, &a);
-	       found = 1;
-	    }
-	 }
-
-      if (f_wait)
-	 sleep(1);
-   } while (f_wait && delay-- && !found);
-   
-   XCloseDisplay(d);
-}
-   

From c334304acda1ac216971361e518d758b3ab254a4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 21 Jul 2012 22:52:26 -0500
Subject: [PATCH 07/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 8672162..52c30b5 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -2,7 +2,7 @@
 
 Name: wmx
 Version: 7
-Release: 9.%{checkout}%{?dist}
+Release: 10.%{checkout}%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -55,6 +55,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-10.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Mon Jan 09 2012 Gabriel Somlo <somlo@cmu.edu> 7-9.20120109svn
 - upgrade to latest svn checkout
 - updated defaults

From 3b2d013ef82c509fd8389eb1179f20a5b122214e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 21:14:45 -0600
Subject: [PATCH 08/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 52c30b5..ff11968 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -2,7 +2,7 @@
 
 Name: wmx
 Version: 7
-Release: 10.%{checkout}%{?dist}
+Release: 11.%{checkout}%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -55,6 +55,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-11.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-10.20120109svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From f389ade6727ee933e745bf8c0545c97aaab0a134 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 02:08:46 -0500
Subject: [PATCH 09/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index ff11968..8fbc5a0 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -2,7 +2,7 @@
 
 Name: wmx
 Version: 7
-Release: 11.%{checkout}%{?dist}
+Release: 12.%{checkout}%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -55,6 +55,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-12.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-11.20120109svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 94b368b4acd2affd3ffe72f50b2a1098ff9a2509 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 23:45:28 -0500
Subject: [PATCH 10/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 8fbc5a0..c21209e 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -2,7 +2,7 @@
 
 Name: wmx
 Version: 7
-Release: 12.%{checkout}%{?dist}
+Release: 13.%{checkout}%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -55,6 +55,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-13.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-12.20120109svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 9769845764fd53385b57b24689de59514623296b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 08:51:05 +0000
Subject: [PATCH 11/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index c21209e..64c15f6 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -2,7 +2,7 @@
 
 Name: wmx
 Version: 7
-Release: 13.%{checkout}%{?dist}
+Release: 14.%{checkout}%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -55,6 +55,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-14.20120109svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-13.20120109svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 2ff6abbebdb6c93804484ebf396fa3749977a871 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo@cmu.edu>
Date: Thu, 20 Nov 2014 11:40:38 -0500
Subject: [PATCH 12/45] update to version 8

---
 .gitignore                         |   2 +
 sources                            |   4 +-
 wmx-7-20120109svn.patch            | 612 -----------------------------
 wmx-7-cfg.patch => wmx-8-cfg.patch |   6 +-
 wmx.spec                           |  23 +-
 5 files changed, 18 insertions(+), 629 deletions(-)
 delete mode 100644 wmx-7-20120109svn.patch
 rename wmx-7-cfg.patch => wmx-8-cfg.patch (94%)

diff --git a/.gitignore b/.gitignore
index f7ed618..197070b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ wmx-7.tar.gz
 /wmx-7.tar.gz
 /wmx-defaults-1.tar.gz
 /wmx-defaults-2.tar.gz
+/wmx-8.tar.gz
+/wmx-defaults-3.tar.gz
diff --git a/sources b/sources
index 00e81f9..b43253b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz
-70892929426891facc252520784d9840  wmx-defaults-2.tar.gz
+52a0e31b9a77e227eb6dc732f7941f15  wmx-8.tar.gz
+d5d5e760039fce77133abff54ce97cc1  wmx-defaults-3.tar.gz
diff --git a/wmx-7-20120109svn.patch b/wmx-7-20120109svn.patch
deleted file mode 100644
index 9883625..0000000
--- a/wmx-7-20120109svn.patch
+++ /dev/null
@@ -1,612 +0,0 @@
-diff -NarU5 wmx-7/Channel.C SVN/wm2-2012-01-09/trunk/wmx/Channel.C
---- wmx-7/Channel.C	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Channel.C	2012-01-09 11:05:39.676384280 -0500
-@@ -16,96 +16,102 @@
-     { " ### ", "#   #", "#   #", " ### ", "#   #", "#   #", " ### " },
-     { " ### ", "#   #", "#   #", " ####", "    #", "   # ", " ##  " }
- };
- 
- 
--void WindowManager::flipChannel(Boolean statusOnly, Boolean flipDown,
--				Boolean quickFlip, Client *push)
-+Window WindowManager::createNumberWindow(int screen, const char *colour)
- {
--    int x, y, i, sc;
--    if (!CONFIG_CHANNEL_SURF) return;
--
--    for (sc = 0; sc < screensTotal(); sc++)
--    {
--	if (!m_channelWindow[sc]) {
--
--	XColor nearest, ideal;
--
--	    if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
--			      CONFIG_CHANNEL_NUMBER, &nearest, &ideal)) {
-+    XColor nearest, ideal;
-+            
-+    if (!XAllocNamedColor(display(), DefaultColormap(display(), screen),
-+                          colour, &nearest, &ideal)) {
- 	    
--		if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
--				  "black", &nearest, &ideal)) {
-+        if (!XAllocNamedColor(display(), DefaultColormap(display(), screen),
-+                              "black", &nearest, &ideal)) {
- 		
--		fatal("Couldn't allocate green or black");
--	    }
--	}
--
--	XSetWindowAttributes wa;
--	wa.background_pixel = nearest.pixel;
--	wa.override_redirect = True;
--	
--	    m_channelWindow[sc] = XCreateWindow
--		(display(), mroot(sc),
--		 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent,
--	     CopyFromParent, CWOverrideRedirect | CWBackPixel, &wa);
--	}
-+            fatal("Couldn't allocate requested numeral colour or black");
-+        }
-     }
-+            
-+    XSetWindowAttributes wa;
-+    wa.background_pixel = nearest.pixel;
-+    wa.override_redirect = True;
-+	
-+    Window w = XCreateWindow
-+        (display(), mroot(screen),
-+         0, 0, 1, 1, 0, CopyFromParent, CopyFromParent,
-+         CopyFromParent, CWOverrideRedirect | CWBackPixel, &wa);
- 
--    int nextChannel;
-+    return w;
-+}
- 
--    if (statusOnly) nextChannel = m_currentChannel;
--    else {
--	if (!flipDown) {
--	    nextChannel = m_currentChannel + 1;
--	    if (nextChannel > m_channels) nextChannel = 1;
--	} else {
--	    nextChannel = m_currentChannel - 1;
--	    if (nextChannel < 1) nextChannel = m_channels;
--	}
--    }
- 
-+int WindowManager::shapeNumberWindow(Window w, int n, int minDigits)
-+{
-+    int i, x, y;
-     XRectangle r;
-     Boolean first = True;
-     char number[7];
--    sprintf(number, "%d", nextChannel);
-+    sprintf(number, "%0*d", minDigits, n);
- 
-     for (i = 0; i < (int)strlen(number); ++i) {
- 	for (y = 0; y < 7; ++y) {
- 	    for (x = 0; x < 5; ++x) {
- 		if (numerals[number[i]-'0'][y][x] != ' ') {
--/*		    
--		    r.x = i * 110 + x * 20; r.y = y * 20;
--		    r.width = r.height = 20;
-- */      
-+
-                     r.x = 10 + (i * 6 + x) * CONFIG_CHANNEL_NUMBER_SIZE;
-                     r.y = y * CONFIG_CHANNEL_NUMBER_SIZE;
-                     r.width = r.height = CONFIG_CHANNEL_NUMBER_SIZE;
--                    for(sc = 0; sc < screensTotal(); sc++)
--                    {
-+
- 		    XShapeCombineRectangles
--                          (display(), m_channelWindow[sc], ShapeBounding,
-+                          (display(), w, ShapeBounding,
-                            0, 0, &r, 1, first ? ShapeSet : ShapeUnion,
-                            YXBanded);
--                    }
-+
- 		    first = False;
- 		}
- 	    }
- 	}
-     }
- 
--    for(sc = 0; sc < screensTotal(); sc++) {
--/*
--        XMoveResizeWindow(display(), m_channelWindow[sc],
--			  DisplayWidth(display(), sc) - 30 -
--		      110 * strlen(number), 30, 500, 160);
-- */
-+    return (5 * CONFIG_CHANNEL_NUMBER_SIZE + 10) * strlen(number);
-+}
-+    
-+    
-+void WindowManager::flipChannel(Boolean statusOnly, Boolean flipDown,
-+				Boolean quickFlip, Client *push)
-+{
-+    int wid, i, sc;
-+    if (!CONFIG_CHANNEL_SURF) return;
-+
-+    for (sc = 0; sc < screensTotal(); sc++) {
-+	if (!m_channelWindow[sc]) {
-+            m_channelWindow[sc] = createNumberWindow(sc, CONFIG_CHANNEL_NUMBER);
-+	}
-+    }
-+
-+    int nextChannel;
-+
-+    if (statusOnly) nextChannel = m_currentChannel;
-+    else {
-+	if (!flipDown) {
-+	    nextChannel = m_currentChannel + 1;
-+	    if (nextChannel > m_channels) nextChannel = 1;
-+	} else {
-+	    nextChannel = m_currentChannel - 1;
-+	    if (nextChannel < 1) nextChannel = m_channels;
-+	}
-+    }
-+
-+    for (sc = 0; sc < screensTotal(); sc++) {
-+
-+        wid = shapeNumberWindow(m_channelWindow[sc], nextChannel, 1);
- 
-         XMoveResizeWindow(display(), m_channelWindow[sc],
--                          DisplayWidth(display(), sc) - 30 -
--                          (5 * CONFIG_CHANNEL_NUMBER_SIZE + 10) *
--                          strlen(number), 30, 500, 160);
-+                          DisplayWidth(display(), sc) - 30 - wid,
-+                          30, 500, 160);
-+
- 	XMapRaised(display(), m_channelWindow[sc]);
-     }
- 
-     if (!statusOnly) {
- 
-@@ -228,5 +234,38 @@
-     if (m_channels <= channel) {
-         m_channels = channel + 1;
-         netwmUpdateChannelList();
-     }
- }
-+
-+void
-+WindowManager::updateClock()
-+{
-+    time_t t;
-+    struct tm *lt;
-+
-+    fprintf(stderr, "updateClock\n");
-+
-+    time(&t);
-+    lt = localtime(&t);
-+    
-+    if (!m_clockWindow[0]) {
-+        m_clockWindow[0] = createNumberWindow(0, CONFIG_CLOCK_NUMBER);
-+        m_clockWindow[1] = createNumberWindow(0, CONFIG_CLOCK_NUMBER);
-+    }
-+
-+    shapeNumberWindow(m_clockWindow[0], lt->tm_hour, 2);
-+    shapeNumberWindow(m_clockWindow[1], lt->tm_min, 2);
-+    
-+    XMoveResizeWindow(display(), m_clockWindow[0],
-+                      30, 30, 500, 160);
-+    
-+    XMoveResizeWindow(display(), m_clockWindow[1],
-+                      30, 9 * CONFIG_CHANNEL_NUMBER_SIZE + 30, 500, 160);
-+
-+    XMapWindow(display(), m_clockWindow[0]);
-+    XLowerWindow(display(), m_clockWindow[0]);
-+
-+    XMapWindow(display(), m_clockWindow[1]);
-+    XLowerWindow(display(), m_clockWindow[1]);
-+}
-+
-diff -NarU5 wmx-7/Config.h SVN/wm2-2012-01-09/trunk/wmx/Config.h
---- wmx-7/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Config.h	2012-01-09 11:05:39.679384449 -0500
-@@ -77,12 +77,11 @@
- // Spawn a temporary new shell between the wm and each new process?
- #define CONFIG_EXEC_USING_SHELL   False
- 
- // What to run to get a new window (from the "New" menu option)
- #define CONFIG_NEW_WINDOW_LABEL "New"
--#define CONFIG_NEW_WINDOW_COMMAND "xterm"
--//#define CONFIG_NEW_WINDOW_COMMAND "/home/ccannam/.wmx/terminal"
-+#define CONFIG_NEW_WINDOW_COMMAND "x-terminal-emulator"
- #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
- // or, for example,
- //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
- // alternatively,
- #define CONFIG_DISABLE_NEW_WINDOW_COMMAND (DynamicConfig::config.disableNew())
-@@ -146,10 +145,18 @@
- // if False, behaviour will be as in wm2 (stretching the background
- // image only).
- 
- #define CONFIG_RESIZE_UPDATE      True
- 
-+// If USE_COMPOSITE is true, wmx will enable composite redirects for
-+// all windows if the Composite extension is present.  This should
-+// make no difference at all to the appearance or behaviour of wmx,
-+// but it may make it substantially faster with modern video cards
-+// that optimise rendering more than old-fashioned window operations.
-+
-+#define CONFIG_USE_COMPOSITE      True
-+
- // If RAISELOWER_ON_CLICK is True, clicking on the title of the
- // topmost window will lower instead of raising it (patch due to
- // Kazushi (Jam) Marukawa)
- 
- #define CONFIG_RAISELOWER_ON_CLICK	False
-@@ -253,14 +260,12 @@
- // at all, define it to CONFIG_NO_BUTTON.
- #define CONFIG_NO_BUTTON 999
- #define CONFIG_CLIENTMENU_BUTTON  Button1
- #define CONFIG_COMMANDMENU_BUTTON Button2
- #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
--#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
--#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
--//#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
--//#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-+#define CONFIG_PREVCHANNEL_BUTTON Button5 // flip channel, when over frame
-+#define CONFIG_NEXTCHANNEL_BUTTON Button4 // flip channel, when over frame
- 
- 
- // ==============================
- // Section III. Colours and fonts
- // ==============================
-@@ -321,10 +326,11 @@
- #define CONFIG_TAB_BACKGROUND     (DynamicConfig::config.tabBackground())
- #define CONFIG_FRAME_BACKGROUND   (DynamicConfig::config.frameBackground())
- #define CONFIG_BUTTON_BACKGROUND  (DynamicConfig::config.frameBackground())
- #define CONFIG_BORDERS            "black"
- #define CONFIG_CHANNEL_NUMBER	  "green"
-+#define CONFIG_CLOCK_NUMBER       "gray90"
- 
- #define CONFIG_MENU_FOREGROUND    (DynamicConfig::config.tabForeground())
- #define CONFIG_MENU_BACKGROUND    (DynamicConfig::config.tabBackground())
- #define CONFIG_MENU_BORDERS       "black"
- 
-@@ -361,14 +367,14 @@
- #define CONFIG_USE_CHANNEL_MENU   False
- 
- // FLIP_DELAY is the length of time the big green number stays in the
- // top-right when flipping channels, before the windows reappear.
- // QUICK_FLIP_DELAY is the equivalent figure used when flipping with
--// the Alt-Fn keys.  Milliseconds.
-+// the Alt-Fn keys or mouse wheel.  Milliseconds.
- 
- #define CONFIG_FLIP_DELAY         1000
--#define CONFIG_QUICK_FLIP_DELAY   200
-+#define CONFIG_QUICK_FLIP_DELAY   500
- 
- // Set MAD_FEEDBACK for skeletal representations of windows when
- // flicking through the client menu and changing channels.  The DELAY
- // is how long skeletal feedback has to persist before wmx decides to
- // post the entire window contents instead; if it's negative, the
-@@ -377,30 +383,36 @@
- // delay of 0ms.
- 
- #define CONFIG_MAD_FEEDBACK       (DynamicConfig::config.useFeedback())
- #define CONFIG_FEEDBACK_DELAY     (DynamicConfig::config.feedbackDelay())
- 
--// Groups are fun. you can bind a bunch of windows to a number key
--// and when you press CONFIG_ALT_KEY_MASK and the number key
--// all the windows of that group are raised.
--
- // Position of the geometry window:
- // X < 0 left, X > 0 right,  X = 0 center
- // Y < 0 top,  Y > 0 bottom, Y = 0 center
- #define CONFIG_GEOMETRY_X_POS     0
- #define CONFIG_GEOMETRY_Y_POS     0
- 
-+// Groups are fun. you can bind a bunch of windows to a number key
-+// and when you press CONFIG_ALT_KEY_MASK and the number key
-+// all the windows of that group are raised.
-+
- // You bind a window to a group by pressing the 
- // CONFIG_ALT_KEY_MASK + CONFIG_GROUP_ADD + a number key
- 
- // if you press CONFIG_ALT_KEY_MASK + CONFIG_GROUP_REMOVE_ALL
- // + a number key that group is cleared of all windows.
- 
- #define CONFIG_GROUPS             True
- #define CONFIG_GROUP_ADD          ControlMask  
- #define CONFIG_GROUP_REMOVE_ALL   ShiftMask
- 
-+// Set CLOCK if you want wmx to display a clock permanently in the
-+// background at top-left of screen 0.  Use CONFIG_CLOCK_NUMBER
-+// to control the colour of the clock digits.
-+
-+#define CONFIG_CLOCK              False
-+
- // This lets you choose whether to keep the regular wmx
- // mouse button behaviour, or go w/ the GNOME-described one.
- // If this is True, the left mouse button (button1) lets you 
- // select 1 or more gmc 'icons' and drag them around etc,
- // the right mouse button (button3) pops up the GNOME 
-diff -NarU5 wmx-7/configure SVN/wm2-2012-01-09/trunk/wmx/configure
---- wmx-7/configure	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/configure	2012-01-09 11:05:39.668383824 -0500
-@@ -3018,10 +3018,87 @@
- 
- fi
- 
- 
- 
-+{ echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
-+echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXcomposite  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XCompositeQueryExtension ();
-+int
-+main ()
-+{
-+return XCompositeQueryExtension ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
-+if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBXCOMPOSITE 1
-+_ACEOF
-+
-+  LIBS="-lXcomposite $LIBS"
-+
-+else
-+
-+    echo "Warning: Xcomposite library not found"
-+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
-+
-+fi
-+
-+
-+
- { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
- echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
- if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-diff -NarU5 wmx-7/configure.in SVN/wm2-2012-01-09/trunk/wmx/configure.in
---- wmx-7/configure.in	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/configure.in	2012-01-09 11:05:39.674384166 -0500
-@@ -37,10 +37,16 @@
- AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [], [
-     echo "Warning: Xpm library not found"
-     echo "Please either install the Xpm library and headers, or ensure you have CONFIG_USE_PIXMAPS set to False in Config.h"
-     ])
- 
-+dnl Composite is necessary if CONFIG_USE_COMPOSITE
-+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [], [
-+    echo "Warning: Xcomposite library not found"
-+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
-+    ])
-+
- dnl SM and ICE are necessary if CONFIG_USE_SESSION_MANAGER
- AC_CHECK_LIB(SM, SmcOpenConnection)
- AC_CHECK_LIB(ICE, IceConnectionNumber)
- 
- dnl Freetype: actually only needed if CONFIG_USE_XFT
-diff -NarU5 wmx-7/Events.C SVN/wm2-2012-01-09/trunk/wmx/Events.C
---- wmx-7/Events.C	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Events.C	2012-01-09 11:05:39.672384052 -0500
-@@ -142,15 +142,23 @@
- 
-     if (!m_signalled) {
- 
-     waiting:
- 
--	if (m_channelChangeTime > 0) {
-+	if (m_channelChangeTime > 0 || CONFIG_CLOCK) {
-+
- 	    Time t = timestamp(True);
--	    if (t >= m_channelChangeTime) {
-+
-+	    if (m_channelChangeTime > 0 && t >= m_channelChangeTime) {
- 		instateChannel();
- 	    }
-+
-+            if (CONFIG_CLOCK && (m_clockUpdateTime == CurrentTime ||
-+                                 t >= m_clockUpdateTime + 60000)) {
-+                m_clockUpdateTime = t;
-+                updateClock();
-+            }
- 	}
- 
- 	if (QLength(m_display) > 0) {
- 	    XNextEvent(m_display, e);
- 	    return;
-diff -NarU5 wmx-7/Makefile.in SVN/wm2-2012-01-09/trunk/wmx/Makefile.in
---- wmx-7/Makefile.in	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Makefile.in	2012-01-09 11:05:39.670383938 -0500
-@@ -43,10 +43,15 @@
- 	cp wmx @bindir@/wmx
- 	-chmod 0755 @bindir@/wmx
- 	-chown root:wheel @bindir@/wmx
- 	-rm -f @bindir@/wmx.old
- 
-+install-rpm:
-+	mkdir -p $(DESTDIR)/usr/bin/
-+	cp wmx $(DESTDIR)/usr/bin/wmx
-+
-+
- # DO NOT DELETE -- make depend depends on it
- Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
-  Manager.h listmacro.h background.xpm
- Buttons.o: Buttons.C Manager.h General.h Config.h listmacro.h Client.h \
-  Border.h Rotated.h Menu.h
-diff -NarU5 wmx-7/Manager.C SVN/wm2-2012-01-09/trunk/wmx/Manager.C
---- wmx-7/Manager.C	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Manager.C	2012-01-09 11:05:39.678384393 -0500
-@@ -13,10 +13,14 @@
- #include <sys/wait.h>
- 
- #include "Cursors.h"
- #include <X11/cursorfont.h>
- 
-+#ifdef CONFIG_USE_COMPOSITE
-+#include <X11/extensions/Xcomposite.h>
-+#endif
-+
- Atom    Atoms::wm_state;
- Atom    Atoms::wm_changeState;
- Atom    Atoms::wm_protocols;
- Atom    Atoms::wm_delete;
- Atom    Atoms::wm_takeFocus;
-@@ -285,10 +289,12 @@
- 
-     m_channels = 2;
-     m_currentChannel = 1;
-     m_channelChangeTime = 0;
-     m_channelWindow = 0;
-+    m_clockWindow = 0;
-+    m_clockUpdateTime = CurrentTime;
- 
-     Atoms::wm_state      = XInternAtom(m_display, "WM_STATE",            False);
-     Atoms::wm_changeState= XInternAtom(m_display, "WM_CHANGE_STATE",     False);
-     Atoms::wm_protocols  = XInternAtom(m_display, "WM_PROTOCOLS",        False);
-     Atoms::wm_delete     = XInternAtom(m_display, "WM_DELETE_WINDOW",    False);
-@@ -338,11 +344,22 @@
- 
-     initialiseScreen();
-     if (m_screensTotal > 1) {
-         fprintf(stderr, "\n     Detected %d screens.", m_screensTotal);
-     }
--    
-+   
-+#ifdef CONFIG_USE_COMPOSITE
-+    int ev, er;
-+    if (XCompositeQueryExtension(m_display, &ev, &er)) {
-+        fprintf(stderr, "\n     Enabling composite extension.\n");
-+        for (int i = 0; i < m_screensTotal; ++i) {
-+            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
-+                                         CompositeRedirectAutomatic);
-+        }
-+    }
-+#endif
-+ 
-     XSetSelectionOwner(m_display, Atoms::wmx_running,
- 		       None, timestamp(True)); // used to have m_menuWindow
-     XSync(m_display, False);
-     m_initialising = False;
-     m_returnCode = 0;
-@@ -517,11 +534,12 @@
-   
-     m_root = (Window *) malloc(m_screensTotal * sizeof(Window));
-     m_defaultColormap = (Colormap *) malloc(m_screensTotal * sizeof(Colormap));
- //    m_minimumColormaps = (int *) malloc(m_screensTotal * sizeof(int));
-     m_channelWindow = (Window *) malloc(m_screensTotal * sizeof(Window));
--    
-+    m_clockWindow = (Window *) malloc(2 * sizeof(Window));
-+
-     for (i = 0 ; i < m_screensTotal ; i++) {
- 
-         m_screenNumber = i;
- 	m_channelWindow[i] = 0;
- 
-@@ -570,10 +588,14 @@
- 
-         XChangeWindowAttributes(m_display, m_root[i], CWCursor | CWEventMask, &attr);
-         XSync(m_display, False);
-     }
- 
-+    for (i = 0; i < 2; ++i) {
-+        m_clockWindow[i] = 0;
-+    }
-+
-     m_screenNumber = 0;
- }
- 
- 
- unsigned long WindowManager::allocateColour(int screen, const char *name,
-diff -NarU5 wmx-7/Manager.h SVN/wm2-2012-01-09/trunk/wmx/Manager.h
---- wmx-7/Manager.h	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Manager.h	2012-01-09 11:05:39.682384620 -0500
-@@ -150,16 +150,22 @@
- 
-     int m_channels;
-     int m_currentChannel;	// from 1 to ...
-     void flipChannel(Boolean statusOnly, Boolean flipDown,
- 		     Boolean quickFlip, Client *push); // bleah!
-+    Window createNumberWindow(int screen, const char *colour);
-+    int shapeNumberWindow(Window w, int number, int minDigits); // returns width in pixels
-     void instateChannel();
-     void createNewChannel();
-     void checkChannel(int);
-     Time m_channelChangeTime;
-     Window *m_channelWindow;
- 
-+    void updateClock();
-+    Window *m_clockWindow;
-+    Time m_clockUpdateTime;
-+
-     Boolean m_looping;
-     int m_returnCode;
- 
-     static Boolean m_initialising;
-     static int errorHandler(Display *, XErrorEvent *);
-diff -NarU5 wmx-7/Menu.C SVN/wm2-2012-01-09/trunk/wmx/Menu.C
---- wmx-7/Menu.C	2009-01-09 06:18:03.000000000 -0500
-+++ SVN/wm2-2012-01-09/trunk/wmx/Menu.C	2012-01-09 11:05:39.673384109 -0500
-@@ -54,10 +54,14 @@
- 	    tokstr = 0;
- 	    
- 	    FcPattern *pattern = FcPatternCreate();
- 	    FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi);
- 	    FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-+
-+#ifndef FC_WEIGHT_REGULAR
-+#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM
-+#endif
- 	    FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR);
- 	    FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE);
- 	    FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);
- 
- 	    FcResult result = FcResultMatch;
diff --git a/wmx-7-cfg.patch b/wmx-8-cfg.patch
similarity index 94%
rename from wmx-7-cfg.patch
rename to wmx-8-cfg.patch
index be40c73..560bd60 100644
--- a/wmx-7-cfg.patch
+++ b/wmx-8-cfg.patch
@@ -1,6 +1,6 @@
-diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
---- wmx-7.orig/Config.h	2012-01-09 16:07:03.610039637 -0500
-+++ wmx-7/Config.h	2012-01-09 16:07:46.408474496 -0500
+diff -NarU5 wmx-8.orig/Config.h wmx-8/Config.h
+--- wmx-8.orig/Config.h	2014-11-16 14:34:19.000000000 -0500
++++ wmx-8/Config.h	2014-11-20 09:41:54.238623357 -0500
 @@ -77,11 +77,11 @@
  // Spawn a temporary new shell between the wm and each new process?
  #define CONFIG_EXEC_USING_SHELL   False
diff --git a/wmx.spec b/wmx.spec
index 64c15f6..6f1f247 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,19 +1,16 @@
-%define checkout 20120109svn
-
 Name: wmx
-Version: 7
-Release: 14.%{checkout}%{?dist}
+Version: 8
+Release: 1%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
 URL: http://www.all-day-breakfast.com/wmx/
 Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
-Source1: wmx-defaults-2.tar.gz
+Source1: wmx-defaults-3.tar.gz
 Source2: background.xpm
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
-Patch0: wmx-7-20120109svn.patch
-Patch1: wmx-7-cfg.patch
+Patch0: wmx-8-cfg.patch
 #wmx's 'New' button is hardcoded to start an xterm, better make sure we have it:
 Requires: xterm
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,7 +25,6 @@ configurable options.
 %setup -q -a 1
 %{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11 LIBS=-lfontconfig
@@ -38,7 +34,7 @@ configurable options.
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
-%{__install} -m 0755 wmx-defaults-2/* %{buildroot}%{_datadir}/%{name}
+%{__install} -m 0755 wmx-defaults-3/* %{buildroot}%{_datadir}/%{name}
 %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup
 %{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/wmx.desktop
 %{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh
@@ -55,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Thu Nov 20 2014 Gabriel Somlo <somlo@cmu.edu> 8-1
+- update to 8
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-14.20120109svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -117,10 +116,10 @@ configurable options.
 * Fri Sep 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-14
 - rebuilt for FC6MassRebuild
 
-* Wed Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-13
+* Thu Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-13
 - rebuild
 
-* Wed Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-12
+* Thu Jun 08 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-12
 - more X11 buildrequires (thanks tibbs@math.uh.edu and Jarod Wilson)
 
 * Wed Jun 07 2006 Gabriel Somlo <somlo@cmu.edu> 6pl1-11
@@ -175,5 +174,5 @@ configurable options.
 * Tue Aug 09 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-0
 - rebuilt for Fedora Core 4
 
-* Wed May 23 2004 Gabriel Somlo <somlo@acns.colostate.edu>
+* Sun May 23 2004 Gabriel Somlo <somlo@acns.colostate.edu>
 - initial spec and packages.

From e74ceb72ec1e9f2f822a672be97841f1902065e1 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sat, 2 May 2015 18:36:31 +0200
Subject: [PATCH 13/45] Rebuilt for GCC 5 C++11 ABI change

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 6f1f247..6c1205b 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 8-2
+- Rebuilt for GCC 5 C++11 ABI change
+
 * Thu Nov 20 2014 Gabriel Somlo <somlo@cmu.edu> 8-1
 - update to 8
 

From 75b1d87f1c327be60681e1bbfe809bba88942d27 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 02:31:34 +0000
Subject: [PATCH 14/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 6c1205b..d783e5a 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 8-2
 - Rebuilt for GCC 5 C++11 ABI change
 

From c894e3fb35194aa203e6f57644604f9036a81a7d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 03:06:48 +0000
Subject: [PATCH 15/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index d783e5a..42da1ce 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 892e4fc13068f7b7b124b0af06db9e342ba52f0e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 17:29:24 +0000
Subject: [PATCH 16/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 42da1ce..e97d560 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 4e852c332a6ebbcb515b77a2f33ecb0ade3070a1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 21:42:58 +0000
Subject: [PATCH 17/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index e97d560..0388fbc 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 110b11f6fe2c905b2f795b6c206f38813362c3fa Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 10:21:52 +0000
Subject: [PATCH 18/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 0388fbc..d759ec5 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 63de701a405b5f3c0f30cfdc8845fdba0c13965d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 21:05:26 +0000
Subject: [PATCH 19/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index d759ec5..c7ef151 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From 9711bb8717453517234e077bc41fa34bc8e3113a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 00:49:03 +0100
Subject: [PATCH 20/45] Remove BuildRoot definition

None of currently supported distributions need that.
It was needed last for EL5 which is EOL now

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 wmx.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index c7ef151..dedcf97 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -13,7 +13,6 @@ Source4: Xclients.wmx.sh
 Patch0: wmx-8-cfg.patch
 #wmx's 'New' button is hardcoded to start an xterm, better make sure we have it:
 Requires: xterm
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description

From 274e28e1b1f88b8669a3995c41133473006d0b72 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 09:14:09 +0100
Subject: [PATCH 21/45] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 wmx.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wmx.spec b/wmx.spec
index dedcf97..9909400 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -38,9 +38,6 @@ configurable options.
 %{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/wmx.desktop
 %{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %doc README* UPDATES TODO.netwm rsharman-patch/

From 54321bb12c94e5e171f8342ae7b81514a7c0149f Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Jul 2018 01:39:16 -0500
Subject: [PATCH 22/45] Remove needless use of %defattr

---
 wmx.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 9909400..69671f8 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -39,7 +39,6 @@ configurable options.
 %{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh
 
 %files
-%defattr(-,root,root)
 %doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
 %{_datadir}/%{name}

From 1ebf3da65541401a19bf2dbcd9c7524221f14135 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 08:57:05 +0000
Subject: [PATCH 23/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 69671f8..59a2f2e 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From efdd9c8eef557520d6a1db81baf3fe50e8589664 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <gsomlo@gmail.com>
Date: Mon, 23 Jul 2018 12:10:46 -0400
Subject: [PATCH 24/45] Add "BuildRequires: gcc-c++" (#1606700)

---
 wmx.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wmx.spec b/wmx.spec
index 59a2f2e..d2620d2 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -13,7 +13,7 @@ Source4: Xclients.wmx.sh
 Patch0: wmx-8-cfg.patch
 #wmx's 'New' button is hardcoded to start an xterm, better make sure we have it:
 Requires: xterm
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
+BuildRequires: gcc-c++ xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Jul 23 2018 Gabriel Somlo <somlo@cmu.edu> 8-10
+- add "BuildRequires: gcc-c++" (#1606700)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From bca577030c93b34308068187907b7178babf6562 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:30 +0100
Subject: [PATCH 25/45] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 wmx.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index d2620d2..3f9801b 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -3,7 +3,6 @@ Version: 8
 Release: 10%{?dist}
 Summary: A really simple window manager for X
 License: BSD
-Group: User Interface/X
 URL: http://www.all-day-breakfast.com/wmx/
 Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
 Source1: wmx-defaults-3.tar.gz

From 245bdcd69d82452405c1a5a8149389c145543d9f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 11:52:09 +0000
Subject: [PATCH 26/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 3f9801b..6438ec9 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -45,6 +45,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jul 23 2018 Gabriel Somlo <somlo@cmu.edu> 8-10
 - add "BuildRequires: gcc-c++" (#1606700)
 

From e1c741ac6d8f6a209d39b95fd58a89b8be557fee Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 03:38:37 +0000
Subject: [PATCH 27/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 6438ec9..0d990a1 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -45,6 +45,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From c9e9b985ab271fd97787f123da73c4b97ec581f6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 03:52:22 +0000
Subject: [PATCH 28/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 0d990a1..da4b19d 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -45,6 +45,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From e241f8abb59b687f3ed75a3fe74f1176a9b4b777 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 14:16:23 +0000
Subject: [PATCH 29/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index da4b19d..7dd4c46 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -45,6 +45,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From f9f3d0a2b400918be7a13991eacb13c3c4ff0794 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sat, 9 Jan 2021 01:00:08 +0000
Subject: [PATCH 30/45] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 wmx.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wmx.spec b/wmx.spec
index 7dd4c46..a36c770 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -12,6 +12,7 @@ Source4: Xclients.wmx.sh
 Patch0: wmx-8-cfg.patch
 #wmx's 'New' button is hardcoded to start an xterm, better make sure we have it:
 Requires: xterm
+BuildRequires: make
 BuildRequires: gcc-c++ xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description

From dca45af2e3503064267f04ad1cb760936e2aa0d5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 23:37:16 +0000
Subject: [PATCH 31/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index a36c770..b4f609e 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 9c937f1fed7fb43a00e5c3b5feaa4252ed13b384 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 21:05:08 +0000
Subject: [PATCH 32/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index b4f609e..e6d97af 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 86544937b502c2a9bf4a3933cd122a2df6f793a8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 04:37:04 +0000
Subject: [PATCH 33/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index e6d97af..c478fb7 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 544b6a785019819cc302bac7107cf5cc0810335c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 12:34:24 +0000
Subject: [PATCH 34/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index c478fb7..0ede61c 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 4b9550edc7a8803be3e5a984c01bb04a65ac7963 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 06:56:31 +0000
Subject: [PATCH 35/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 0ede61c..8642bee 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 9ab0dbb3f0229b5ed154111a88f4a53fdcf51d84 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 18:19:22 +0000
Subject: [PATCH 36/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 8642bee..c8b0373 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 19%{?dist}
+Release: 20%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 24b0e38824b174db1300ee560dd5099e3caae569 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 09:01:58 +0000
Subject: [PATCH 37/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index c8b0373..682bbd0 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 8632487e9a4a6daad1ab2fdf06143aef16332f6f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 29 Jan 2024 11:17:13 +0000
Subject: [PATCH 38/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 682bbd0..d7be305 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 21%{?dist}
+Release: 22%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 4b7f42eb2a008dea0b6ca5aeafcc35c6249b723c Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:49 +0200
Subject: [PATCH 39/45] Eliminate use of obsolete %patchN syntax (#2283636)

---
 wmx.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index d7be305..c44793c 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -23,7 +23,7 @@ configurable options.
 %setup -q
 %setup -q -a 1
 %{__install} -p -m 0644 %{SOURCE2} .
-%patch0 -p1
+%patch -P0 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11 LIBS=-lfontconfig

From a3655e68210563a116971e47161a2bbef608c835 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 09:29:16 +0000
Subject: [PATCH 40/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index c44793c..9e2bcc0 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 22%{?dist}
+Release: 23%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 URL: http://www.all-day-breakfast.com/wmx/
@@ -46,6 +46,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 3a0853d91420a4a0771828ce3f5b5cc3dc0e4d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 4 Sep 2024 22:48:03 +0200
Subject: [PATCH 41/45] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 wmx.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wmx.spec b/wmx.spec
index 9e2bcc0..be89549 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,8 +1,9 @@
 Name: wmx
 Version: 8
-Release: 23%{?dist}
+Release: 24%{?dist}
 Summary: A really simple window manager for X
-License: BSD
+# Automatically converted from old format: BSD - review is highly recommended.
+License: LicenseRef-Callaway-BSD
 URL: http://www.all-day-breakfast.com/wmx/
 Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
 Source1: wmx-defaults-3.tar.gz
@@ -46,6 +47,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 8-24
+- convert license to SPDX
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From b0f3cb0238494f1adce7acc3985e628f21addd83 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 15:11:28 +0000
Subject: [PATCH 42/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index be89549..4b43c0c 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: A really simple window manager for X
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
@@ -47,6 +47,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 8-24
 - convert license to SPDX
 

From a3bb65153ca38df3401a2c2b18f1e00b5e3ad4af Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:30:24 +0000
Subject: [PATCH 43/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 4b43c0c..48f755c 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 25%{?dist}
+Release: 26%{?dist}
 Summary: A really simple window manager for X
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
@@ -47,6 +47,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From e7ddb586a0a8b298d427b50fa967f85a6b76dda6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 20:19:44 +0000
Subject: [PATCH 44/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 48f755c..1e07809 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: A really simple window manager for X
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
@@ -47,6 +47,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 567ba344cdff98b50872f2acad2dd566aa5b41e5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:53:32 +0000
Subject: [PATCH 45/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 wmx.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wmx.spec b/wmx.spec
index 1e07809..3ea685b 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 8
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: A really simple window manager for X
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
@@ -47,6 +47,9 @@ configurable options.
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild