[sawfish: 2/3] Revert "support Button6 and Button7 define Button6 and Button7 values to their"

[Christopher Bratusek <chrisb src gnome org>]

commit 8e1a451f6791b6abcae4b7578ceefba490405110
Author: Timo Korvola <tkorvola iki fi>
Date:   Mon May 4 22:10:38 2009 +0300

    Revert "support Button6 and Button7 define Button6 and Button7 values to their"
    
    This reverts commit f80a59e005ee9c9ac8f361872826c292a79ab603.
    
    Conflicts:
    
    	src/keys.h

 src/ChangeLog.pre-1.5.0 |    6 ------
 src/keys.c              |   16 +++-------------
 src/keys.h              |   31 ++-----------------------------
 3 files changed, 5 insertions(+), 48 deletions(-)
---
diff --git a/src/ChangeLog.pre-1.5.0 b/src/ChangeLog.pre-1.5.0
index d2da2b4..104aa13 100644
--- a/src/ChangeLog.pre-1.5.0
+++ b/src/ChangeLog.pre-1.5.0
@@ -780,12 +780,6 @@
 
 2000-12-04  John Harper  <jsh eazel com>
 
-	* keys.c: support Button6 and Button7
-	* keys.h: define Button6 and Button7 values to their logical
-	values (known to work on XFree86 version 4)
-
-	[ adapted from a patch by Steve Haslam <araqnid debian org> ]
-
 	* images.c (Fimage_modifier, Fset_image_modifier): fixed bug of
 	not accepting () to stand for all three color components
 
diff --git a/src/keys.c b/src/keys.c
index 1cde715..1ca0178 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -97,7 +97,7 @@ DEFSYM(super_keysyms, "super-keysyms");
 static void grab_keymap_event (repv km, long code, long mods, bool grab);
 static void grab_all_keylist_events (repv map, bool grab);
 
-static int all_buttons[7] = { Button1, Button2, Button3, Button4, Button5, Button6, Button7 };
+static int all_buttons[5] = { Button1, Button2, Button3, Button4, Button5 };
 
 /* locks: currently LockMask, num_lock, and scroll_lock */
 static int total_lock_combs, all_lock_mask;
@@ -262,12 +262,6 @@ translate_event(unsigned long *code, unsigned long *mods, XEvent *xev)
 	case Button5:
 	    *mods |= Button5Mask;
 	    break;
-	case Button6:
-	    *mods |= Button6Mask;
-	    break;
-	case Button7:
-	    *mods |= Button7Mask;
-	    break;
 	}
 	ret = TRUE;
 	break;
@@ -339,8 +333,6 @@ translate_event_to_x_button (repv ev, unsigned int *button, unsigned int *state)
 	    { Button3, Button3Mask },
 	    { Button4, Button4Mask },
 	    { Button5, Button5Mask },
-	    { Button6, Button6Mask },
-	    { Button7, Button7Mask },
 	    { 0, 0 }
 	};
 	int i;
@@ -662,8 +654,6 @@ static struct key_def default_mods[] = {
     { "Button3",  Button3Mask },
     { "Button4",  Button4Mask },
     { "Button5",  Button5Mask },
-    { "Button6",  Button6Mask },
-    { "Button7",  Button7Mask },
     { "Any",      EV_MOD_ANY },
     { "Release",  EV_MOD_RELEASE },
     { 0, 0 }
@@ -1696,7 +1686,7 @@ grab_event (Window grab_win, repv ev)
 	    {
 		/* sawfish treats mouse buttons as modifiers, not as
 		   codes, so for us AnyModifier includes all buttons.. */
-		for (i = 0; i < 7; i++)
+		for (i = 0; i < 5; i++)
 		{
 		    XGrabButton (dpy, all_buttons[i], AnyModifier,
 				 grab_win, False, POINTER_GRAB_EVENTS,
@@ -1748,7 +1738,7 @@ ungrab_event (Window grab_win, repv ev)
 	    }
 	    else
 	    {
-		for (i = 0; i < 7; i++)
+		for (i = 0; i < 5; i++)
 		    XUngrabButton (dpy, all_buttons[i], AnyModifier, grab_win);
 	    }
 	}
diff --git a/src/keys.h b/src/keys.h
index 117be57..9fb9f15 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -71,35 +71,8 @@ enum {
     EV_VIRT_MOD_MASK = 0x0ff00000
 };
 
-/* Support for buttons 6 and 7.
-
-   <X11/X.h> doesn't define these, even though XFree supports them.. */
-
-#ifndef Button6
-# define Button6 6
-#endif
-#ifndef Button6Mask
-# define Button6Mask (1<<13)
-#endif
-
-#ifndef Button7
-# define Button7 7
-#endif
-#ifndef Button7Mask
-# define Button7Mask (1<<14)
-#endif
-
-#if !defined (Button6)
-# define EV_MOD_BUTTON_MASK (Button1Mask | Button2Mask | Button3Mask \
-			     | Button4Mask | Button5Mask)
-#elif !defined (Button7)
-# define EV_MOD_BUTTON_MASK (Button1Mask | Button2Mask | Button3Mask \
-			     | Button4Mask | Button5Mask | Button6Mask)
-#else
-# define EV_MOD_BUTTON_MASK (Button1Mask | Button2Mask | Button3Mask \
-			     | Button4Mask | Button5Mask | Button6Mask \
-			     | Button7Mask)
-#endif
+#define EV_MOD_BUTTON_MASK \
+    (Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask)
 
 /* In key maps, a `key' is (COMMAND . EVENT) */