Update Android port

* java/Makefile.in (clean): Fix distclean and bootstrap-clean rules.
* java/debug.sh (jdb_port):
(attach_existing):
(num_pids):
(line): Add new options to upload a gdbserver binary to the device.

* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity): Make
focusedActivities public.
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu):
New class.
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform): Fix
bounds computation.
* java/org/gnu/emacs/EmacsGC.java (markDirty): Set stroke width
explicitly.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(getLocationOnScreen, nameKeysym): New functions.
* java/org/gnu/emacs/EmacsView.java (EmacsView): Disable focus
highlight.
(onCreateContextMenu, popupMenu, cancelPopupMenu): New
functions.
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): Implement a
kind of ``override redirect'' window for tooltips.
* src/android.c (struct android_emacs_service): New method
`name_keysym'.
(android_run_select_thread, android_init_events):
(android_select): Release select thread on semaphores instead of
signals to avoid one nasty race on SIGUSR2 delivery.
(android_init_emacs_service): Initialize new method.
(android_create_window): Handle CW_OVERRIDE_REDIRECT.
(android_move_resize_window, android_map_raised)
(android_translate_coordinates, android_get_keysym_name)
(android_build_string, android_exception_check): New functions.
* src/android.h: Update prototypes.

* src/androidfns.c (android_set_parent_frame, Fx_create_frame)
(unwind_create_tip_frame, android_create_tip_frame)
(android_hide_tip, compute_tip_xy, Fx_show_tip, Fx_hide_tip)
(syms_of_androidfns): Implement tooltips and iconification
reporting.

* src/androidgui.h (enum android_window_value_mask): Add
CWOverrideRedirect.
(struct android_set_window_attributes): Add `override_redirect'.
(ANDROID_IS_MODIFIER_KEY): Recognize Caps Lock.

* src/androidmenu.c (struct android_emacs_context_menu): New
struct.
(android_init_emacs_context_menu, android_unwind_local_frame)
(android_push_local_frame, android_menu_show, init_androidmenu):
New functions.

* src/androidterm.c (handle_one_android_event): Fix NULL pointer
dereference.
(android_fullscreen_hook): Handle fullscreen correctly.
(android_draw_box_rect): Fix top line.
(get_keysym_name): Implement function.
(android_create_terminal): Remove scroll bar stubs and add menu
hook.

* src/androidterm.h: Update prototypes.
* src/emacs.c (android_emacs_init): Initialize androidmenu.c.
* xcompile/Makefile.in: Fix clean rules.

7 files changed, 448 insertions, 21 deletions

diff --git a/java/org/gnu/emacs/EmacsActivity.java b/java/org/gnu/emacs/EmacsActivity.java
index 2b661024842..4cd286d1e89 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -43,7 +43,7 @@ public class EmacsActivity extends Activity
   private FrameLayout layout;
 
   /* List of activities with focus.  */
-  private static List<EmacsActivity> focusedActivities;
+  public static List<EmacsActivity> focusedActivities;
 
   /* The currently focused window.  */
   public static EmacsWindow focusedWindow;
diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java
new file mode 100644
index 00000000000..8d7ae08b257
--- /dev/null
+++ b/java/org/gnu/emacs/EmacsContextMenu.java
@@ -0,0 +1,213 @@
+/* Communication module for Android terminals.  -*- c-file-style: "GNU" -*-
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+
+package org.gnu.emacs;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import android.content.Context;
+import android.content.Intent;
+
+import android.os.Bundle;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import android.widget.PopupMenu;
+
+/* Context menu implementation.  This object is built from JNI and
+   describes a menu hiearchy.  Then, `inflate' can turn it into an
+   Android menu, which can be turned into a popup (or other kind of)
+   menu.  */
+
+public class EmacsContextMenu
+{
+  private class Item
+  {
+    public int itemID;
+    public String itemName;
+    public EmacsContextMenu subMenu;
+    public boolean isEnabled;
+  };
+
+  public List<Item> menuItems;
+  public String title;
+  private EmacsContextMenu parent;
+
+  /* Create a context menu with no items inside and the title TITLE,
+     which may be NULL.  */
+
+  public static EmacsContextMenu
+  createContextMenu (String title)
+  {
+    EmacsContextMenu menu;
+
+    menu = new EmacsContextMenu ();
+    menu.menuItems = new ArrayList<Item> ();
+    menu.title = title;
+
+    return menu;
+  }
+
+  /* Add a normal menu item to the context menu with the id ITEMID and
+     the name ITEMNAME.  Enable it if ISENABLED, else keep it
+     disabled.  */
+
+  public void
+  addItem (int itemID, String itemName, boolean isEnabled)
+  {
+    Item item;
+
+    item = new Item ();
+    item.itemID = itemID;
+    item.itemName = itemName;
+    item.isEnabled = isEnabled;
+
+    menuItems.add (item);
+  }
+
+  /* Create a disabled menu item with the name ITEMNAME.  */
+
+  public void
+  addPane (String itemName)
+  {
+    Item item;
+
+    item = new Item ();
+    item.itemName = itemName;
+
+    menuItems.add (item);
+  }
+
+  /* Add a submenu to the context menu with the specified title and
+     item name.  */
+
+  public EmacsContextMenu
+  addSubmenu (String itemName, String title)
+  {
+    EmacsContextMenu submenu;
+    Item item;
+
+    item = new Item ();
+    item.itemID = 0;
+    item.itemName = itemName;
+    item.subMenu = createContextMenu (title);
+    item.subMenu.parent = this;
+
+    menuItems.add (item);
+    return item.subMenu;
+  }
+
+  /* Add the contents of this menu to MENU.  */
+
+  private void
+  inflateMenuItems (Menu menu)
+  {
+    Intent intent;
+    MenuItem menuItem;
+    Menu submenu;
+
+    for (Item item : menuItems)
+      {
+        if (item.subMenu != null)
+          {
+            /* This is a submenu.  Create the submenu and add the
+               contents of the menu to it.  */
+            submenu = menu.addSubMenu (item.itemName);
+            inflateMenuItems (submenu);
+          }
+        else
+          {
+            menuItem = menu.add (item.itemName);
+
+            /* If the item ID is zero, then disable the item.  */
+            if (item.itemID == 0 || !item.isEnabled)
+              menuItem.setEnabled (false);
+          }
+      }
+  }
+
+  /* Enter the items in this context menu to MENU.  Create each menu
+     item with an Intent containing a Bundle, where the key
+     "emacs:menu_item_hi" maps to the high 16 bits of the
+     corresponding item ID, and the key "emacs:menu_item_low" maps to
+     the low 16 bits of the item ID.  */
+
+  public void
+  expandTo (Menu menu)
+  {
+    inflateMenuItems (menu);
+  }
+
+  /* Return the parent or NULL.  */
+
+  public EmacsContextMenu
+  parent ()
+  {
+    return parent;
+  }
+
+  /* Like display, but does the actual work and runs in the main
+     thread.  */
+
+  private boolean
+  display1 (EmacsWindow window, int xPosition, int yPosition)
+  {
+    return window.view.popupMenu (this, xPosition, yPosition);
+  }
+
+  /* Display this context menu on WINDOW, at xPosition and
+     yPosition.  */
+
+  public boolean
+  display (final EmacsWindow window, final int xPosition,
+           final int yPosition)
+  {
+    Runnable runnable;
+    final Holder<Boolean> rc;
+
+    rc = new Holder<Boolean> ();
+
+    runnable = new Runnable () {
+        @Override
+        public void
+        run ()
+        {
+          synchronized (this)
+            {
+              rc.thing = display1 (window, xPosition, yPosition);
+              notify ();
+            }
+        }
+      };
+
+    try
+      {
+        runnable.wait ();
+      }
+    catch (InterruptedException e)
+      {
+        EmacsNative.emacsAbort ();
+      }
+
+    return rc.thing;
+  }
+};
diff --git a/java/org/gnu/emacs/EmacsDrawRectangle.java b/java/org/gnu/emacs/EmacsDrawRectangle.java
index b42e9556e8c..84ff498847b 100644
--- a/java/org/gnu/emacs/EmacsDrawRectangle.java
+++ b/java/org/gnu/emacs/EmacsDrawRectangle.java
@@ -59,7 +59,7 @@ public class EmacsDrawRectangle
       }
 
     paint = gc.gcPaint;
