Files fluxbox.orig/src/.Window.cc.swp and fluxbox/src/.Window.cc.swp differ
diff -urN fluxbox.orig/src/Window.cc fluxbox/src/Window.cc
--- fluxbox.orig/src/Window.cc	2003-08-13 18:39:24.000000000 +0200
+++ fluxbox/src/Window.cc	2003-08-17 03:09:37.000000000 +0200
@@ -74,37 +74,37 @@
                 Window window, Cursor cursor) {
 
     //numlock
-    XGrabButton(display, button, Mod1Mask|Mod2Mask, window, True,
+    XGrabButton(display, button, Mod4Mask|Mod2Mask, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
     //scrolllock
-    XGrabButton(display, button, Mod1Mask|Mod5Mask, window, True,
+    XGrabButton(display, button, Mod4Mask|Mod5Mask, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 	
     //capslock
-    XGrabButton(display, button, Mod1Mask|LockMask, window, True,
+    XGrabButton(display, button, Mod4Mask|LockMask, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 
     //capslock+numlock
-    XGrabButton(display, Button1, Mod1Mask|LockMask|Mod2Mask, window, True,
+    XGrabButton(display, Button1, Mod4Mask|LockMask|Mod2Mask, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 
     //capslock+scrolllock
-    XGrabButton(display, button, Mod1Mask|LockMask|Mod5Mask, window, True,
+    XGrabButton(display, button, Mod4Mask|LockMask|Mod5Mask, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 	
     //capslock+numlock+scrolllock
-    XGrabButton(display, button, Mod1Mask|LockMask|Mod2Mask|Mod5Mask, window, 
+    XGrabButton(display, button, Mod4Mask|LockMask|Mod2Mask|Mod5Mask, window, 
                 True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 
     //numlock+scrollLock
-    XGrabButton(display, button, Mod1Mask|Mod2Mask|Mod5Mask, window, True,
+    XGrabButton(display, button, Mod4Mask|Mod2Mask|Mod5Mask, window, True,
                 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
                 GrabModeAsync, None, cursor);
 	
@@ -928,20 +928,20 @@
     XGrabButton(display, Button1, AnyModifier, 
 		frame().clientArea().window(), True, ButtonPressMask,
 		GrabModeSync, GrabModeSync, None, None);		
-    XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame().clientArea().window());
+    XUngrabButton(display, Button1, Mod4Mask|Mod2Mask|Mod3Mask|Mod4Mask, frame().clientArea().window());
 
 
-    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, frame().theme().lowerRightAngleCursor());
 	
@@ -2352,7 +2352,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(); 
         }
@@ -2380,7 +2380,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)
             XUngrabPointer(display, CurrentTime);
         else 
             frame().buttonReleaseEvent(re);
@@ -2398,7 +2398,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())) {
         int borderw = frame().window().borderWidth();
         if (me.x_root < (frame().x() + borderw) ||
Files fluxbox.orig/src/Window.o and fluxbox/src/Window.o differ
Files fluxbox.orig/src/fluxbox and fluxbox/src/fluxbox differ