(handle_one_xevent): Ignore buttons > 3 for the tool bar.

diff --git a/src/ChangeLog b/src/ChangeLog
index cad1ad4e2101489f6aba45044c63aaef2a88bdd2..0db2afdbb4f49a86a9647256a5d84c40bfb9b143 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-09  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c (handle_one_xevent): Ignore buttons > 3 for the tool bar.
+
 2007-03-09  Juanma Barranquero  <lekktu@gmail.com>
 
        * keymap.c (Fdescribe_buffer_bindings): Check that BUFFER is valid.

diff --git a/src/xterm.c b/src/xterm.c
index e9cf5fd6d0ecca57023711945a5812b65ea2af3d..4f77e22ac59730d926aee6baf5508fe42677491a 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6759,15 +6759,16 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                 int y = event.xbutton.y;
 
                 window = window_from_coordinates (f, x, y, 0, 0, 0, 1);
-                if (EQ (window, f->tool_bar_window))
+                tool_bar_p = EQ (window, f->tool_bar_window);
+
+                if (tool_bar_p && event.xbutton.button < 4)
                   {
-                   if (event.xbutton.type == ButtonPress)
-                     handle_tool_bar_click (f, x, y, 1, 0);
-                   else
-                     handle_tool_bar_click (f, x, y, 0,
-                                            x_x_to_emacs_modifiers (dpyinfo,
+                    if (event.xbutton.type == ButtonPress)
+                      handle_tool_bar_click (f, x, y, 1, 0);
+                    else
+                      handle_tool_bar_click (f, x, y, 0,
+                                             x_x_to_emacs_modifiers (dpyinfo,
                                                                     event.xbutton.state));
-                   tool_bar_p = 1;
                   }
               }