From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 3 Jan 2009 14:54:52 +0000 (+0000)
Subject: (parse_modifiers_uncached): Wheel events are clicks (bug#687).
X-Git-Tag: emacs-pretest-23.0.90~735
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6d46bc12c9a4e741570412fb55c4798e9fd75a6;p=emacs.git

(parse_modifiers_uncached): Wheel events are clicks (bug#687).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 54731699d0a..aa13e72da71 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-03  Jason Rumney  <jasonr@gnu.org>
 
+	* keyboard.c (parse_modifiers_uncached): Wheel events are
+	clicks (bug#687).
+
 	* w32term.c (x_query_colors, x_query_color): New functions.
 
 	* image.c (x_to_xcolors, png_load): Eliminate W32 specific code.
diff --git a/src/keyboard.c b/src/keyboard.c
index 35257c6d999..127cae67ee0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6313,6 +6313,11 @@ parse_modifiers_uncached (symbol, modifier_end)
       && ('0' <= SREF (name, i + 6) && SREF (name, i + 6) <= '9'))
     modifiers |= click_modifier;
 
+  if (! (modifiers & (double_modifier | triple_modifier))
+      && i + 6 < SBYTES (name)
+      && strncmp (SDATA (name) + i, "wheel-", 6) == 0)
+    modifiers |= click_modifier;
+
   if (modifier_end)
     *modifier_end = i;