Update Android port

* doc/emacs/android.texi (Android Fonts): Document that TTC
format fonts are now supported.
* doc/emacs/emacs.texi (Top): Fix menus.
* doc/lispref/commands.texi (Touchscreen Events)
(Key Sequence Input): Document changes to touchscreen events.
* etc/DEBUG: Describe how to debug 64 bit binaries on Android.

* java/org/gnu/emacs/EmacsCopyArea.java (perform): Explicitly
recycle copy bitmap.
* java/org/gnu/emacs/EmacsDialog.java (EmacsDialog): New class.
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform): Use 5
point PolyLine like X, because Android behaves like Postscript
on some devices and X elsewhere.
* java/org/gnu/emacs/EmacsFillRectangle.java (perform):
Explicitly recycle copy bitmap.
* java/org/gnu/emacs/EmacsPixmap.java (destroyHandle):
Explicitly recycle bitmap and GC if it is big.
* java/org/gnu/emacs/EmacsView.java (EmacsView): Make
`bitmapDirty' a boolean.
(handleDirtyBitmap): Reimplement in terms of that boolean.
Explicitly recycle old bitmap and GC.
(onLayout): Fix lock up.
(onDetachedFromWindow): Recycle bitmap and GC.

* java/org/gnu/emacs/EmacsWindow.java (requestViewLayout):
Update call to explicitlyDirtyBitmap.

* src/android.c (android_run_select_thread, android_select):
Really fix android_select.
(android_build_jstring): New function.
* src/android.h: Update prototypes.
* src/androidmenu.c (android_process_events_for_menu): Totally
unblock input before process_pending_signals.
(android_menu_show): Remove redundant unblock_input and
debugging code.
(struct android_emacs_dialog, android_init_emacs_dialog)
(android_dialog_show, android_popup_dialog, init_androidmenu):
Implement popup dialogs on Android.

* src/androidterm.c (android_update_tools)
(handle_one_android_event, android_frame_up_to_date): Allow
tapping tool bar items.
(android_create_terminal): Add dialog hook.
(android_wait_for_event): Adjust call to android_select.
* src/androidterm.h (struct android_touch_point): New field
`tool_bar_p'.
* src/keyboard.c (read_key_sequence, head_table)
(syms_of_keyboard): Prefix touchscreen events with posn.
* src/keyboard.h (EVENT_HEAD): Handle touchscreen events.
* src/process.c (wait_reading_process_output): Adjust call to
android_select.
* src/sfnt.c (sfnt_read_table_directory): If the first long
turns out to be ttcf, return -1.
(sfnt_read_ttc_header): New function.
(main): Test TTC support.

* src/sfnt.h (struct sfnt_ttc_header): New structure.
(enum sfnt_ttc_tag): New enum.

* src/sfntfont-android.c (struct
sfntfont_android_scanline_buffer): New structure.
(GET_SCANLINE_BUFFER): New macro.  Try to avoid so much malloc
upon accessing the scanline buffer.
(sfntfont_android_put_glyphs): Do not use SAFE_ALLOCA to
allocate the scaline buffer.
(Fandroid_enumerate_fonts): Enumerate ttc fonts too.