-    rect = new Rect (x, y, x + width, y + height);
+    rect = new Rect (x + 1, y + 1, x + width, y + height);
 
     paint.setStyle (Paint.Style.STROKE);
 
diff --git a/java/org/gnu/emacs/EmacsGC.java b/java/org/gnu/emacs/EmacsGC.java
index caa5c91edd4..c579625f3f7 100644
--- a/java/org/gnu/emacs/EmacsGC.java
+++ b/java/org/gnu/emacs/EmacsGC.java
@@ -93,6 +93,7 @@ public class EmacsGC extends EmacsHandleObject
     else
       real_clip_rects = clip_rects;
 
+    gcPaint.setStrokeWidth (1f);
     gcPaint.setColor (foreground | 0xff000000);
     gcPaint.setXfermode (function == GC_XOR
                          ? xorAlu : srcInAlu);
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index c008300dd3a..f935b63fa0d 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -29,6 +29,7 @@ import android.graphics.Point;
 
 import android.view.View;
 import android.view.InputDevice;
+import android.view.KeyEvent;
 
 import android.annotation.TargetApi;
 import android.app.Service;
@@ -150,13 +151,13 @@ public class EmacsService extends Service
   /* Functions from here on must only be called from the Emacs
      thread.  */
 
-  void
+  public void
   runOnUiThread (Runnable runnable)
   {
     handler.post (runnable);
   }
 
-  EmacsView
+  public EmacsView
   getEmacsView (final EmacsWindow window, final int visibility,
                 final boolean isFocusedByDefault)
   {
@@ -197,6 +198,38 @@ public class EmacsService extends Service
   }
 
   public void
+  getLocationOnScreen (final EmacsView view, final int[] coordinates)
+  {
+    Runnable runnable;
+
+    runnable = new Runnable () {
+        public void
+        run ()
+        {
+          synchronized (this)
+            {
+              view.getLocationOnScreen (coordinates);
+              notify ();
+            }
+        }
+      };
+
+    synchronized (runnable)
+      {
+        runOnUiThread (runnable);
+
+        try
+          {
+            runnable.wait ();
+          }
+        catch (InterruptedException e)
+          {
+            EmacsNative.emacsAbort ();
+          }
+      }
+  }
+
+  public void
   fillRectangle (EmacsDrawable drawable, EmacsGC gc,
                  int x, int y, int width, int height)
   {
@@ -368,4 +401,10 @@ public class EmacsService extends Service
 
     return false;
   }
+
+  public String
+  nameKeysym (int keysym)
+  {
+    return KeyEvent.keyCodeToString (keysym);
+  }
 };
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 41acabab97b..1391f630be0 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -21,6 +21,7 @@ package org.gnu.emacs;
 
 import android.content.res.ColorStateList;
 
+import android.view.ContextMenu;
 import android.view.View;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -73,6 +74,12 @@ public class EmacsView extends ViewGroup
      next call to getBitmap.  */
   private Rect bitmapDirty;
 
+  /* Whether or not a popup is active.  */
+  private boolean popupActive;
+
+  /* The current context menu.  */
+  private EmacsContextMenu contextMenu;
+
   public
   EmacsView (EmacsWindow window)
   {
@@ -98,6 +105,10 @@ public class EmacsView extends ViewGroup
     /* Get rid of the foreground and background tint.  */
     setBackgroundTintList (null);
     setForegroundTintList (null);
+
+    /* Get rid of the default focus highlight.  */
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O)
+      setDefaultFocusHighlightEnabled (false);
   }
 
   private void
@@ -423,4 +434,40 @@ public class EmacsView extends ViewGroup
     removeView (surfaceView);
     addView (surfaceView, 0);
   }
