Update Android port

* doc/lispref/commands.texi (Touchscreen Events): Describe
treatment of canceled touch sequences during touch event
translation.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): Update JNI
prototypes.
* java/org/gnu/emacs/EmacsWindow.java (motionEvent): Set
cancelation flag in events sent where appropriate.
* lisp/touch-screen.el (touch-screen-handle-point-update):
Improve treatment of horizontal scrolling near window edges.
(touch-screen-handle-touch): Don't handle point up if the touch
sequence has been canceled.
* src/android.c (sendTouchDown, sendTouchUp, sendTouchMove): New
argument `flags'.
* src/androidgui.h (enum android_touch_event_flags): New enum.
(struct android_touch_event): New field `flags'.
* src/androidterm.c (handle_one_android_event): Report
cancelation in TOUCHSCREEN_END_EVENTs.
* src/keyboard.c (make_lispy_event): Fix botched merge.

4 files changed, 97 insertions, 33 deletions

diff --git a/src/android.c b/src/android.c
index 90288737c77..f2e5e75d35e 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2870,7 +2870,8 @@ NATIVE_NAME (sendButtonRelease) (JNIEnv *env, jobject object,
 JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
                              jshort window, jint x, jint y,
-                             jlong time, jint pointer_id)
+                             jlong time, jint pointer_id,
+                             jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -2883,6 +2884,7 @@ NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
   event.touch.y = y;
   event.touch.time = time;
   event.touch.pointer_id = pointer_id;
+  event.touch.flags = flags;
 
   android_write_event (&event);
   return event_serial;
@@ -2891,7 +2893,8 @@ NATIVE_NAME (sendTouchDown) (JNIEnv *env, jobject object,
 JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
                            jshort window, jint x, jint y,
-                           jlong time, jint pointer_id)
+                           jlong time, jint pointer_id,
+                           jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -2904,6 +2907,7 @@ NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
   event.touch.y = y;
   event.touch.time = time;
   event.touch.pointer_id = pointer_id;
+  event.touch.flags = flags;
 
   android_write_event (&event);
   return event_serial;
@@ -2912,7 +2916,8 @@ NATIVE_NAME (sendTouchUp) (JNIEnv *env, jobject object,
 JNIEXPORT jlong JNICALL
 NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
                              jshort window, jint x, jint y,
-                             jlong time, jint pointer_id)
+                             jlong time, jint pointer_id,
+                             jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -2925,6 +2930,7 @@ NATIVE_NAME (sendTouchMove) (JNIEnv *env, jobject object,
   event.touch.y = y;
   event.touch.time = time;
   event.touch.pointer_id = pointer_id;
+  event.touch.flags = flags;
 
   android_write_event (&event);
   return event_serial;
diff --git a/src/androidgui.h b/src/androidgui.h
index 9e604cdcb8c..265ec29b678 100644
--- a/src/androidgui.h
+++ b/src/androidgui.h
@@ -365,6 +365,13 @@ struct android_expose_event
   int width, height;
 };
 
+enum android_touch_event_flags
+  {
+    /* This touch sequence has been intercepted by the WM (probably
+       for back gesture navigation or some such.)  */
+    ANDROID_TOUCH_SEQUENCE_CANCELED = 1,
+  };
+
 struct android_touch_event
 {
   /* Type of the event.  */
@@ -384,6 +391,9 @@ struct android_touch_event
 
   /* Index of the pointer being tracked.  */
   unsigned int pointer_id;
+
+  /* Flags associated with this event.  */
+  int flags;
 };
 
 struct android_wheel_event
