Implement toolkit menus on Android

* java/org/gnu/emacs/EmacsActivity.java (onContextMenuClosed):
New function.
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu):
New field `itemAlreadySelected'.
(onMenuItemClick): New function.
(inflateMenuItems): Attach onClickListener as appropriate.
(display1): Clear itemAlreadySelected.
(display): Fix runnable synchronization.
* java/org/gnu/emacs/EmacsNative.java (sendContextMenu): New
function.
* java/org/gnu/emacs/EmacsView.java (popupMenu):
(cancelPopupMenu): Set popupactive correctly.

* src/android.c (android_run_select_thread): Fix android_select
again.
(android_wait_event): New function.
* src/android.h: Update prototypes.
* src/androidgui.h (enum android_event_type): New
`ANDROID_CONTEXT_MENU' event.
(struct android_menu_event, union android_event): Add new event.

* src/androidmenu.c (struct android_emacs_context_menu): New
structure.
(android_init_emacs_context_menu): Add `dismiss' method.
(struct android_dismiss_menu_data): New structure.
(android_dismiss_menu, android_process_events_for_menu): New
functions.
(android_menu_show): Set an actual item ID.
(popup_activated): Define when stubify as well.
(Fmenu_or_popup_active_p): New function.
(syms_of_androidmenu): New function.

* src/androidterm.c (handle_one_android_event): Handle context
menu events.
* src/androidterm.h (struct android_display_info): New field for
menu item ID.
* src/emacs.c (android_emacs_init): Call syms_of_androidmenu.
* src/xdisp.c (note_mouse_highlight): Return if popup_activated
on Android as well.

1 files changed, 40 insertions, 2 deletions

diff --git a/src/android.c b/src/android.c
index 5e5e28c60ca..ed162a903ba 100644
--- a/src/android.c
+++ b/src/android.c
@@ -236,7 +236,7 @@ static sem_t android_pselect_sem, android_pselect_start_sem;
 static void *
 android_run_select_thread (void *data)
 {
-  sigset_t signals;
+  sigset_t signals, sigset;
   int rc;
 
   sigfillset (&signals);
@@ -259,7 +259,11 @@ android_run_select_thread (void *data)
 
       /* Make sure SIGUSR1 can always wake pselect up.  */
       if (android_pselect_sigset)
-        sigdelset (android_pselect_sigset, SIGUSR1);
+        {
+          sigset = *android_pselect_sigset;
+          sigdelset (&sigset, SIGUSR1);
+          android_pselect_sigset = &sigset;
+        }
       else
         android_pselect_sigset = &signals;
 
@@ -356,6 +360,23 @@ android_pending (void)
   return i;
 }
 
+/* Wait for events to become available synchronously.  Return once an
+   event arrives.  */
+
+void
+android_wait_event (void)
+{
+  pthread_mutex_lock (&event_queue.mutex);
+
+  /* Wait for events to appear if there are none available to
+     read.  */
+  if (!event_queue.num_events)
+    pthread_cond_wait (&event_queue.read_var,
+                       &event_queue.mutex);
+
+  pthread_mutex_unlock (&event_queue.mutex);
+}
+
 void
 android_next_event (union android_event *event_return)
 {
@@ -1472,6 +1493,8 @@ NATIVE_NAME (sendIconified) (JNIEnv *env, jobject object,
 
   event.iconified.type = ANDROID_ICONIFIED;
   event.iconified.window = window;
+
+  android_write_event (&event);
 }
 
 extern JNIEXPORT void JNICALL
@@ -1482,6 +1505,21 @@ NATIVE_NAME (sendDeiconified) (JNIEnv *env, jobject object,
 
   event.iconified.type = ANDROID_DEICONIFIED;
   event.iconified.window = window;
+
+  android_write_event (&event);
+}
+
+extern JNIEXPORT void JNICALL
+NATIVE_NAME (sendContextMenu) (JNIEnv *env, jobject object,
+                               jshort window, jint menu_event_id)
+{
+  union android_event event;
+
+  event.menu.type = ANDROID_CONTEXT_MENU;
+  event.menu.window = window;
+  event.menu.menu_event_id = menu_event_id;
+
+  android_write_event (&event);
 }
 
 #pragma clang diagnostic pop