+
+  @Override
+  protected void
+  onCreateContextMenu (ContextMenu menu)
+  {
+    if (contextMenu == null)
+      return;
+
+    contextMenu.expandTo (menu);
+  }
+
+  public boolean
+  popupMenu (EmacsContextMenu menu, int xPosition,
+             int yPosition)
+  {
+    if (popupActive)
+      return false;
+
+    contextMenu = menu;
+
+    /* On API 21 or later, use showContextMenu (float, float).  */
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP)
+      return showContextMenu ((float) xPosition, (float) yPosition);
+    else
+      return showContextMenu ();
+  }
+
+  public void
+  cancelPopupMenu ()
+  {
+    if (!popupActive)
+      throw new IllegalStateException ("cancelPopupMenu called without"
+                                       + " popupActive set");
+
+    contextMenu = null;
+  }
 };
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index 1f8596dba50..6effa79d1a4 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -24,16 +24,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.HashMap;
 
+import android.content.Context;
+
 import android.graphics.Rect;
 import android.graphics.Canvas;
 import android.graphics.Bitmap;
 import android.graphics.Point;
+import android.graphics.PixelFormat;
 
 import android.view.View;
+import android.view.ViewManager;
 import android.view.ViewGroup;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.InputDevice;
+import android.view.WindowManager;
 
 import android.content.Intent;
 import android.util.Log;
@@ -110,9 +116,17 @@ public class EmacsWindow extends EmacsHandleObject
      not the window should be focusable.  */
   private boolean dontFocusOnMap, dontAcceptFocus;
 
+  /* Whether or not the window is override-redirect.  An
+     override-redirect window always has its own system window.  */
+  private boolean overrideRedirect;
+
+  /* The window manager that is the parent of this window.  NULL if
+     there is no such window manager.  */
+  private WindowManager windowManager;
+
   public
   EmacsWindow (short handle, final EmacsWindow parent, int x, int y,
-               int width, int height)
+               int width, int height, boolean overrideRedirect)
   {
     super (handle);
 
@@ -124,6 +138,7 @@ public class EmacsWindow extends EmacsHandleObject
     view = EmacsService.SERVICE.getEmacsView (this, View.GONE,
                                               parent == null);
     this.parent = parent;
+    this.overrideRedirect = overrideRedirect;
 
     /* Create the list of children.  */
     children = new ArrayList<EmacsWindow> ();
@@ -180,7 +195,7 @@ public class EmacsWindow extends EmacsHandleObject
         public void
         run ()
         {
-          View parent;
+          ViewManager parent;
           EmacsWindowAttachmentManager manager;
 
           if (EmacsActivity.focusedWindow == EmacsWindow.this)
@@ -189,10 +204,15 @@ public class EmacsWindow extends EmacsHandleObject
           manager = EmacsWindowAttachmentManager.MANAGER;
           view.setVisibility (View.GONE);
 
-          parent = (View) view.getParent ();
+          /* If the window manager is set, use that instead.  */
+          if (windowManager != null)
+            parent = windowManager;
+          else
+            parent = (ViewManager) view.getParent ();
+          windowManager = null;
 
           if (parent != null)
-            ((ViewGroup) parent).removeView (view);
+            parent.removeView (view);
 
           manager.detachWindow (EmacsWindow.this);
         }
@@ -247,6 +267,10 @@ public class EmacsWindow extends EmacsHandleObject
         public void
         run ()
         {
+          if (overrideRedirect)
+            /* Set the layout parameters again.  */
+            view.setLayoutParams (getWindowLayoutParams ());
+
           view.mustReportLayout = true;
           view.requestLayout ();
         }
@@ -284,6 +308,39 @@ public class EmacsWindow extends EmacsHandleObject
       }
   }
 
