4 files changed, 77 insertions, 7 deletions

diff --git a/java/org/gnu/emacs/EmacsActivity.java b/java/org/gnu/emacs/EmacsActivity.java
index 4cd286d1e89..4b96a376987 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -30,6 +30,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
+import android.view.Menu;
 
 public class EmacsActivity extends Activity
   implements EmacsWindowAttachmentManager.WindowConsumer
@@ -227,4 +228,18 @@ public class EmacsActivity extends Activity
     EmacsWindowAttachmentManager.MANAGER.noticeDeiconified (this);
     super.onResume ();
   }
+
+  @Override
+  public void
+  onContextMenuClosed (Menu menu)
+  {
+    Log.d (TAG, "onContextMenuClosed: " + menu);
+
+    /* Send a context menu event given that no menu item has already
+       been selected.  */
+    if (!EmacsContextMenu.itemAlreadySelected)
+      EmacsNative.sendContextMenu ((short) 0, 0);
+
+    super.onContextMenuClosed (menu);
+  }
 };
diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java
index 8d7ae08b257..02dd1c7efa9 100644
--- a/java/org/gnu/emacs/EmacsContextMenu.java
+++ b/java/org/gnu/emacs/EmacsContextMenu.java
@@ -31,6 +31,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import android.util.Log;
+
 import android.widget.PopupMenu;
 
 /* Context menu implementation.  This object is built from JNI and
@@ -40,12 +42,31 @@ import android.widget.PopupMenu;
 
 public class EmacsContextMenu
 {
-  private class Item
+  private static final String TAG = "EmacsContextMenu";
+
+  /* Whether or not an item was selected.  */
+  public static boolean itemAlreadySelected;
+
+  private class Item implements MenuItem.OnMenuItemClickListener
   {
     public int itemID;
     public String itemName;
     public EmacsContextMenu subMenu;
     public boolean isEnabled;
+
+    @Override
+    public boolean
+    onMenuItemClick (MenuItem item)
+    {
+      Log.d (TAG, "onMenuItemClick: " + itemName + " (" + itemID + ")");
+
+      /* Send a context menu event.  */
+      EmacsNative.sendContextMenu ((short) 0, itemID);
+
+      /* Say that an item has already been selected.  */
+      itemAlreadySelected = true;
+      return true;
+    }
   };
 
   public List<Item> menuItems;
@@ -137,6 +158,7 @@ public class EmacsContextMenu
 	else
 	  {
 	    menuItem = menu.add (item.itemName);
+	    menuItem.setOnMenuItemClickListener (item);
 
 	    /* If the item ID is zero, then disable the item.  */
 	    if (item.itemID == 0 || !item.isEnabled)
@@ -171,6 +193,10 @@ public class EmacsContextMenu
   private boolean
   display1 (EmacsWindow window, int xPosition, int yPosition)
   {
+    /* Set this flag to false.  It is used to decide whether or not to
+       send 0 in response to the context menu being closed.  */
+    itemAlreadySelected = false;
+
     return window.view.popupMenu (this, xPosition, yPosition);
   }
 
@@ -199,15 +225,39 @@ public class EmacsContextMenu
 	}
       };
 
-    try
+    synchronized (runnable)
       {
-	runnable.wait ();
-      }
-    catch (InterruptedException e)
-      {
-	EmacsNative.emacsAbort ();
+	EmacsService.SERVICE.runOnUiThread (runnable);
+
+	try
+	  {
+	    runnable.wait ();
+	  }
+	catch (InterruptedException e)
+	  {
+	    EmacsNative.emacsAbort ();
+	  }
       }
 
     return rc.thing;
   }
+
+  /* Dismiss this context menu.  WINDOW is the window where the
+     context menu is being displayed.  */
+
+  public void
+  dismiss (final EmacsWindow window)
+  {
+    Runnable runnable;
+
+    EmacsService.SERVICE.runOnUiThread (new Runnable () {
+	@Override
+	public void
+	run ()
+	{
+	  window.view.cancelPopupMenu ();
+	  itemAlreadySelected = false;
+	}
+      });
+  }
 };
diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index a11e509cd7f..4a80f88edcf 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -124,6 +124,9 @@ public class EmacsNative
   /* Send an ANDROID_DEICONIFIED event.  */
   public static native void sendDeiconified (short window);
 
+  /* Send an ANDROID_CONTEXT_MENU event.  */
+  public static native void sendContextMenu (short window, int menuEventID);
+
   static
   {
     System.loadLibrary ("emacs");
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 1391f630be0..445d8ffa023 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -453,6 +453,7 @@ public class EmacsView extends ViewGroup
       return false;
 
     contextMenu = menu;
+    popupActive = true;
 
     /* On API 21 or later, use showContextMenu (float, float).  */
     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP)
@@ -469,5 +470,6 @@ public class EmacsView extends ViewGroup
 				       + " popupActive set");
 
     contextMenu = null;
+    popupActive = false;
   }
 };