diff -u -r fluxbox-0.9.10.orig/src/Window.cc fluxbox-0.9.10/src/Window.cc
--- fluxbox-0.9.10.orig/src/Window.cc	2004-08-31 16:39:43.000000000 +0000
+++ fluxbox-0.9.10/src/Window.cc	2004-09-14 13:34:55.000000000 +0000
@@ -91,41 +91,41 @@
     const int capslock = FbTk::KeyUtil::instance().capslock();
     const int scrolllock = FbTk::KeyUtil::instance().scrolllock();
 
-    // Grab with Mod1 and with all lock modifiers 
+    // Grab with Mod4 and with all lock modifiers 
     // (num, scroll and caps)
 
     //numlock
-    XGrabButton(display, button, Mod1Mask|numlock, window, True,
+    XGrabButton(display, button, Mod4Mask|numlock, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
     //scrolllock
-    XGrabButton(display, button, Mod1Mask|scrolllock, window, True,
+    XGrabButton(display, button, Mod4Mask|scrolllock, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 	
     //capslock
-    XGrabButton(display, button, Mod1Mask|capslock, window, True,
+    XGrabButton(display, button, Mod4Mask|capslock, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 
     //capslock+numlock
-    XGrabButton(display, Button1, Mod1Mask|capslock|numlock, window, True,
+    XGrabButton(display, Button1, Mod4Mask|capslock|numlock, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 
     //capslock+scrolllock
-    XGrabButton(display, button, Mod1Mask|capslock|scrolllock, window, True,
+    XGrabButton(display, button, Mod4Mask|capslock|scrolllock, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 	
     //capslock+numlock+scrolllock
-    XGrabButton(display, button, Mod1Mask|capslock|numlock|scrolllock, window, 
+    XGrabButton(display, button, Mod4Mask|capslock|numlock|scrolllock, window, 
                 True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 
     //numlock+scrollLock
-    XGrabButton(display, button, Mod1Mask|numlock|scrolllock, window, True,
+    XGrabButton(display, button, Mod4Mask|numlock|scrolllock, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 	
@@ -996,20 +996,20 @@
     XGrabButton(display, Button1, AnyModifier, 
                 frame().window().window(), True, ButtonPressMask,
                 GrabModeSync, GrabModeSync, None, None);                
-    XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame().window().window());
+    XUngrabButton(display, Button1, Mod4Mask|Mod2Mask|Mod3Mask, frame().window().window());
 
     if (Fluxbox::instance()->useMod1()) {
-        XGrabButton(display, Button1, Mod1Mask, frame().window().window(), True,
+        XGrabButton(display, Button1, Mod4Mask, frame().window().window(), True,
                     ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                     GrabModeAsync, None, frame().theme().moveCursor());
 
         //----grab with "all" modifiers
         grabButton(display, Button1, frame().window().window(), frame().theme().moveCursor());
    
-        XGrabButton(display, Button2, Mod1Mask, frame().window().window(), True,
+        XGrabButton(display, Button2, Mod4Mask, frame().window().window(), True,
                     ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None);
 		
-        XGrabButton(display, Button3, Mod1Mask, frame().window().window(), True,
+        XGrabButton(display, Button3, Mod4Mask, frame().window().window(), True,
                     ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                     GrabModeAsync, None, None);
 	
@@ -2421,7 +2421,7 @@
     // check frame events first
     frame().buttonPressEvent(be);
 
-    if (be.button == 1 || (be.button == 3 && be.state == Mod1Mask)) {
+    if (be.button == 1 || (be.button == 3 && be.state == Mod4Mask)) {
         if ((! focused) && (! screen().isSloppyFocus())) { //check focus 
             setInputFocus(); 
         }
@@ -2454,7 +2454,7 @@
     else if (m_attaching_tab)
         attachTo(re.x_root, re.y_root);
     else if (re.window == frame().window()) {
-        if (re.button == 2 && re.state == Mod1Mask)
+        if (re.button == 2 && re.state == Mod4Mask)
             ungrabPointer(CurrentTime);
         else 
             frame().buttonReleaseEvent(re);
@@ -2472,7 +2472,7 @@
                             frame().handle() == me.window || frame().window() == me.window);
 
     if (Fluxbox::instance()->getIgnoreBorder()
-        && !(me.state & Mod1Mask) // really should check for exact matches
+        && !(me.state & Mod4Mask) // really should check for exact matches
         && !(isMoving() || isResizing() || m_attaching_tab != 0)) {
         int borderw = frame().window().borderWidth();
         if (me.x_root < (frame().x() + borderw) ||