diff --git a/src/androidterm.c b/src/androidterm.c
index 27800a61864..bcb6cd6db45 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -1511,6 +1511,11 @@ handle_one_android_event (struct android_display_info *dpyinfo,
               inev.ie.kind = TOUCHSCREEN_END_EVENT;
               inev.ie.timestamp = event->touch.time;
 
+              /* Report whether the sequence has been canceled.  */
+
+              if (event->touch.flags & ANDROID_TOUCH_SEQUENCE_CANCELED)
+                inev.ie.modifiers = 1;
+
               XSETFRAME (inev.ie.frame_or_window, any);
               XSETINT (inev.ie.x, event->touch.x);
               XSETINT (inev.ie.y, event->touch.y);
diff --git a/src/keyboard.c b/src/keyboard.c
index bd7433e584a..73c4e3f2593 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6560,11 +6560,10 @@ make_lispy_event (struct input_event *event)
       {
         Lisp_Object x, y, id, position;
         struct frame *f;
+#ifdef HAVE_WINDOW_SYSTEM
         int tab_bar_item;
         bool close;
-#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
-        int column, row, dummy;
-#endif /* defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR */
+#endif /* HAVE_WINDOW_SYSTEM */
 
         f = XFRAME (event->frame_or_window);
         id = event->arg;
@@ -6572,16 +6571,82 @@ make_lispy_event (struct input_event *event)
         y = event->y;
 
 #if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
-        if (event->kind == TOUCHSCREEN_BEGIN_EVENT
-            && coords_in_menu_bar_window (f, XFIXNUM (x), XFIXNUM (y)))
+        if (coords_in_menu_bar_window (f, XFIXNUM (x), XFIXNUM (y)))
           {
             /* If the tap began in the menu bar window, then save the
                id.  */
             menu_bar_touch_id = id;
             return Qnil;
           }
-        else if (event->kind == TOUCHSCREEN_END_EVENT
-                 && EQ (menu_bar_touch_id, id))
+#endif /* defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR */
+
+        position = make_lispy_position (f, x, y, event->timestamp);
+
+#ifdef HAVE_WINDOW_SYSTEM
+
+        /* Now check if POSITION lies on the tab bar.  If so, look up
+           the corresponding tab bar item's propertized string as the
+           OBJECT.  */
+
+        if (coords_in_tab_bar_window (f, XFIXNUM (event->x),
+                                      XFIXNUM (event->y))
+            /* `get_tab_bar_item_kbd' returns 0 if the item was
+               previously highlighted, 1 otherwise, and -1 if there is
+               no tab bar item.  */
+            && get_tab_bar_item_kbd (f, XFIXNUM (event->x),
+                                     XFIXNUM (event->y), &tab_bar_item,
+                                     &close) >= 0)
+          {
+            /* First, obtain the propertized string.  */
+            x = Fcopy_sequence (AREF (f->tab_bar_items,
+                                      (tab_bar_item
+                                       + TAB_BAR_ITEM_CAPTION)));
+
+            /* Next, add the key binding.  */
+            AUTO_LIST2 (y, Qmenu_item, list3 (AREF (f->tab_bar_items,
+                                                    (tab_bar_item
+                                                     + TAB_BAR_ITEM_KEY)),
+                                              AREF (f->tab_bar_items,
+                                                    (tab_bar_item
+                                                     + TAB_BAR_ITEM_BINDING)),
+                                              close ? Qt : Qnil));
+
+            /* And add the new properties to the propertized string.  */
+            Fadd_text_properties (make_fixnum (0),
+                                  make_fixnum (SCHARS (x)),
+                                  y, x);
+
+            /* Set the position to 0.  */
+            x = Fcons (x, make_fixnum (0));
+
+            /* Finally, add the OBJECT.  */
+            position = nconc2 (position, Fcons (x, Qnil));
+          }
+
+#endif /* HAVE_WINDOW_SYSTEM */
+
+        return list2 (Qtouchscreen_begin,
+                      Fcons (id, position));
+      }
+
+    case TOUCHSCREEN_END_EVENT:
+      {
+        Lisp_Object x, y, id, position;
+        struct frame *f = XFRAME (event->frame_or_window);
+#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
+        int column, row, dummy;
+#endif /* defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR */
+#ifdef HAVE_WINDOW_SYSTEM
+        int tab_bar_item;
+        bool close;
+#endif /* HAVE_WINDOW_SYSTEM */
+
+        id = event->arg;
+        x = event->x;
+        y = event->y;
+
+#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
+        if (EQ (menu_bar_touch_id, id))
           {
             /* This touch should activate the menu bar.  Generate the
                menu bar event.  */
@@ -6631,8 +6696,6 @@ make_lispy_event (struct input_event *event)
           }
 #endif /* defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR */
 
-        position = make_lispy_position (f, x, y, event->timestamp);
-
 #ifdef HAVE_WINDOW_SYSTEM
 
         /* Now check if POSITION lies on the tab bar.  If so, look up
@@ -6676,29 +6739,9 @@ make_lispy_event (struct input_event *event)
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
-        return list2 (((event->kind
-                        == TOUCHSCREEN_BEGIN_EVENT)
-                       ? Qtouchscreen_begin
-                       : Qtouchscreen_end),
-                      Fcons (id, position));
-      }
-
-    case TOUCHSCREEN_END_EVENT:
-      {
-        Lisp_Object x, y, id, position;
-        struct frame *f = XFRAME (event->frame_or_window);
-
-        id = event->arg;
-        x = event->x;
-        y = event->y;
-
         position = make_lispy_position (f, x, y, event->timestamp);
 
-        return list3 (((event->kind
-                        == TOUCHSCREEN_BEGIN_EVENT)
-                       ? Qtouchscreen_begin
-                       : Qtouchscreen_end),
-                      Fcons (id, position),
+        return list3 (Qtouchscreen_end, Fcons (id, position),
                       event->modifiers ? Qt : Qnil);
       }