[sawfish: 1/3] Revert "applied patch from Tuukka Hastrup iki fi to support buttons 8 and 9"

[Christopher Bratusek <chrisb src gnome org>]

commit c063ad45c540fed143860ce7a111b961dca10447
Author: Timo Korvola <tkorvola iki fi>
Date:   Mon May 4 22:06:35 2009 +0300

    Revert "applied patch from Tuukka Hastrup iki fi to support buttons 8 and 9"
    
    This reverts commit c91e08505a337f8a4496f6abc00fe94ef68934a7.
    
    Conflicts:
    
    	src/ChangeLog.pre-1.5.0
    	src/keys.h

 src/ChangeLog.pre-1.5.0 |    5 -----
 src/keys.c              |   16 +++-------------
 src/keys.h              |   26 ++------------------------
 3 files changed, 5 insertions(+), 42 deletions(-)
---
diff --git a/src/ChangeLog.pre-1.5.0 b/src/ChangeLog.pre-1.5.0
index 1a51926..d2da2b4 100644
--- a/src/ChangeLog.pre-1.5.0
+++ b/src/ChangeLog.pre-1.5.0
@@ -53,11 +53,6 @@
 	Dubacq <jean-christophe dubacq ens-lyon org> via Christian
 	Marillat)
 
-2004-11-15  John Harper  <jsh unfactored org>
-
-	* keys.c: applied patch from Tuukka Hastrup iki fi to support
-	buttons 8 and 9
-
 2004-10-17  John Harper  <jsh unfactored org>
 
 	* fonts.c (Fget_font_typed): fix typo when checking for match
diff --git a/src/keys.c b/src/keys.c
index f4d3c64..1cde715 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[9] = { Button1, Button2, Button3, Button4, Button5, Button6, Button7, Button8, Button9 };
+static int all_buttons[7] = { Button1, Button2, Button3, Button4, Button5, Button6, Button7 };
 
 /* locks: currently LockMask, num_lock, and scroll_lock */
 static int total_lock_combs, all_lock_mask;
@@ -268,12 +268,6 @@ translate_event(unsigned long *code, unsigned long *mods, XEvent *xev)
 	case Button7:
 	    *mods |= Button7Mask;
 	    break;
-	case Button8:
-	    *mods |= Button8Mask;
-	    break;
-	case Button9:
-	    *mods |= Button9Mask;
-	    break;
 	}
 	ret = TRUE;
 	break;
@@ -347,8 +341,6 @@ translate_event_to_x_button (repv ev, unsigned int *button, unsigned int *state)
 	    { Button5, Button5Mask },
 	    { Button6, Button6Mask },
 	    { Button7, Button7Mask },
-	    { Button8, Button8Mask },
-	    { Button9, Button9Mask },
 	    { 0, 0 }
 	};
 	int i;
@@ -672,8 +664,6 @@ static struct key_def default_mods[] = {
     { "Button5",  Button5Mask },
     { "Button6",  Button6Mask },
     { "Button7",  Button7Mask },
-    { "Button8",  Button8Mask },
-    { "Button9",  Button9Mask },
     { "Any",      EV_MOD_ANY },
     { "Release",  EV_MOD_RELEASE },
     { 0, 0 }
@@ -1706,7 +1696,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 < 9; i++)
+		for (i = 0; i < 7; i++)
 		{
 		    XGrabButton (dpy, all_buttons[i], AnyModifier,
 				 grab_win, False, POINTER_GRAB_EVENTS,
@@ -1758,7 +1748,7 @@ ungrab_event (Window grab_win, repv ev)
 	    }
 	    else
 	    {
-		for (i = 0; i < 9; i++)
+		for (i = 0; i < 7; i++)
 		    XUngrabButton (dpy, all_buttons[i], AnyModifier, grab_win);
 	    }
 	}
diff --git a/src/keys.h b/src/keys.h
index 6d4f401..117be57 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -71,7 +71,7 @@ enum {
     EV_VIRT_MOD_MASK = 0x0ff00000
 };
 
-/* Support for buttons 6, 7, 8 and 9.
+/* Support for buttons 6 and 7.
 
    <X11/X.h> doesn't define these, even though XFree supports them.. */
 
@@ -89,38 +89,16 @@ enum {
 # define Button7Mask (1<<14)
 #endif
 
-#ifndef Button8
-# define Button8 8
-#endif
-#ifndef Button8Mask
-# define Button8Mask (1<<15)
-#endif
-
-#ifndef Button9
-# define Button9 9
-#endif
-#ifndef Button9Mask
-# define Button9Mask (1<<16)
-#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)
-#elif !defined (Button8)
-# define EV_MOD_BUTTON_MASK (Button1Mask | Button2Mask | Button3Mask \
-			     | Button4Mask | Button5Mask | Button6Mask \
-			     | Button7Mask)
-#elif !defined (Button9)
-# define EV_MOD_BUTTON_MASK (Button1Mask | Button2Mask | Button3Mask \
-			     | Button4Mask | Button5Mask | Button6Mask \
-                             | Button7Mask | Button8Mask)
 #else
 # define EV_MOD_BUTTON_MASK (Button1Mask | Button2Mask | Button3Mask \
 			     | Button4Mask | Button5Mask | Button6Mask \
-			     | Button7Mask | Button8Mask | Button9Mask)
+			     | Button7Mask)
 #endif
 
 /* In key maps, a `key' is (COMMAND . EVENT) */