# HG changeset patch
# User cannam
# Date 1232390990 0
#      Mon Jan 19 18:49:50 2009 +0000
# Branch wmx
# Node ID 9d48a513994600c022909c4de8e95b351685a87e
# Parent  aebcf3a787591a5eaac2ebe10f202c22aae8b74b
* Duh -- last-minute change to the location of that last edit stopped it
  from working... fixed now.
* Revert an unintended commit.

diff --git a/Config.h b/Config.h
--- a/Config.h
+++ b/Config.h
@@ -263,10 +263,8 @@
 #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
 
 
 // ==============================
diff --git a/Manager.C b/Manager.C
--- a/Manager.C
+++ b/Manager.C
@@ -229,17 +229,6 @@
 
     fprintf(stderr, "\n     NETWM compliant.");
 
-#ifdef CONFIG_USE_COMPOSITE
-    int ev, er;
-    if (XCompositeQueryExtension(m_display, &ev, &er)) {
-        fprintf(stderr, "  Composite extension enabled.");
-        for (int i = 0; i < m_screensTotal; ++i) {
-            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
-                                         CompositeRedirectAutomatic);
-        }
-    }
-#endif
-
     fprintf(stderr, "\n     Command menu taken from ");
     if (wmxdir == NULL) {
 	fprintf(stderr, "%s/%s.\n", home, CONFIG_COMMAND_MENU);
@@ -259,6 +248,17 @@
     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;