[Emacs-diffs] trunk r115606: Generate HORIZ_WHEEL_EVENT.

[Jan D.]

------------------------------------------------------------
revno: 115606
revision-id: address@hidden
parent: address@hidden
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-19 08:38:08 +0100
message:
  Generate HORIZ_WHEEL_EVENT.
  
  * nsterm.m (mouseDown:): Generate HORIZ_WHEEL_EVENT.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-18 20:36:50 +0000
+++ b/src/ChangeLog     2013-12-19 07:38:08 +0000
@@ -1,3 +1,7 @@
+2013-12-19  Anders Lindgren <address@hidden>
+
+       * nsterm.m (mouseDown:): Generate HORIZ_WHEEL_EVENT.
+
 2013-12-18  Paul Eggert  <address@hidden>
 
        Minor fixes for recent openp changes.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-12-11 15:06:04 +0000
+++ b/src/nsterm.m      2013-12-19 07:38:08 +0000
@@ -5498,8 +5498,18 @@
       CGFloat delta = [theEvent deltaY];
       /* Mac notebooks send wheel events w/delta =0 when trackpad scrolling */
       if (delta == 0)
-        return;
-      emacs_event->kind = WHEEL_EVENT;
+        {
+          delta = [theEvent deltaX];
+          if (delta == 0)
+            {
+              NSTRACE (deltaIsZero);
+              return;
+            }
+          emacs_event->kind = HORIZ_WHEEL_EVENT;
+        }
+      else
+        emacs_event->kind = WHEEL_EVENT;
+
       emacs_event->code = 0;
       emacs_event->modifiers = EV_MODIFIERS (theEvent) |
         ((delta > 0) ? up_modifier : down_modifier);