+  private WindowManager.LayoutParams
+  getWindowLayoutParams ()
+  {
+    WindowManager.LayoutParams params;
+    int flags, type;
+    Rect rect;
+
+    flags = 0;
+    rect = getGeometry ();
+    flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+    flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+    type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
+
+    params
+      = new WindowManager.LayoutParams (rect.width (), rect.height (),
+                                        rect.left, rect.top,
+                                        type, flags,
+                                        PixelFormat.RGBA_8888);
+    params.gravity = Gravity.TOP | Gravity.LEFT;
+    return params;
+  }
+
+  private Context
+  findSuitableActivityContext ()
+  {
+    /* Find a recently focused activity.  */
+    if (!EmacsActivity.focusedActivities.isEmpty ())
+      return EmacsActivity.focusedActivities.get (0);
+
+    /* Return the service context, which probably won't work.  */
+    return EmacsService.SERVICE;
+  }
+
   public void
   mapWindow ()
   {
@@ -300,20 +357,60 @@ public class EmacsWindow extends EmacsHandleObject
             run ()
             {
               EmacsWindowAttachmentManager manager;
+              WindowManager windowManager;
+              Context ctx;
+              Object tem;
+              WindowManager.LayoutParams params;
 
               /* Make the view visible, first of all.  */
               view.setVisibility (View.VISIBLE);
 
-              manager = EmacsWindowAttachmentManager.MANAGER;
-
-              /* If parent is the root window, notice that there are new
-                 children available for interested activites to pick
-                 up.  */
-              manager.registerWindow (EmacsWindow.this);
-
-              if (!getDontFocusOnMap ())
-                /* Eventually this should check no-focus-on-map.  */
-                view.requestFocus ();
+              if (!overrideRedirect)
+                {
+                  manager = EmacsWindowAttachmentManager.MANAGER;
+
+                  /* If parent is the root window, notice that there are new
+                     children available for interested activites to pick
+                     up.  */
+                  manager.registerWindow (EmacsWindow.this);
+
+                  if (!getDontFocusOnMap ())
+                    /* Eventually this should check no-focus-on-map.  */
+                    view.requestFocus ();
+                }
+              else
+                {
+                  /* But if the window is an override-redirect window,
+                     then:
+
+                     - Find an activity that is currently active.
+
+                     - Map the window as a panel on top of that
+                       activity using the system window manager.  */
+
+                  ctx = findSuitableActivityContext ();
+                  tem = ctx.getSystemService (Context.WINDOW_SERVICE);
+                  windowManager = (WindowManager) tem;
+
+                  /* Calculate layout parameters.  */
+                  params = getWindowLayoutParams ();
+                  view.setLayoutParams (params);
+
+                  /* Attach the view.  */
+                  try
+                    {
+                      windowManager.addView (view, params);
+
+                      /* Record the window manager being used in the
+                         EmacsWindow object.  */
+                      EmacsWindow.this.windowManager = windowManager;
+                    }
+                  catch (Exception e)
+                    {
+                      Log.w (TAG,
+                             "failed to attach override-redirect window, " + e);
+                    }
+                }
             }
           });
       }
@@ -355,6 +452,11 @@ public class EmacsWindow extends EmacsHandleObject
 
           view.setVisibility (View.GONE);
 
+          /* Detach the view from the window manager if possible.  */
+          if (windowManager != null)
+            windowManager.removeView (view);
+          windowManager = null;
+
           /* Now that the window is unmapped, unregister it as
              well.  */
           manager.detachWindow (EmacsWindow.this);
@@ -756,17 +858,23 @@ public class EmacsWindow extends EmacsHandleObject
         run ()
         {
           EmacsWindowAttachmentManager manager;
-          View parent;
+          ViewManager parent;
 
           /* First, detach this window if necessary.  */
           manager = EmacsWindowAttachmentManager.MANAGER;
           manager.detachWindow (EmacsWindow.this);
 
           /* Also unparent this view.  */
-          parent = (View) view.getParent ();
+
+          /* If the window manager is set, use that instead.  */
+          if (windowManager != null)
+            parent = windowManager;
+          else
+            parent = (ViewManager) view.getParent ();
+          windowManager = null;
 
           if (parent != null)
-            ((ViewGroup) parent).removeView (view);
+            parent.removeView (view);
 
           /* Next, either add this window as a child of the new
              parent's view, or make it available again.  */
@@ -899,4 +1007,23 @@ public class EmacsWindow extends EmacsHandleObject
   {
     return dontFocusOnMap;
   }
+
+  public int[]
+  translateCoordinates (int x, int y)
+  {
+    int[] array;
+
+    /* This is supposed to translate coordinates to the root
+       window.  */
+    array = new int[2];
+    EmacsService.SERVICE.getLocationOnScreen (view, array);
+
+    /* Now, the coordinates of the view should be in array.  Offset X
+       and Y by them.  */
+    array[0] += x;
+    array[1] += y;
+
+    /* Return the resulting coordinates.  */
+    return array;
+  }
 };