Merge remote-tracking branch 'origin/master' into feature/pgtk

3 files changed, 55 insertions, 18 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 35b98846a90..df07cf290b8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5997,6 +5997,21 @@ make_lispy_event (struct input_event *event)
           return list2 (head, position);
       }
 
+    case TOUCH_END_EVENT:
+      {
+        Lisp_Object position;
+
+        /* Build the position as appropriate for this mouse click.  */
+        struct frame *f = XFRAME (event->frame_or_window);
+
+        if (! FRAME_LIVE_P (f))
+          return Qnil;
+
+        position = make_lispy_position (f, event->x, event->y,
+                                        event->timestamp);
+
+        return list2 (Qtouch_end, position);
+      }
 
 #ifdef USE_TOOLKIT_SCROLL_BARS
 
@@ -11754,6 +11769,8 @@ syms_of_keyboard (void)
   DEFSYM (Qfile_notify, "file-notify");
 #endif /* USE_FILE_NOTIFY */
 
+  DEFSYM (Qtouch_end, "touch-end");
+
   /* Menu and tool bar item parts.  */
   DEFSYM (QCenable, ":enable");
   DEFSYM (QCvisible, ":visible");
diff --git a/src/termhooks.h b/src/termhooks.h
index 649a4236d20..b124e995292 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -273,6 +273,13 @@ enum event_kind
   /* Pre-edit text was changed. */
   , PGTK_PREEDIT_TEXT_EVENT
 #endif
+
+  /* Either the mouse wheel has been released without it being
+     clicked, or the user has lifted his finger from a touchpad.
+
+     In the future, this may take into account other multi-touch
+     events generated from touchscreens and such.  */
+  , TOUCH_END_EVENT
 };
 
 /* Bit width of an enum event_kind tag at the start of structs and unions.  */
diff --git a/src/xterm.c b/src/xterm.c
index d633953018c..3f7b9560345 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10025,42 +10025,55 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                         val->emacs_value += delta;
 
                         if (mwheel_coalesce_scroll_events
-                            && (fabs (val->emacs_value) < 1))
+                            && (fabs (val->emacs_value) < 1)
+                            && (fabs (delta) > 0))
                           continue;
 
                         bool s = signbit (val->emacs_value);
-                        inev.ie.kind = (val->horizontal
-                                        ? HORIZ_WHEEL_EVENT
-                                        : WHEEL_EVENT);
+                        inev.ie.kind = (fabs (delta) > 0
+                                        ? (val->horizontal
+                                           ? HORIZ_WHEEL_EVENT
+                                           : WHEEL_EVENT)
+                                        : TOUCH_END_EVENT);
                         inev.ie.timestamp = xev->time;
 
                         XSETINT (inev.ie.x, lrint (xev->event_x));
                         XSETINT (inev.ie.y, lrint (xev->event_y));
                         XSETFRAME (inev.ie.frame_or_window, f);
 
-                        inev.ie.modifiers = !s ? up_modifier : down_modifier;
-                        inev.ie.modifiers
-                          |= x_x_to_emacs_modifiers (dpyinfo,
-                                                     xev->mods.effective);
+                        if (fabs (delta) > 0)
+                          {
+                            inev.ie.modifiers = !s ? up_modifier : down_modifier;
+                            inev.ie.modifiers
+                              |= x_x_to_emacs_modifiers (dpyinfo,
+                                                         xev->mods.effective);
+                          }
 
                         scroll_unit = pow (FRAME_PIXEL_HEIGHT (f), 2.0 / 3.0);
 
                         if (NUMBERP (Vx_scroll_event_delta_factor))
                           scroll_unit *= XFLOATINT (Vx_scroll_event_delta_factor);
 
-                        if (val->horizontal)
+                        if (fabs (delta) > 0)
                           {
-                            inev.ie.arg
-                              = list3 (Qnil,
-                                       make_float (val->emacs_value
-                                                   * scroll_unit),
-                                       make_float (0));
+                            if (val->horizontal)
+                              {
+                                inev.ie.arg
+                                  = list3 (Qnil,
+                                           make_float (val->emacs_value
+                                                       * scroll_unit),
+                                           make_float (0));
+                              }
+                            else
+                              {
+                                inev.ie.arg = list3 (Qnil, make_float (0),
+                                                     make_float (val->emacs_value
+                                                                 * scroll_unit));
+                              }
                           }
-                        else
+                        else
                           {
-                            inev.ie.arg = list3 (Qnil, make_float (0),
-                                                 make_float (val->emacs_value
-                                                             * scroll_unit));
+                            inev.ie.arg = Qnil;
                           }
 
                         kbd_buffer_store_event_hold (&inev.ie, hold_quit);