* src/sfntfont.c (struct sfnt_font_desc): New field `offset'.
(sfnt_enum_font_1): Split out enumeration code from
sfnt_enum_font.
(sfnt_enum_font): Read TTC tables and enumerate each font
therein.
(sfntfont_open): Seek to the offset specified.

* xcompile/Makefile.in (maintainer-clean): Fix depends here.

1 files changed, 39 insertions, 23 deletions

diff --git a/src/android.c b/src/android.c
index 9b15ea9f15a..cfb79045c0b 100644
--- a/src/android.c
+++ b/src/android.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <semaphore.h>
 #include <dlfcn.h>
 #include <errno.h>
+#include <math.h>
 
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -225,7 +226,6 @@ static fd_set *volatile android_pselect_readfds;
 static fd_set *volatile android_pselect_writefds;
 static fd_set *volatile android_pselect_exceptfds;
 static struct timespec *volatile android_pselect_timeout;
-static const sigset_t *volatile android_pselect_sigset;
 
 /* Value of pselect.  */
 static int android_pselect_rc;
@@ -242,8 +242,8 @@ static sem_t android_pselect_sem, android_pselect_start_sem;
 static void *
 android_run_select_thread (void *data)
 {
-  sigset_t signals, sigset;
-  int rc;
+  sigset_t signals, waitset;
+  int rc, sig;
 
   sigfillset (&signals);
 
@@ -253,6 +253,8 @@ android_run_select_thread (void *data)
                          strerror (errno));
 
   sigdelset (&signals, SIGUSR1);
+  sigemptyset (&waitset);
+  sigaddset (&waitset, SIGUSR1);
 
   while (true)
     {
@@ -262,35 +264,33 @@ android_run_select_thread (void *data)
 
       /* Get the select lock and call pselect.  */
       pthread_mutex_lock (&event_queue.select_mutex);
-
-      /* Make sure SIGUSR1 can always wake pselect up.  */
-      if (android_pselect_sigset)
-        {
-          sigset = *android_pselect_sigset;
-          sigdelset (&sigset, SIGUSR1);
-          android_pselect_sigset = &sigset;
-        }
-      else
-        android_pselect_sigset = &signals;
-
       rc = pselect (android_pselect_nfds,
                     android_pselect_readfds,
                     android_pselect_writefds,
                     android_pselect_exceptfds,
                     android_pselect_timeout,
-                    android_pselect_sigset);
+                    &signals);
       android_pselect_rc = rc;
       pthread_mutex_unlock (&event_queue.select_mutex);
 
+      /* Signal the main thread that there is now data to read.
+         It is ok to signal this condition variable without holding
+         the event queue lock, because android_select will always
+         wait for this to complete before returning.  */
+      android_pselect_completed = true;
+      pthread_cond_signal (&event_queue.read_var);
+
+      if (rc != -1 || errno != EINTR)
+        /* Now, wait for SIGUSR1, unless pselect was interrupted and
+           the signal was already delivered.  The Emacs thread will
+           always send this signal after read_var is triggered or the
+           UI thread has sent an event.  */
+        sigwait (&waitset, &sig);
+
       /* Signal the Emacs thread that pselect is done.  If read_var
          was signaled by android_write_event, event_queue.mutex could
          still be locked, so this must come before.  */
       sem_post (&android_pselect_sem);
-
-      pthread_mutex_lock (&event_queue.mutex);
-      android_pselect_completed = true;
-      pthread_cond_signal (&event_queue.read_var);
-      pthread_mutex_unlock (&event_queue.mutex);
     }
 }
 
@@ -445,8 +445,7 @@ android_write_event (union android_event *event)
 
 int
 android_select (int nfds, fd_set *readfds, fd_set *writefds,
-                fd_set *exceptfds, struct timespec *timeout,
-                const sigset_t *sigset)
+                fd_set *exceptfds, struct timespec *timeout)
 {
   int nfds_return;
 
@@ -467,7 +466,6 @@ android_select (int nfds, fd_set *readfds, fd_set *writefds,
   android_pselect_writefds = writefds;
   android_pselect_exceptfds = exceptfds;
   android_pselect_timeout = timeout;
-  android_pselect_sigset = sigset;
   pthread_mutex_unlock (&event_queue.select_mutex);
 
   /* Release the select thread.  */
@@ -3725,6 +3723,24 @@ android_build_string (Lisp_Object text)
   return string;
 }
 
+/* Do the same, except TEXT is constant string data.  */
+
+jstring
+android_build_jstring (const char *text)
+{
+  jstring string;
+
+  string = (*android_java_env)->NewStringUTF (android_java_env,
+                                              text);
+  if (!string)
+    {
+      (*android_java_env)->ExceptionClear (android_java_env);
+      memory_full (0);
+    }
+
+  return string;
+}
+
 /* Check for JNI exceptions and call memory_full in that
    situation.  */