dist-git conversion

#2781)

.gitignore

@@ -1,2 +1,2 @@
-wmx-6pl1.tar.gz
 wmx-defaults-1.tar.gz
+wmx-7.tar.gz

Makefile

@@ -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 $$/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)

background.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *background[] = {
+static const char *background[] = {
 /* width height num_colors chars_per_pixel */
 "    80    80       27            1",
 /* colors */

sources

@@ -1,2 +1,2 @@
-212297d70acef90bbc9dac254de39cb8  wmx-6pl1.tar.gz
 a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
+e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz

wmx-7-cfg.patch

@@ -1,19 +1,7 @@
-diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
+diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
---- wmx-6pl1.orig/Config.h	2007-12-25 17:08:03.000000000 -0500
+--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ wmx-6pl1/Config.h	2007-12-25 17:10:44.000000000 -0500
++++ wmx-7/Config.h	2009-01-13 13:23:31.000000000 -0500
-@@ -75,11 +75,10 @@
+@@ -93,11 +93,11 @@
- #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_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())
-@@ -90,11 +89,11 @@
   
  // Directory under $HOME in which to look for commands for the
  // middle-button menu
@@ -26,7 +14,7 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
  #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
   
  // Focus possibilities.
-@@ -121,11 +120,11 @@
+@@ -126,11 +126,11 @@
  
  // Number of pixels off the screen you have to push a window
  // before the manager notices the window is off-screen (the higher
@@ -35,11 +23,11 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
 -#define CONFIG_BUMP_DISTANCE      16
 +#define CONFIG_BUMP_DISTANCE      32
  
- // If CONFIG_PROD_SHAPE is True, all frame element shapes will be
+ // If CONFIG_BUMP_EVERYWHERE is defined, windows will "bump" against
- // recalculated afresh every time their focus changes.  This will
+ // other window edges as well as the edges of the screen
- // probably slow things down hideously, but has been reported as
+ 
- // necessary on some systems (possibly SunOS 4.x with OpenWindows).
+ #define CONFIG_BUMP_EVERYWHERE    True
-@@ -178,11 +177,11 @@
+@@ -185,11 +185,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
@@ -52,20 +40,7 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -284,11 +283,11 @@
+@@ -329,11 +329,11 @@
- // standard X cursor font; otherwise it will install its own.  You may
- // wish to set this if your X client and server are on different
- // endian machines, or if you've aliased the cursor font to something
- // else you like better, or if you just prefer the plain X cursors
- 
--#define CONFIG_USE_PLAIN_X_CURSORS	False
-+#define CONFIG_USE_PLAIN_X_CURSORS	True
- 
- // Colours for window decorations.  The BORDERS one is for the
- // one-pixel border around the edge of each piece of decoration, not
- // for the whole decoration
- 
-@@ -304,11 +303,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  
  // Pixel width for the bit of frame to the left of the window and the
@@ -78,7 +53,7 @@ diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
  // ========================
  // Section IV. Flashy stuff
  // ========================
-@@ -317,11 +316,11 @@
+@@ -342,11 +342,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.

wmx-7-composite.patch

@@ -0,0 +1,227 @@
+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;

wmx.spec

@@ -1,6 +1,6 @@
 Name: wmx
-Version: 6pl1
+Version: 7
-Release: 18%{?dist}
+Release: 3%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,10 +11,10 @@ Source2: background.xpm
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-6pl1-cvs20071113.patch
+Patch0: wmx-7-composite.patch
-Patch1: wmx-6pl1-cfg.patch
+Patch1: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel
+BuildRequires: 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
@@ -22,8 +22,8 @@ configurable options.
 
 %prep
 %setup -q
-%setup -a 1
+%setup -q -a 1
-%{__install} -p %{SOURCE2} .
+%{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
 %patch1 -p1
 
@@ -47,12 +47,22 @@ configurable options.
 
 %files
 %defattr(-,root,root)
-%doc README* UPDATES ANNOYING-BUGS
+%doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
 %{_datadir}/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Jan 19 2009 Gabriel Somlo <somlo@cmu.edu> 7-3
+- applied patch for use of compositing offscreen storage to speed up rendering
+- added buildreq for libxcomposite-devel
+
+* Tue Jan 13 2009 Gabriel Somlo <somlo@cmu.edu> 7-2
+- re-enabled scroll-wheel-cycles-channels feature
+
+* Sat Jan 10 2009 Gabriel Somlo <somlo@cmu.edu> 7-1
+- update to 7
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 6pl1-18
 - Autorebuild for GCC 4.3
 
@@ -113,8 +123,8 @@ configurable options.
 * Fri Dec 16 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-3
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
-- example wmx .xsession file added to %doc
+- example wmx .xsession file added to doc
-- gave up on using /usr/X11R6/bin -- using %{_bindir} instead 
+- gave up on using /usr/X11R6/bin -- using bindir instead
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo@cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen