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

diff --git a/src/ChangeLog b/src/ChangeLog
index 54731699d0af43281efb2845475fe2940d2e114c..aa13e72da71aeb8cbd51eff11461846c8dbb4f22 100644 (file)
--- 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 35257c6d999e77f43baafc80c6bf7d3603943461..127cae67ee003eead508340c7046fb5bb3b25c23 100644 (file)
--- 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;