From cfbc8a5dbcd362b69b37b4e6832ae4a31834364c Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sat, 31 Dec 2022 18:04:18 +0800
Subject: Bring up the Android operating system and its window system

* .dir-locals.el (c-mode): Add ANDROID_EXPORT noise macro.
* .gitignore: Add new files to ignore.
* Makefile.in: Adjust for Android.
* admin/merge-gnulib: Add new warning.
* configure.ac: Detect Android.  Run cross-configuration for
Android when appropriate.

* etc/DEBUG: Document how to debug Emacs on Android.

* java/AndroidManifest.xml:
* java/Makefile.in:
* java/README:
* java/debug.sh:
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsApplication.java (EmacsApplication):
* java/org/gnu/emacs/EmacsCopyArea.java (EmacsCopyArea):
* java/org/gnu/emacs/EmacsDrawLine.java (EmacsDrawLine):
* java/org/gnu/emacs/EmacsDrawPoint.java (EmacsDrawPoint):
* java/org/gnu/emacs/EmacsDrawRectangle.java
(EmacsDrawRectangle):
* java/org/gnu/emacs/EmacsDrawable.java (EmacsDrawable):
* java/org/gnu/emacs/EmacsFillPolygon.java (EmacsFillPolygon):
* java/org/gnu/emacs/EmacsFillRectangle.java
(EmacsFillRectangle):
* java/org/gnu/emacs/EmacsFontDriver.java (EmacsFontDriver):
* java/org/gnu/emacs/EmacsGC.java (EmacsGC):
* java/org/gnu/emacs/EmacsHandleObject.java (EmacsHandleObject):
* java/org/gnu/emacs/EmacsNative.java (EmacsNative):
* java/org/gnu/emacs/EmacsPaintQueue.java (EmacsPaintQueue):
* java/org/gnu/emacs/EmacsPaintReq.java (EmacsPaintReq):
* java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsService.java (class Holder<T>)
(EmacsService):
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView):
* java/org/gnu/emacs/EmacsThread.java (EmacsThread):
* java/org/gnu/emacs/EmacsView.java (EmacsView):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): New files
and classes.

* lib-src/Makefile.in (srcdir):
* lib/Makefile.in (VPATH):
(HAVE_NATIVE_COMP):
(libgnu_a_SOURCES):
(DEPFLAGS): Configure correctly for cross-compiling.

* lib/faccessat.c:
* lib/fpending.c (__fpending):
* lib/open.c:
* lib/unistd.c (_GL_UNISTD_INLINE): Temporary adjustments to
gnulib.

* lisp/frame.el (display-graphic-p):
(display-screens):
(display-pixel-height):
(display-pixel-width):
(display-mm-height):
(display-mm-width):
(display-backing-store):
(display-save-under):
(display-planes):
(display-color-cells):
(display-visual-class): Adjust for new window system `android'.

* lisp/image/wallpaper.el (x-open-connection): Add declaration.
* lisp/loadup.el (featurep): Load up files for Android.
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select): Adjust faces for android.
* lisp/term/android-win.el: New file.
* src/Makefile.in: Add new targets emacs.so and android-emacs,
then adjust for cross compilation.
* src/alloc.c (cleanup_vector): Clean up Android font entities
as well.
(garbage_collect): Mark androidterm.
* src/android-emacs.c (main):
* src/android.c (ANDROID_THROW, enum android_fd_table_entry_flags)
(struct android_emacs_service, struct android_emacs_pixmap)
(struct android_graphics_point, struct android_event_container)
(struct android_event_queue, android_run_select_thread)
(android_handle_sigusr1, android_init_events, android_pending)
(android_next_event, android_write_event, android_select)
(android_run_debug_thread, android_user_full_name)
(android_get_asset_name, android_fstat, android_fstatat)
(android_file_access_p, android_hack_asset_fd, android_open)
(android_close, JNICALL, android_init_emacs_service)
(android_init_emacs_pixmap, android_init_graphics_point)
(MAX_HANDLE, struct android_handle_entry, android_alloc_id)
(android_destroy_handle, android_resolve_handle)
(android_resolve_handle2, android_change_window_attributes)
(android_create_window, android_set_window_background)
(android_destroy_window, android_init_android_rect_class)
(android_init_emacs_gc_class, android_create_gc, android_free_gc)
(android_change_gc, android_set_clip_rectangles)
(android_reparent_window, android_lookup_method)
(android_clear_window, android_map_window, android_unmap_window)
(android_resize_window, android_move_window, android_swap_buffers)
(android_get_gc_values, android_set_foreground)
(android_fill_rectangle, android_create_pixmap_from_bitmap_data)
(android_set_clip_mask, android_set_fill_style, android_copy_area)
(android_free_pixmap, android_set_background, android_fill_polygon)
(android_draw_rectangle, android_draw_point, android_draw_line)
(android_create_pixmap, android_set_ts_origin, android_clear_area):
* src/android.h (ANDROID_EXPORT):
* src/androidfns.c (android_display_info_for_name)
(check_android_display_info, check_x_display_info, gamma_correct)
(android_defined_color, android_decode_color)
(android_implicitly_set_name, android_explicitly_set_name)
(android_set_tool_bar_lines, android_change_tool_bar_height)
(android_set_tab_bar_lines, android_change_tab_bar_height)
(android_set_scroll_bar_default_height)
(android_set_scroll_bar_default_width, android_icon_verify)
(android_icon, android_make_gc, android_free_gcs)
(unwind_create_frame, do_unwind_create_frame)
(android_default_font_parameter, android_create_frame_window)
(Fx_create_frame, Fxw_color_defined_p, Fxw_color_values)
(Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells, Fx_display_screens)
(Fx_display_mm_width, Fx_display_mm_height)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_monitor_attributes_list, Fx_frame_geometry)
(Fx_frame_list_z_order, Fx_frame_restack)
(Fx_mouse_absolute_pixel_position)
(Fx_set_mouse_absolute_pixel_position, Fandroid_get_connection)
(Fx_display_list, Fx_show_tip, Fx_hide_tip)
(android_set_background_color, android_set_border_color)
(android_set_cursor_color, android_set_cursor_type)
(android_set_foreground_color)
(android_set_child_frame_border_width)
(android_set_internal_border_width, android_set_menu_bar_lines)
(android_set_mouse_color, android_set_title, android_set_alpha)
(android_frame_parm_handlers, syms_of_androidfns):
* src/androidfont.c (struct android_emacs_font_driver)
(struct android_emacs_font_spec, struct android_emacs_font_metrics)
(struct android_emacs_font_object, struct android_integer)
(struct androidfont_info, struct androidfont_entity)
(android_init_font_driver, android_init_font_spec)
(android_init_font_metrics, android_init_integer)
(android_init_font_object, androidfont_get_cache)
(androidfont_from_lisp, androidfont_from_java, androidfont_list)
(androidfont_match, androidfont_draw, androidfont_open_font)
(androidfont_close_font, androidfont_has_char)
(androidfont_encode_char, androidfont_text_extents)
(androidfont_list_family, androidfont_driver)
(syms_of_androidfont_for_pdumper, syms_of_androidfont)
(init_androidfont, android_finalize_font_entity):
* src/androidgui.h (_ANDROID_GUI_H_, struct android_rectangle)
(struct android_point, enum android_gc_function)
(enum android_gc_value_mask, enum android_fill_style)
(enum android_window_value_mask)
(struct android_set_window_attributes, struct android_gc_values)
(struct android_gc, enum android_swap_action, enum android_shape)
(enum android_coord_mode, struct android_swap_info)
(NativeRectangle, struct android_any_event)
(struct android_key_event, struct android_configure_event)
(union android_event):
* src/androidterm.c (android_window_to_frame, android_clear_frame)
(android_ring_bell, android_toggle_invisible_pointer)
(android_update_begin, android_update_end, show_back_buffer)
(android_flush_dirty_back_buffer_on, handle_one_android_event)
(android_read_socket, android_frame_up_to_date)
(android_buffer_flipping_unblocked_hook)
(android_query_frame_background_color, android_parse_color)
(android_alloc_nearest_color, android_query_colors)
(android_mouse_position, android_get_focus_frame)
(android_focus_frame, android_frame_rehighlight)
(android_frame_raise_lower, android_make_frame_visible)
(android_make_frame_invisible)
(android_make_frame_visible_invisible, android_fullscreen_hook)
(android_iconify_frame, android_set_window_size_1)
(android_set_window_size, android_set_offset, android_set_alpha)
(android_new_font, android_bitmap_icon, android_free_pixmap_hook)
(android_free_frame_resources, android_delete_frame)
(android_delete_terminal, android_scroll_run)
(android_after_update_window_line, android_flip_and_flush)
(android_clear_rectangle, android_reset_clip_rectangles)
(android_clip_to_row, android_draw_fringe_bitmap)
(android_set_cursor_gc, android_set_mouse_face_gc)
(android_set_mode_line_face_gc, android_set_glyph_string_gc)
(android_set_glyph_string_clipping)
(android_set_glyph_string_clipping_exactly)
(android_compute_glyph_string_overhangs)
(android_clear_glyph_string_rect)
(android_draw_glyph_string_background, android_fill_triangle)
(android_make_point, android_inside_rect_p, android_clear_point)
(android_draw_relief_rect, android_draw_box_rect)
(HIGHLIGHT_COLOR_DARK_BOOST_LIMIT, android_setup_relief_color)
(android_setup_relief_colors, android_draw_glyph_string_box)
(android_draw_glyph_string_bg_rect, android_draw_image_relief)
(android_draw_image_foreground, android_draw_image_foreground_1)
(android_draw_image_glyph_string)
(android_draw_stretch_glyph_string, android_draw_underwave)
(android_draw_glyph_string_foreground)
(android_draw_composite_glyph_string_foreground)
(android_draw_glyphless_glyph_string_foreground)
(android_draw_glyph_string, android_define_frame_cursor)
(android_clear_frame_area, android_clear_under_internal_border)
(android_draw_hollow_cursor, android_draw_bar_cursor)
(android_draw_window_cursor, android_draw_vertical_window_border)
(android_draw_window_divider, android_redisplay_interface)
(frame_set_mouse_pixel_position, get_keysym_name)
(android_create_terminal, android_term_init, syms_of_androidterm)
(mark_androidterm):
* src/androidterm.h (_ANDROID_TERM_H_, struct android_display_info)
(struct android_output, FRAME_ANDROID_OUTPUT, XSCROLL_BAR): New
files.
* src/dired.c (file_attributes): Do not use openat on Android.
* src/dispextern.h (No_Cursor): Define appropriately on Android.
(struct glyph_string, struct face): Make gc field of type struct
android_gc on Android.
* src/dispnew.c (clear_current_matrices, clear_desired_matrices)
(adjust_frame_glyphs_for_window_redisplay, free_glyphs)
(update_frame, scrolling, char_ins_del_cost, update_frame_line)
(init_display_interactive): Disable text terminal support
completely on Android.  Fix non-toolkit menus for non-X systems.
* src/editfns.c (Fuser_full_name): Call android_user_full_name.
* src/emacs.c (android_emacs_init): Make main this on Android.
Prohibit argv sorting from exceeding end of argv.
* src/epaths.in: Add path definitions for Android.

* src/fileio.c (file_access_p): Call android_file_access_p.
(file_name_directory): Avoid using openat on Android.
(Fcopy_file): Adjust to call sys_fstat instead.
(file_directory_p):
(Finsert_file_contents):
(write_region): Likewise.
* src/filelock.c:
* src/fns.c (Flocale_info): Pacify warning on Android.
* src/font.c (font_make_entity_android): New function.
* src/font.h:
* src/frame.c (Fframep):
(Fwindow_system): Handle new window system `android'.  Update doc strings.
(Fmake_terminal_frame): Disable on Android.
(gui_display_get_resource): Disable get_string_resource_hook on Android.
(syms_of_frame): New defsym `android'.

* src/frame.h (GCALIGNED_STRUCT): Add new output data for
Android.
(ENUM_BF): Expand enumerator size.
(FRAME_ANDROID_P, FRAME_WINDOW_P, MOUSE_HL_INFO): Add
definitions for Android.

* src/image.c (GET_PIXEL):
(image_create_bitmap_from_file):
(image_create_x_image_and_pixmap_1):
(image_get_x_image):
(slurp_file):
(lookup_rgb_color):
(image_to_emacs_colors):
(image_from_emacs_colors):
(image_pixmap_draw_cross):
(image_disable_image):
(MaskForeground):
(gif_load): Add stubs for Android.

* src/lisp.h:
* src/lread.c (safe_to_load_version, maybe_swap_for_eln1, openp):
* src/pdumper.c (pdumper_load): Call sys_fstat instead of fstat.
* src/process.c (wait_reading_process_output): Use
android_select instead of pselect.
* src/scroll.c: Disable on Android.
* src/sysdep.c (widen_foreground_group, reset_sys_modes)
(init_signals, emacs_fstatat, sys_fstat): New function.
(emacs_open, emacs_open_noquit, emacs_close): Implement
differently on Android.
(close_output_streams): Disable what is not required on Android.

* src/term.c (OUTPUT1_IF, encode_terminal_code, string_cost)
(string_cost_one_line, per_line_cost, calculate_costs)
(struct fkey_table, tty_append_glyph, produce_glyphs)
(tty_capable_p, Fsuspend_tty, Fresume_tty, device, init_tty)
(maybe_fatal, syms_of_term): Disable text terminal support on
Android.

* src/termhooks.h (enum output_method): Add android output
method.
(GCALIGNED_STRUCT, TERMINAL_FONT_CACHE): Define for Android.

* src/terminal.c (Fterminal_live_p): Implement for Android.

* src/verbose.mk.in (AM_V_GLOBALS): Add JAVAC and DX.
* src/xdisp.c (redisplay_internal): Disable text terminals on Android.
(display_menu_bar):
(display_tty_menu_item):
(draw_row_with_mouse_face):
(expose_frame): Make the non toolkit menu bar work on Android.

* src/xfaces.c (GCGraphicsExposures):
(x_create_gc):
(x_free_gc):
(Fx_load_color_file): Define for Android.

* xcompile/Makefile.in (top_srcdir):
(top_builddir):
* xcompile/README:
* xcompile/langinfo.h (nl_langinfo): New files.
---
 java/debug.sh | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 242 insertions(+)
 create mode 100755 java/debug.sh

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
new file mode 100755
index 00000000000..dd710dc31af
--- /dev/null
+++ b/java/debug.sh
@@ -0,0 +1,242 @@
+#!/bin/bash
+### Run Emacs under GDB or JDB on Android.
+
+## 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/>.
+
+set -m
+oldpwd=`pwd`
+cd `dirname $0`
+
+devices=`adb devices | grep device | awk -- '/device\y/ { print $1 }' -`
+device=
+progname=$0
+package=org.gnu.emacs
+activity=org.gnu.emacs.EmacsActivity
+gdb_port=5039
+jdb_port=64013
+jdb=no
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+	## This option specifies the serial number of a device to use.
+	"--device" )
+	    device="$2"
+	    if [ -z device ]; then
+		echo "You must specify an argument to --device"
+		exit 1
+	    fi
+	    ;;
+	"--help" )
+	    echo "Usage: $progname [options] -- [gdb options]"
+	    echo ""
+	    echo "  --device DEVICE	run Emacs on the specified device"
+	    echo "  --port PORT		run the GDB server on a specific port"
+	    echo "  --jdb-port PORT	run the JDB server on a specific port"
+	    echo "  --jdb		run JDB instead of GDB"
+	    echo "  --help		print this message"
+	    echo ""
+	    echo "Available devices:"
+	    for device in $devices; do
+		echo "  " $device
+	    done
+	    echo ""
+	    exit 0
+	    ;;
+	"--jdb" )
+	    jdb=yes
+	    ;;
+	"--port" )
+	    gdb_port=$1
+	    ;;
+	"--" )
+	    shift
+	    gdbargs=$@
+	    break;
+	    ;;
+	* )
+	    echo "$progname: Unrecognized argument $1"
+	    exit 1
+	    ;;
+    esac
+    shift
+done
+
+if [ -z $devices ]; then
+    echo "No devices are available."
+    exit 1
+fi
+
+if [ -z $device ]; then
+    device=$devices
+fi
+
+if [ `wc -w <<< "$devices"` -gt 1 ] && [ -z device ]; then
+    echo "Multiple devices are available.  Please pick one using"
+    echo "--device and try again."
+fi
+
+echo "Looking for $package on device $device"
+
+# Find the application data directory
+app_data_dir=`adb -s $device shell run-as $package sh -c 'pwd 2> /dev/null'`
+
+if [ -z $app_data_dir ]; then
+   echo "The data directory for the package $package was not found."
+   echo "Is it installed?"
+fi
+
+echo "Found application data directory at $app_data_dir..."
+
+# Find which PIDs are associated with org.gnu.emacs
+package_uid=`adb -s $device shell run-as $package id -u`
+
+if [ -z $package_uid ]; then
+    echo "Failed to obtain UID of packages named $package"
+    exit 1
+fi
+
+# First, run ps -u $package_uid -o PID,CMD to fetch the list of
+# process IDs.
+package_pids=`adb -s $device shell run-as $package ps -u $package_uid -o PID,CMD`
+
+# Next, remove lines matching "ps" itself.
+package_pids=`awk -- '{
+  if (!match ($0, /(PID|ps)/))
+    print $1
+}' <<< $package_pids`
+
+# Finally, kill each existing process.
+for pid in $package_pids; do
+    echo "Killing existing process $pid..."
+    adb -s $device shell run-as $package kill -9 $pid &> /dev/null
+done
+
+# Now run the main activity.  This must be done as the adb user and
+# not as the package user.
+echo "Starting activity $activity and attaching debugger"
+
+# Exit if the activity could not be started.
+adb -s $device shell am start -D "$package/$activity"
+if [ ! $? ]; then
+    exit 1;
+fi
+
+# Now look for processes matching the package again.
+package_pids=`adb -s $device shell run-as $package ps -u $package_uid -o PID,CMD`
+
+# Next, remove lines matching "ps" itself.
+package_pids=`awk -- '{
+  if (!match ($0, /(PID|ps)/))
+    print $1
+}' <<< $package_pids`
+
+pid=$package_pids
+num_pids=`wc -w <<< "$package_pids"`
+
+if [ $num_pids -gt 1 ]; then
+    echo "More than one process was started:"
+    echo ""
+    adb -s $device shell run-as $package ps -u $package_uid | awk -- '{
+      if (!match ($0, /ps/))
+        print $0
+    }'
+    echo ""
+    printf "Which one do you want to attach to? "
+    read pid
+elif [ -z $package_pids ]; then
+    echo "No processes were found to attach to."
+    exit 1
+fi
+
+# Start JDB to make the wait dialog disappear.
+echo "Attaching JDB to unblock the application."
+adb -s $device forward --remove-all
+adb -s $device forward "tcp:$jdb_port" "jdwp:$pid"
+
+if [ ! $? ]; then
+    echo "Failed to forward jdwp:$pid to $jdb_port!"
+    echo "Perhaps you need to specify a different port with --port?"
+    exit 1;
+fi
+
+jdb_command="jdb -connect \
+		 com.sun.jdi.SocketAttach:hostname=localhost,port=$jdb_port"
+
+if [ $jdb = "yes" ]; then
+    # Just start JDB and then exit
+    $jdb_command
+    exit 1
+fi
+
+exec 4<> /tmp/file-descriptor-stamp
+
+# Now run JDB with IO redirected to file descriptor 4 in a subprocess.
+$jdb_command <&4 >&4 &
+
+character=
+# Next, wait until the prompt is found.
+while read -n1 -u 4 character; do
+    if [ "$character" = ">" ]; then
+	echo "JDB attached successfully"
+	break;
+    fi
+done
+
+# Now start gdbserver on the device asynchronously.
+
+echo "Attaching gdbserver to $pid on $device..."
+exec 5<> /tmp/file-descriptor-stamp
+adb -s $device shell run-as $package /system/bin/gdbserver --once \
+    "+debug.$package_uid.socket" --attach $pid >&5 &
+
+# Wait until gdbserver successfully runs.
+line=
+while read -u 5 line; do
+    case "$line" in
+	*Attached* )
+	    break;
+	    ;;
+	*error* | *Error* | failed )
+	    echo $line
+	    exit 1
+	    ;;
+	* )
+	    ;;
+    esac
+done
+
+# Send EOF to JDB to make it go away.  This will also cause Android to
+# allow Emacs to continue executing.
+echo "Making JDB go away..."
+echo "exit" >&4
+read -u 4 line
+echo "JDB has gone away with $line"
+
+# Forward the gdb server port here.
+adb -s $device forward "tcp:$gdb_port" \
+    "localfilesystem:$app_data_dir/debug.$package_uid.socket"
+if [ ! $? ]; then
+    echo "Failed to forward $app_data_dir/debug.$package_uid.socket"
+    echo "to $gdb_port!  Perhaps you need to specify a different port"
+    echo "with --port?"
+    exit 1;
+fi
+
+# Finally, start gdb with any extra arguments needed.
+cd "$oldpwd"
+gdb --eval-command "" --eval-command "target remote localhost:$gdb_port" $gdbargs
-- 
cgit v1.2.1


From f9732131cf3c67e24db74a3d49f256d3c189a7e3 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Fri, 13 Jan 2023 15:53:08 +0800
Subject: Update Android port

* configure.ac (ANDROID_MIN_SDK): New variable.
(DX): Remove and replace with D8.
(XCONFIGURE): Check for the minimum version of Android the cross
compiler compiles for.  Generate java/AndroidManifest.xml from
java/AndroidManifest.xml.in.  Allow using Zlib on Android.

* java/AndroidManifest.xml.in: New file.  Use the minimum SDK
detected by configure.

* java/Makefile.in (top_srcdir, version): New variables.
(DX, D8): Replace with D8.
(ANDROID_MIN_SDK, APK_NAME): New variables.
(.PHONY):
(.PRECIOUS):
(classes.dex):
(emacs.apk): Generate $(APK_NAME) instead of `emacs.apk'.

* java/debug.sh: New option --attach-existing.  Attach to an
existing Emacs instance when specified.

* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity): New
field `isPaused'.
(invalidateFocus1): Fix infinite recursion.
(detachWindow): Deiconify window.
(attachWindow): Iconify the window if the activity is paused.
(onCreate): Use the ``no title bar'' theme.
(onPause, onResume): New functions.
* java/org/gnu/emacs/EmacsNative.java (sendTouchUp, sendTouchDown)
(sendTouchMove, sendWheel, sendIconified, sendDeiconified): New
functions.
* java/org/gnu/emacs/EmacsSdk7FontDriver.java (Sdk7Typeface):
(list): Remove logging for code that is mostly going to be unused.
* java/org/gnu/emacs/EmacsService.java (ringBell, queryTree)
(getScreenWidth, getScreenHeight, detectMouse): New functions.
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView)
(surfaceChanged, surfaceCreated, surfaceDestroyed): Add extra
debug logging.  Avoid deadlock in surfaceCreated.

* java/org/gnu/emacs/EmacsView.java (EmacsView): Try very hard
to make the SurfaceView respect Z order.  It didn't work.
(handleDirtyBitmap): Copy over the contents from the old bitmap.
(explicitlyDirtyBitmap): New function.
(onLayout): Don't dirty bitmap if unnecessary.
(damageRect, swapBuffers): Don't synchronize so hard.
(onTouchEvent): Call window.onTouchEvent instead.
(moveChildToBack, raise, lower): New functions.

* java/org/gnu/emacs/EmacsWindow.java (Coordinate): New
subclass.
(pointerMap, isMapped, isIconified, dontFocusOnMap)
(dontAcceptFocus): New fields.
(EmacsWindow): Don't immediately register unmapped window.
(viewLayout): Send configure event outside the lock.
(requestViewLayout): Explicitly dirty the bitmap.
(mapWindow): Register the window now.  Respect dontFocusOnMap.
(unmapWindow): Unregister the window now.
(figureChange, onTouchEvent): New functions.
(onSomeKindOfMotionEvent): Handle scroll wheel events.
(reparentTo, makeInputFocus, raise, lower, getWindowGeometry)
(noticeIconified, noticeDeiconified, setDontAcceptFocus)
(setDontFocusOnMap, getDontFocusOnMap): New functions.
* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(registerWindow, detachWindow): Synchronize.
(noticeIconified, noticeDeiconified): New functions.
(copyWindows): New function.

* lisp/frame.el (frame-geometry, frame-edges)
(mouse-absolute-pixel-position, set-mouse-absolute-pixel-position)
(frame-list-z-order, frame-restack, display-mouse-p)
(display-monitor-attributes-list): Implement on Android.

* lisp/mwheel.el (mouse-wheel-down-event):
(mouse-wheel-up-event):
(mouse-wheel-left-event):
(mouse-wheel-right-event): Define on Android.

* src/android.c (struct android_emacs_service): New methods
`ringBell', `queryTree', `getScreenWidth', `getScreenHeight',
and `detectMouse'.
(struct android_event_queue, android_init_events)
(android_next_event, android_write_event): Remove write limit.
(android_file_access_p): Handle directories correcty.
(android_close): Fix coding style.
(android_fclose): New function.
(android_init_emacs_service): Initialize new methods.
(android_reparent_window): Implement function.
(android_bell, android_set_input_focus, android_raise_window)
(android_lower_window, android_query_tree, android_get_geometry)
(android_get_screen_width, android_get_screen_height)
(android_get_mm_width, android_get_mm_height, android_detect_mouse)
(android_set_dont_focus_on_map, android_set_dont_accept_focus):
New functions.
(struct android_dir): New structure.
(android_opendir, android_readdir, android_closedir): New
functions.
(emacs_abort): Implement here on Android and poke debuggerd into
generating a tombstone.

* src/android.h: Update prototypes.

* src/androidfns.c (android_set_parent_frame): New function.
(android_default_font_parameter): Use sane font size by default.
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_mm_width, Fx_display_mm_height)
(Fx_display_monitor_attributes_list): Rename to start with
`android-'.  Implement.  Fiddle with documentation to introduce
Android specific nuances.
(Fandroid_display_monitor_attributes_list): New function.
(Fx_frame_geometry, frame_geometry): New function.
(Fandroid_frame_geometry): Implement correctly.
(Fx_frame_list_z_order): Rename to start with `android-'.
(android_frame_list_z_order, Fandroid_frame_list_z_order):
Implement.
(Fx_frame_restack): Rename to start with `android-'.
(Fandroid_frame_restack): ``Implement''.
(Fx_mouse_absolute_pixel_position): Rename to start with
`android-'.
(Fandroid_mouse_absolute_pixel_position): ``Implement''.
(Fx_set_mouse_absolute_pixel_position): Rename to start with
`android-'.
(Fandroid_set_mouse_absolute_pixel_position): ``Implement''.
(Fandroid_detect_mouse): New function.
(android_set_menu_bar_lines): Use FRAME_ANDROID_DRAWABLE when
clearing area.
(android_set_no_focus_on_map, android_set_no_accept_focus): New
functions.
(android_frame_parm_handlers): Register new frame parameter
handlers.
(syms_of_androidfns): Update appropriately.

* src/androidfont.c (androidfont_draw): Use
FRAME_ANDROID_DRAWABLE instead of FRAME_ANDROID_WINDOW.

* src/androidgui.h (enum android_event_type): New events.
(struct android_touch_event, struct android_wheel_event)
(struct android_iconify_event): New structures.
(union android_event): Add new events.

* src/androidterm.c (android_clear_frame): Use
FRAME_ANDROID_DRAWABLE instead of FRAME_ANDROID_WINDOW.
(android_flash, android_ring_bell): Implement bell ringing.
(android_toggle_invisible_pointer): Don't TODO function that
can't be implemented.
(show_back_buffer, android_flush_dirty_back_buffer_on): Check if
a buffer flip is required before doing the flip.
(android_lower_frame, android_raise_frame): Implement functions.
(android_update_tools, android_find_tool): New functions.
(handle_one_android_event): Handle new iconification, wheel and
touch events.
(android_read_socket): Implement pending-autoraise-frames.
(android_frame_up_to_date): Implement bell ringing.
(android_buffer_flipping_unblocked_hook): Check if a buffer flip
is required before doing the flip.
(android_focus_frame, android_frame_highlight)
(android_frame_unhighlight): New function.
(android_frame_rehighlight): Implement functions.
(android_iconify_frame): Always display error.
(android_set_alpha): Update commentary.
(android_free_frame_resources): Free frame touch points.
(android_scroll_run, android_flip_and_flush)
(android_clear_rectangle, android_draw_fringe_bitmap)
(android_draw_glyph_string_background, android_fill_triangle)
(android_clear_point, android_draw_relief_rect)
(android_draw_box_rect, android_draw_glyph_string_bg_rect)
(android_draw_image_foreground, android_draw_stretch_glyph_string)
(android_draw_underwave, android_draw_glyph_string_foreground)
(android_draw_composite_glyph_string_foreground)
(android_draw_glyphless_glyph_string_foreground)
(android_draw_glyph_string, android_clear_frame_area)
(android_clear_under_internal_border, android_draw_hollow_cursor)
(android_draw_bar_cursor, android_draw_vertical_window_border)
(android_draw_window_divider): Use FRAME_ANDROID_DRAWABLE
instead of FRAME_ANDROID_WINDOW for drawing operations.

* src/androidterm.h (struct android_touch_point): New structure.
(struct android_output): New fields.
(FRAME_ANDROID_NEED_BUFFER_FLIP): New macro.

* src/dired.c (emacs_readdir, open_directory)
(directory_files_internal_unwind, read_dirent)
(directory_files_internal, file_name_completion): Add
indirection over readdir and opendir.  Use android variants on
Android.

* src/dispnew.c (Fopen_termscript):
* src/fileio.c (fclose_unwind): Use emacs_fclose.
(Faccess_file): Call android_file_access_p.
(file_accessible_directory_p): Append right suffix to Android
assets directory.
(do_auto_save_unwind): Use emacs_fclose.
* src/keyboard.c (lispy_function_keys): Use right function key
for page up and page down.
(Fopen_dribble_file): Use emacs_fclose.

* src/lisp.h: New prototype emacs_fclose.

* src/lread.c (close_infile_unwind): Use emacs_fclose.

* src/sfnt.c (sfnt_curve_is_flat): Fix area-squared computation.
(sfnt_prepare_raster): Compute raster width and height
consistently with outline building.
(sfnt_build_outline_edges): Use the same offsets used to set
offy and offx.
(main): Adjust debug code.

* src/sfntfont-android.c (sfntfont_android_saturate32): Delete
function.
(sfntfont_android_blend, sfntfont_android_blendrgb): Remove
unnecessary debug code.
(sfntfont_android_composite_bitmap): Prevent out of bounds
write.
(sfntfont_android_put_glyphs): Use FRAME_ANDROID_DRAWABLE.
(init_sfntfont_android): Initialize Monospace Serif font to
something sensible.
* src/sfntfont.c (sfntfont_text_extents): Clear glyph metrics
before summing up pcm.
(sfntfont_draw): Use s->font instead of s->face->font.

* src/sysdep.c (emacs_fclose): Wrap around android_fclose on
android.

* src/term.c (Fsuspend_tty):
(delete_tty): Use emacs_fclose.
* src/verbose.mk.in (AM_V_DX): Replace with D8 version.
---
 java/debug.sh | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index dd710dc31af..3e3e3d9c281 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -30,6 +30,7 @@ activity=org.gnu.emacs.EmacsActivity
 gdb_port=5039
 jdb_port=64013
 jdb=no
+attach_existing=no
 
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -48,6 +49,7 @@ while [ $# -gt 0 ]; do
 	    echo "  --port PORT		run the GDB server on a specific port"
 	    echo "  --jdb-port PORT	run the JDB server on a specific port"
 	    echo "  --jdb		run JDB instead of GDB"
+	    echo "  --attach-existing	attach to an existing process"
 	    echo "  --help		print this message"
 	    echo ""
 	    echo "Available devices:"
@@ -63,6 +65,9 @@ while [ $# -gt 0 ]; do
 	"--port" )
 	    gdb_port=$1
 	    ;;
+	"--attach-existing" )
+	    attach_existing=yes
+	    ;;
 	"--" )
 	    shift
 	    gdbargs=$@
@@ -120,30 +125,32 @@ package_pids=`awk -- '{
     print $1
 }' <<< $package_pids`
 
-# Finally, kill each existing process.
-for pid in $package_pids; do
-    echo "Killing existing process $pid..."
-    adb -s $device shell run-as $package kill -9 $pid &> /dev/null
-done
-
-# Now run the main activity.  This must be done as the adb user and
-# not as the package user.
-echo "Starting activity $activity and attaching debugger"
-
-# Exit if the activity could not be started.
-adb -s $device shell am start -D "$package/$activity"
-if [ ! $? ]; then
-    exit 1;
-fi
+if [ "$attach_existing" != "yes" ]; then
+    # Finally, kill each existing process.
+    for pid in $package_pids; do
+	echo "Killing existing process $pid..."
+	adb -s $device shell run-as $package kill -9 $pid &> /dev/null
+    done
+
+    # Now run the main activity.  This must be done as the adb user and
+    # not as the package user.
+    echo "Starting activity $activity and attaching debugger"
+
+    # Exit if the activity could not be started.
+    adb -s $device shell am start -D "$package/$activity"
+    if [ ! $? ]; then
+	exit 1;
+    fi
 
-# Now look for processes matching the package again.
-package_pids=`adb -s $device shell run-as $package ps -u $package_uid -o PID,CMD`
+    # Now look for processes matching the package again.
+    package_pids=`adb -s $device shell run-as $package ps -u $package_uid -o PID,CMD`
 
-# Next, remove lines matching "ps" itself.
-package_pids=`awk -- '{
+    # Next, remove lines matching "ps" itself.
+    package_pids=`awk -- '{
   if (!match ($0, /(PID|ps)/))
     print $1
 }' <<< $package_pids`
+fi
 
 pid=$package_pids
 num_pids=`wc -w <<< "$package_pids"`
-- 
cgit v1.2.1


From 2b87ab7b27163fbd7b6b64c5a44e26b0e692c00a Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sat, 14 Jan 2023 22:12:16 +0800
Subject: 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.
---
 java/debug.sh | 110 +++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 74 insertions(+), 36 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 3e3e3d9c281..aa80aeeebcd 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -31,6 +31,7 @@ gdb_port=5039
 jdb_port=64013
 jdb=no
 attach_existing=no
+gdbserver=
 
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -41,6 +42,7 @@ while [ $# -gt 0 ]; do
 		echo "You must specify an argument to --device"
 		exit 1
 	    fi
+	    shift
 	    ;;
 	"--help" )
 	    echo "Usage: $progname [options] -- [gdb options]"
@@ -50,6 +52,7 @@ while [ $# -gt 0 ]; do
 	    echo "  --jdb-port PORT	run the JDB server on a specific port"
 	    echo "  --jdb		run JDB instead of GDB"
 	    echo "  --attach-existing	attach to an existing process"
+	    echo "  --gdbserver BINARY	upload and use the specified gdbserver binary"
 	    echo "  --help		print this message"
 	    echo ""
 	    echo "Available devices:"
@@ -62,9 +65,18 @@ while [ $# -gt 0 ]; do
 	"--jdb" )
 	    jdb=yes
 	    ;;
+	"--gdbserver" )
+	    shift
+	    gdbserver=$1
+	    ;;
 	"--port" )
+	    shift
 	    gdb_port=$1
 	    ;;
+	"--jdb-port" )
+	    shift
+	    jdb_port=$1
+	    ;;
 	"--attach-existing" )
 	    attach_existing=yes
 	    ;;
@@ -170,46 +182,71 @@ elif [ -z $package_pids ]; then
     exit 1
 fi
 
-# Start JDB to make the wait dialog disappear.
-echo "Attaching JDB to unblock the application."
-adb -s $device forward --remove-all
-adb -s $device forward "tcp:$jdb_port" "jdwp:$pid"
+# This isn't necessary when attaching gdb to an existing process.
+if [ "$jdb" = "yes" ] || [ "$attach_existing" != yes ]; then
+    # Start JDB to make the wait dialog disappear.
+    echo "Attaching JDB to unblock the application."
+    adb -s $device forward --remove-all
+    adb -s $device forward "tcp:$jdb_port" "jdwp:$pid"
 
-if [ ! $? ]; then
-    echo "Failed to forward jdwp:$pid to $jdb_port!"
-    echo "Perhaps you need to specify a different port with --port?"
-    exit 1;
-fi
+    if [ ! $? ]; then
+	echo "Failed to forward jdwp:$pid to $jdb_port!"
+	echo "Perhaps you need to specify a different port with --port?"
+	exit 1;
+    fi
 
-jdb_command="jdb -connect \
+    jdb_command="jdb -connect \
 		 com.sun.jdi.SocketAttach:hostname=localhost,port=$jdb_port"
 
-if [ $jdb = "yes" ]; then
-    # Just start JDB and then exit
-    $jdb_command
-    exit 1
-fi
+    if [ $jdb = "yes" ]; then
+	# Just start JDB and then exit
+	$jdb_command
+	exit 1
+    fi
 
-exec 4<> /tmp/file-descriptor-stamp
+    exec 4<> /tmp/file-descriptor-stamp
 
-# Now run JDB with IO redirected to file descriptor 4 in a subprocess.
-$jdb_command <&4 >&4 &
+    # Now run JDB with IO redirected to file descriptor 4 in a subprocess.
+    $jdb_command <&4 >&4 &
 
-character=
-# Next, wait until the prompt is found.
-while read -n1 -u 4 character; do
-    if [ "$character" = ">" ]; then
-	echo "JDB attached successfully"
-	break;
-    fi
-done
+    character=
+    # Next, wait until the prompt is found.
+    while read -n1 -u 4 character; do
+	if [ "$character" = ">" ]; then
+	    echo "JDB attached successfully"
+	    break;
+	fi
+    done
+fi
+
+# See if gdbserver has to be uploaded
+if [ -z "$gdbserver" ]; then
+    gdbserver_bin=/system/bin/gdbserver
+else
+    gdbserver_bin=/data/local/tmp/gdbserver
+
+    # Upload the specified gdbserver binary to the device.
+    adb -s $device push "$gdbserver" "$gdbserver_bin"
+    adb -s $device shell chmod +x "$gdbserver_bin"
+fi
 
 # Now start gdbserver on the device asynchronously.
 
 echo "Attaching gdbserver to $pid on $device..."
 exec 5<> /tmp/file-descriptor-stamp
-adb -s $device shell run-as $package /system/bin/gdbserver --once \
-    "+debug.$package_uid.socket" --attach $pid >&5 &
+
+if [ -z "$gdbserver" ]; then
+    adb -s $device shell run-as $package $gdbserver_bin --once \
+	"+debug.$package_uid.socket" --attach $pid >&5 &
+    gdb_socket="localfilesystem:$app_data_dir/debug.$package_uid.socket"
+else
+    # Normally the program cannot access $gdbserver_bin when it is
+    # placed in /data/local/tmp.
+    adb -s $device shell $gdbserver_bin --once \
+	"+/data/local/tmp/debug.$package_uid.socket" \
+	--attach $pid >&5 &
+    gdb_socket="localfilesystem:/data/local/tmp/debug.$package_uid.socket"
+fi
 
 # Wait until gdbserver successfully runs.
 line=
@@ -227,16 +264,17 @@ while read -u 5 line; do
     esac
 done
 
-# Send EOF to JDB to make it go away.  This will also cause Android to
-# allow Emacs to continue executing.
-echo "Making JDB go away..."
-echo "exit" >&4
-read -u 4 line
-echo "JDB has gone away with $line"
+if [ "$attach_existing" != "yes" ]; then
+    # Send EOF to JDB to make it go away.  This will also cause
+    # Android to allow Emacs to continue executing.
+    echo "Making JDB go away..."
+    echo "exit" >&4
+    read -u 4 line
+    echo "JDB has gone away with $line"
+fi
 
 # Forward the gdb server port here.
-adb -s $device forward "tcp:$gdb_port" \
-    "localfilesystem:$app_data_dir/debug.$package_uid.socket"
+adb -s $device forward "tcp:$gdb_port" $gdb_socket
 if [ ! $? ]; then
     echo "Failed to forward $app_data_dir/debug.$package_uid.socket"
     echo "to $gdb_port!  Perhaps you need to specify a different port"
-- 
cgit v1.2.1


From a496509cedb17109d0e6297a74e2ff8ed526333c Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Thu, 19 Jan 2023 22:19:06 +0800
Subject: Update Android port

* .gitignore: Add new files.
* INSTALL.android: Explain how to build Emacs for ancient
versions of Android.
* admin/merge-gnulib (GNULIB_MODULES): Add getdelim.
* build-aux/config.guess (timestamp, version):
* build-aux/config.sub (timestamp, version): Autoupdate.
* configure.ac (BUILD_DETAILS, ANDROID_MIN_SDK):
(ANDROID_STUBIFY): Allow specifying CFLAGS via ANDROID_CFLAGS.
Add new configure tests for Android API version when not
explicitly specified.

* doc/emacs/android.texi (Android): Add reference to ``Other
Input Devices''.
(Android File System): Remove restrictions on directory-files on
the assets directory.
* doc/emacs/emacs.texi (Top): Add Other Input Devices to menu.
* doc/emacs/input.texi (Other Input Devices): New node.
* doc/lispref/commands.texi (Touchscreen Events): Document
changes to touchscreen input events.
* doc/lispref/frames.texi (Pop-Up Menus): Likewise.
* etc/NEWS: Announce changes.
* java/Makefile.in: Use lib-src/asset-directory-tool to generate
an `directory-tree' file placed in /assets.
* java/debug.sh: Large adjustments to support Android 2.2 and
later.

* java/org/gnu/emacs/EmacsContextMenu.java (inflateMenuItems):
* java/org/gnu/emacs/EmacsCopyArea.java (perform):
* java/org/gnu/emacs/EmacsDialog.java (toAlertDialog):
* java/org/gnu/emacs/EmacsDrawLine.java (perform):
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsDrawable.java (EmacsDrawable):
* java/org/gnu/emacs/EmacsFillPolygon.java (perform):
* java/org/gnu/emacs/EmacsFillRectangle.java (perform):
* java/org/gnu/emacs/EmacsGC.java (EmacsGC):
* java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap):
(destroyHandle):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java (draw): Avoid
redundant canvas saves and restores.
* java/org/gnu/emacs/EmacsService.java (run):
* java/org/gnu/emacs/EmacsView.java (EmacsView):
(handleDirtyBitmap):
* java/org/gnu/emacs/EmacsWindow.java (changeWindowBackground)
(EmacsWindow): Make compatible with Android 2.2 and later.

* lib-src/Makefile.in (DONT_INSTALL): Add asset-directory-tool
on Android.:(asset-directory-tool{EXEEXT}): New target.
* lib-src/asset-directory-tool.c (struct directory_tree, xmalloc)
(main_1, main_2, main): New file.

* lib, m4: Merge from gnulib.  This will be reverted before
merging to master.

* lisp/button.el (button-map):
(push-button):
* lisp/frame.el (display-popup-menus-p): Improve touchscreen
support.
* lisp/subr.el (event-start):
(event-end): Handle touchscreen events.
* lisp/touch-screen.el (touch-screen-handle-timeout):
(touch-screen-handle-point-update):
(touch-screen-handle-point-up):
(touch-screen-track-tap):
(touch-screen-track-drag):
(touch-screen-drag-mode-line-1):
(touch-screen-drag-mode-line): New functions.
([mode-line touchscreen-begin]):
([bottom-divider touchscreen-begin]): Bind new events.

* lisp/wid-edit.el (widget-event-point):
(widget-keymap):
(widget-event-start):
(widget-button--check-and-call-button):
(widget-button-click): Improve touchscreen support.

* src/alloc.c (make_lisp_symbol): Avoid ICE on Android NDK GCC.
(mark_pinned_symbols): Likewise.

* src/android.c (struct android_emacs_window): New struct.
(window_class): New variable.
(android_run_select_thread): Add workaround for Android platform
bug.
(android_extract_long, android_scan_directory_tree): New
functions.
(android_file_access_p): Use those functions instead.
(android_init_emacs_window): New function.
(android_init_emacs_gc_class): Update signature of `markDirty'.
(android_change_gc, android_set_clip_rectangles): Tell the GC
whether or not clip rects were dirtied.
(android_swap_buffers): Do not look up method every time.
(struct android_dir): Adjust for new directory tree lookup.
(android_opendir, android_readdir, android_closedir): Likewise.
(android_four_corners_bilinear): Fix coding style.
(android_ftruncate): New function.
* src/android.h: Update prototypes.  Replace ftruncate with
android_ftruncate when necessary.

* src/androidterm.c (handle_one_android_event): Pacify GCC.  Fix
touch screen tool bar bug.
* src/emacs.c (using_utf8): Fix compilation error.
* src/fileio.c (Ffile_system_info): Return Qnil when fsusage.o
is not built.
* src/filelock.c (BOOT_TIME_FILE): Fix definition for Android.
* src/frame.c (Fx_parse_geometry): Fix uninitialized variable
uses.
* src/keyboard.c (lispy_function_keys): Fix `back'.
* src/menu.c (x_popup_menu_1): Handle touch screen events.
(Fx_popup_menu): Document changes.

* src/sfnt.c (main): Improve tests.

* src/sfntfont-android.c (sfntfont_android_put_glyphs): Fix
minor problem.
(init_sfntfont_android): Check for
HAVE_DECL_ANDROID_GET_DEVICE_API_LEVEL.
* src/sfntfont.c (struct sfnt_font_desc): New fields `adstyle'
and `languages'.
(sfnt_parse_style): Append tokens to adstyle.
(sfnt_parse_languages): New function.
(sfnt_enum_font_1): Parse supported languages and adstyle.
(sfntfont_list_1): Handle new fields.
(sfntfont_text_extents): Fix uninitialized variable use.
(syms_of_sfntfont, mark_sfntfont): Adjust accordingly.
---
 java/debug.sh | 155 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 99 insertions(+), 56 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index aa80aeeebcd..7008664c049 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -93,7 +93,7 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-if [ -z $devices ]; then
+if [ -z "$devices" ]; then
     echo "No devices are available."
     exit 1
 fi
@@ -117,25 +117,43 @@ if [ -z $app_data_dir ]; then
    echo "Is it installed?"
 fi
 
-echo "Found application data directory at $app_data_dir..."
-
-# Find which PIDs are associated with org.gnu.emacs
-package_uid=`adb -s $device shell run-as $package id -u`
-
-if [ -z $package_uid ]; then
-    echo "Failed to obtain UID of packages named $package"
-    exit 1
-fi
-
-# First, run ps -u $package_uid -o PID,CMD to fetch the list of
-# process IDs.
-package_pids=`adb -s $device shell run-as $package ps -u $package_uid -o PID,CMD`
-
-# Next, remove lines matching "ps" itself.
-package_pids=`awk -- '{
-  if (!match ($0, /(PID|ps)/))
-    print $1
-}' <<< $package_pids`
+echo "Found application data directory at" "$app_data_dir"
+
+# Generate an awk script to extract PIDs from Android ps output.  It
+# is enough to run `ps' as the package user on newer versions of
+# Android, but that doesn't work on Android 2.3.
+cat << EOF > tmp.awk
+BEGIN {
+  pid = 0;
+  pid_column = 2;
+}
+
+{
+  # Remove any trailing carriage return from the input line.
+  gsub ("\r", "", \$NF)
+
+  # If this is line 1, figure out which column contains the PID.
+  if (NR == 1)
+    {
+      for (n = 1; n <= NF; ++n)
+	{
+	  if (\$n == "PID")
+	    pid_column=n;
+	}
+    }
+  else if (\$NF == "$package")
+   print \$pid_column
+}
+EOF
+
+# Make sure that file disappears once this script exits.
+trap "rm -f $(pwd)/tmp.awk" 0
+
+# First, run ps to fetch the list of process IDs.
+package_pids=`adb -s $device shell ps`
+
+# Next, extract the list of PIDs currently running.
+package_pids=`awk -f tmp.awk <<< $package_pids`
 
 if [ "$attach_existing" != "yes" ]; then
     # Finally, kill each existing process.
@@ -149,19 +167,20 @@ if [ "$attach_existing" != "yes" ]; then
     echo "Starting activity $activity and attaching debugger"
 
     # Exit if the activity could not be started.
-    adb -s $device shell am start -D "$package/$activity"
+    adb -s $device shell am start -D -n "$package/$activity"
     if [ ! $? ]; then
 	exit 1;
     fi
 
+    # Sleep for a bit.  Otherwise, the process may not have started
+    # yet.
+    sleep 1
+
     # Now look for processes matching the package again.
-    package_pids=`adb -s $device shell run-as $package ps -u $package_uid -o PID,CMD`
+    package_pids=`adb -s $device shell ps`
 
     # Next, remove lines matching "ps" itself.
-    package_pids=`awk -- '{
-  if (!match ($0, /(PID|ps)/))
-    print $1
-}' <<< $package_pids`
+    package_pids=`awk -f tmp.awk <<< $package_pids`
 fi
 
 pid=$package_pids
@@ -170,10 +189,10 @@ num_pids=`wc -w <<< "$package_pids"`
 if [ $num_pids -gt 1 ]; then
     echo "More than one process was started:"
     echo ""
-    adb -s $device shell run-as $package ps -u $package_uid | awk -- '{
-      if (!match ($0, /ps/))
-        print $0
-    }'
+    adb -s $device shell run-as $package ps | awk -- "{
+      if (!match (\$0, /ps/) && match (\$0, /$package/))
+        print \$0
+    }"
     echo ""
     printf "Which one do you want to attach to? "
     read pid
@@ -182,10 +201,12 @@ elif [ -z $package_pids ]; then
     exit 1
 fi
 
-# This isn't necessary when attaching gdb to an existing process.
+# If either --jdb was specified or debug.sh is not connecting to an
+# existing process, then store a suitable JDB invocation in
+# jdb_command.  GDB will then run JDB to unblock the application from
+# the wait dialog after startup.
+
 if [ "$jdb" = "yes" ] || [ "$attach_existing" != yes ]; then
-    # Start JDB to make the wait dialog disappear.
-    echo "Attaching JDB to unblock the application."
     adb -s $device forward --remove-all
     adb -s $device forward "tcp:$jdb_port" "jdwp:$pid"
 
@@ -203,20 +224,42 @@ if [ "$jdb" = "yes" ] || [ "$attach_existing" != yes ]; then
 	$jdb_command
 	exit 1
     fi
+fi
 
-    exec 4<> /tmp/file-descriptor-stamp
+if [ -n "$jdb_command" ]; then
+    echo "Starting JDB to unblock application."
 
-    # Now run JDB with IO redirected to file descriptor 4 in a subprocess.
-    $jdb_command <&4 >&4 &
+    # Start JDB to unblock the application.
+    coproc JDB { $jdb_command; }
 
-    character=
-    # Next, wait until the prompt is found.
-    while read -n1 -u 4 character; do
-	if [ "$character" = ">" ]; then
-	    echo "JDB attached successfully"
-	    break;
+    # Tell JDB to first suspend all threads.
+    echo "suspend" >&${JDB[1]}
+
+    # Tell JDB to print a magic string once the program is
+    # initialized.
+    echo "print \"__verify_jdb_has_started__\"" >&${JDB[1]}
+
+    # Now wait for JDB to give the string back.
+    line=
+    while :; do
+	read -u ${JDB[0]} line
+	if [ ! $? ]; then
+	    echo "Failed to read JDB output"
+	    exit 1
 	fi
+
+	case "$line" in
+	    *__verify_jdb_has_started__*)
+		# Android only polls for a Java debugger every 200ms, so
+		# the debugger must be connected for at least that long.
+		echo "Pausing 1 second for the program to continue."
+		sleep 1
+		break
+		;;
+	esac
     done
+
+    # Note that JDB does not exit until GDB is fully attached!
 fi
 
 # See if gdbserver has to be uploaded
@@ -234,18 +277,19 @@ fi
 
 echo "Attaching gdbserver to $pid on $device..."
 exec 5<> /tmp/file-descriptor-stamp
+rm -f /tmp/file-descriptor-stamp
 
 if [ -z "$gdbserver" ]; then
     adb -s $device shell run-as $package $gdbserver_bin --once \
-	"+debug.$package_uid.socket" --attach $pid >&5 &
-    gdb_socket="localfilesystem:$app_data_dir/debug.$package_uid.socket"
+	"+debug.$package.socket" --attach $pid >&5 &
+    gdb_socket="localfilesystem:$app_data_dir/debug.$package.socket"
 else
     # Normally the program cannot access $gdbserver_bin when it is
     # placed in /data/local/tmp.
     adb -s $device shell $gdbserver_bin --once \
-	"+/data/local/tmp/debug.$package_uid.socket" \
+	"+/data/local/tmp/debug.$package.socket" \
 	--attach $pid >&5 &
-    gdb_socket="localfilesystem:/data/local/tmp/debug.$package_uid.socket"
+    gdb_socket="localfilesystem:/data/local/tmp/debug.$package.socket"
 fi
 
 # Wait until gdbserver successfully runs.
@@ -256,7 +300,7 @@ while read -u 5 line; do
 	    break;
 	    ;;
 	*error* | *Error* | failed )
-	    echo $line
+	    echo "GDB error:" $line
 	    exit 1
 	    ;;
 	* )
@@ -264,19 +308,18 @@ while read -u 5 line; do
     esac
 done
 
-if [ "$attach_existing" != "yes" ]; then
-    # Send EOF to JDB to make it go away.  This will also cause
-    # Android to allow Emacs to continue executing.
-    echo "Making JDB go away..."
-    echo "exit" >&4
-    read -u 4 line
-    echo "JDB has gone away with $line"
+# Now that GDB is attached, tell the Java debugger to resume execution
+# and then exit.
+
+if [ -n "$jdb_command" ]; then
+    echo "resume" >&${JDB[1]}
+    echo "exit" >&${JDB[1]}
 fi
 
 # Forward the gdb server port here.
 adb -s $device forward "tcp:$gdb_port" $gdb_socket
 if [ ! $? ]; then
-    echo "Failed to forward $app_data_dir/debug.$package_uid.socket"
+    echo "Failed to forward $app_data_dir/debug.$package.socket"
     echo "to $gdb_port!  Perhaps you need to specify a different port"
     echo "with --port?"
     exit 1;
@@ -284,4 +327,4 @@ fi
 
 # Finally, start gdb with any extra arguments needed.
 cd "$oldpwd"
-gdb --eval-command "" --eval-command "target remote localhost:$gdb_port" $gdbargs
+gdb --eval-command "target remote localhost:$gdb_port" $gdbargs
-- 
cgit v1.2.1


From a1941cd7a7dc9a6f6b7239ec7d4bd3bdf5d55fc9 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Fri, 10 Feb 2023 18:57:51 +0800
Subject: Update Android port

* doc/emacs/android.texi (Android Windowing): Remove yet another
limitation.
* java/debug.sh: Make this work on systems which prohibit
attaching to app processes from adbd.
* java/org/gnu/emacs/EmacsCopyArea.java (perform): Avoid
creating copies whenever possible.
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView):
Remove SurfaceView based implementation and use manual double
buffering with invalidate instead.
* java/org/gnu/emacs/EmacsView.java (EmacsView, handleDirtyBitmap)
(raise, lower, onDetachedFromWindow): Adjust accordingly.
* java/org/gnu/emacs/EmacsWindow.java (windowUpdated): Remove
function.
* src/sfntfont.c (sfntfont_open): Set font->max_width correctly.
---
 java/debug.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 7008664c049..2e95f9738c7 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -267,10 +267,14 @@ if [ -z "$gdbserver" ]; then
     gdbserver_bin=/system/bin/gdbserver
 else
     gdbserver_bin=/data/local/tmp/gdbserver
+    gdbserver_cat="cat $gdbserver_bin | run-as $package sh -c \
+		   \"tee gdbserver > /dev/null\""
 
     # Upload the specified gdbserver binary to the device.
     adb -s $device push "$gdbserver" "$gdbserver_bin"
-    adb -s $device shell chmod +x "$gdbserver_bin"
+    # Copy it to the user directory.
+    adb -s $device shell "$gdbserver_cat"
+    adb -s $device shell "run-as $package chmod +x gdbserver"
 fi
 
 # Now start gdbserver on the device asynchronously.
@@ -286,10 +290,9 @@ if [ -z "$gdbserver" ]; then
 else
     # Normally the program cannot access $gdbserver_bin when it is
     # placed in /data/local/tmp.
-    adb -s $device shell $gdbserver_bin --once \
-	"+/data/local/tmp/debug.$package.socket" \
-	--attach $pid >&5 &
-    gdb_socket="localfilesystem:/data/local/tmp/debug.$package.socket"
+    adb -s $device shell run-as $package "./gdbserver" --once \
+	"0.0.0.0:7654" --attach $pid >&5 &
+    gdb_socket="tcp:7654"
 fi
 
 # Wait until gdbserver successfully runs.
-- 
cgit v1.2.1


From dd7066901f67233c09f3b0409a57db7686c7ea5b Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Wed, 15 Feb 2023 13:39:47 +0800
Subject: Make debug.sh detect adb running as root

* java/debug.sh: Run gdbserver directly if possible.
---
 java/debug.sh | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 2e95f9738c7..cbef7518984 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -263,6 +263,8 @@ if [ -n "$jdb_command" ]; then
 fi
 
 # See if gdbserver has to be uploaded
+gdbserver_cmd=
+is_root=
 if [ -z "$gdbserver" ]; then
     gdbserver_bin=/system/bin/gdbserver
 else
@@ -272,9 +274,26 @@ else
 
     # Upload the specified gdbserver binary to the device.
     adb -s $device push "$gdbserver" "$gdbserver_bin"
-    # Copy it to the user directory.
-    adb -s $device shell "$gdbserver_cat"
-    adb -s $device shell "run-as $package chmod +x gdbserver"
+
+    if (adb -s $device pull /system/bin/tee /dev/null &> /dev/null); then
+	# Copy it to the user directory.
+	adb -s $device shell "$gdbserver_cat"
+	adb -s $device shell "run-as $package chmod +x gdbserver"
+	gdbserver_cmd="./gdbserver"
+    else
+	# Hopefully this is an old version of Android which allows
+	# execution from /data/local/tmp.  Its `chmod' doesn't support
+	# `+x' either.
+	adb -s $device shell "chmod 777 $gdbserver_bin"
+	gdbserver_cmd="$gdbserver_bin"
+
+	# If the user is root, then there is no need to open any kind
+	# of TCP socket.
+	if (adb -s $device shell id | grep -G root); then
+	    gdbserver=
+	    is_root=yes
+	fi
+    fi
 fi
 
 # Now start gdbserver on the device asynchronously.
@@ -284,13 +303,19 @@ exec 5<> /tmp/file-descriptor-stamp
 rm -f /tmp/file-descriptor-stamp
 
 if [ -z "$gdbserver" ]; then
-    adb -s $device shell run-as $package $gdbserver_bin --once \
-	"+debug.$package.socket" --attach $pid >&5 &
-    gdb_socket="localfilesystem:$app_data_dir/debug.$package.socket"
+    if [ "$is_root" = "yes" ]; then
+	adb -s $device shell $gdbserver_bin --once \
+	    "+/data/local/tmp/debug.$package.socket" --attach $pid >&5 &
+	gdb_socket="localfilesystem:/data/local/tmp/debug.$package.socket"
+    else	
+	adb -s $device shell run-as $package $gdbserver_bin --once \
+	    "+debug.$package.socket" --attach $pid >&5 &
+	gdb_socket="localfilesystem:$app_data_dir/debug.$package.socket"
+    fi
 else
     # Normally the program cannot access $gdbserver_bin when it is
     # placed in /data/local/tmp.
-    adb -s $device shell run-as $package "./gdbserver" --once \
+    adb -s $device shell run-as $package $gdbserver_cmd --once \
 	"0.0.0.0:7654" --attach $pid >&5 &
     gdb_socket="tcp:7654"
 fi
-- 
cgit v1.2.1


From 88afd96e36e62017c9c1f2229e2748b6dfbdb39a Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Fri, 17 Feb 2023 16:27:00 +0800
Subject: Fix build and running on Android 2.2

* INSTALL.android: Document that Android 2.2 is now supported,
with caveats.
* configure.ac (ANDROID_MIN_SDK, ANDROID_SDK_18_OR_EARLIER)
(SYSTEM_TYPE, ANDROID_STUBIFY, SIZEOF_LONG): Correctly detect
things missing on Android 2.2.
* java/Makefile.in (ANDROID_JAR, JARSIGNER_FLAGS):
* java/debug.sh (jdb, gdbserver, line):
* java/org/gnu/emacs/EmacsApplication.java (findDumpFile):
* java/org/gnu/emacs/EmacsService.java (onCreate):
* java/org/gnu/emacs/EmacsThread.java (EmacsThread, run): Run
parameter initialization on main thread.
* src/android-asset.h (struct android_asset_manager)
(struct android_asset, AAssetManager_fromJava, AAssetManager_open)
(AAsset_close, android_asset_create_stream)
(android_asset_read_internal, AAsset_openFileDescriptor)
(AAsset_getLength, AAsset_getBuffer, AAsset_read): New file.
* src/android.c (android_user_full_name, android_hack_asset_fd)
(android_check_compressed_file): Implement for Android 2.2.
* src/process.c (Fprocess_send_eof): Don't call tcdrain if
unavailable.
* src/sfntfont-android.c (system_font_directories): Fix compiler
warning.
* src/sfntfont.c (sfntfont_read_cmap): Correctly test rc of
emacs_open.
* src/textconv.c (handle_pending_conversion_events_1): Mark
buffer UNINIT.
---
 java/debug.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index cbef7518984..30e5a94eee5 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -32,6 +32,7 @@ jdb_port=64013
 jdb=no
 attach_existing=no
 gdbserver=
+gdb=gdb
 
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -51,6 +52,7 @@ while [ $# -gt 0 ]; do
 	    echo "  --port PORT		run the GDB server on a specific port"
 	    echo "  --jdb-port PORT	run the JDB server on a specific port"
 	    echo "  --jdb		run JDB instead of GDB"
+	    echo "  --gdb		use specified GDB binary"
 	    echo "  --attach-existing	attach to an existing process"
 	    echo "  --gdbserver BINARY	upload and use the specified gdbserver binary"
 	    echo "  --help		print this message"
@@ -65,6 +67,10 @@ while [ $# -gt 0 ]; do
 	"--jdb" )
 	    jdb=yes
 	    ;;
+	"--gdb" )
+	    shift
+	    gdb=$1
+	    ;;
 	"--gdbserver" )
 	    shift
 	    gdbserver=$1
@@ -355,4 +361,4 @@ fi
 
 # Finally, start gdb with any extra arguments needed.
 cd "$oldpwd"
-gdb --eval-command "target remote localhost:$gdb_port" $gdbargs
+$gdb --eval-command "target remote localhost:$gdb_port" $gdbargs
-- 
cgit v1.2.1


From 7aa4ffddd842e495d1ae388afff12075317ecb07 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Tue, 21 Feb 2023 15:28:06 +0800
Subject: Update Android port

* doc/emacs/android.texi (Android Startup): Document `content'
special directory.
* java/debug.sh (is_root): Improve /bin/tee detection.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function `dup'.
* java/org/gnu/emacs/EmacsOpenActivity.java (EmacsOpenActivity)
(checkReadableOrCopy, onCreate): Create content directory names
when the file is not readable.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(openContentUri, checkContentUri): New functions.
* src/android.c (struct android_emacs_service): New methods.
(android_content_name_p, android_get_content_name)
(android_check_content_access): New function.
(android_fstatat, android_open): Implement opening content URIs.
(dup): Export to Java.
(android_init_emacs_service): Initialize new methods.
(android_faccessat): Implement content file names.
---
 java/debug.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 30e5a94eee5..f07bb98ed7d 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -281,7 +281,7 @@ else
     # Upload the specified gdbserver binary to the device.
     adb -s $device push "$gdbserver" "$gdbserver_bin"
 
-    if (adb -s $device pull /system/bin/tee /dev/null &> /dev/null); then
+    if adb -s $device shell ls /system/bin/tee; then
 	# Copy it to the user directory.
 	adb -s $device shell "$gdbserver_cat"
 	adb -s $device shell "run-as $package chmod +x gdbserver"
-- 
cgit v1.2.1


From 8fa86cc7cd708fae8657b4e977711132999054bc Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sat, 25 Feb 2023 21:52:11 +0800
Subject: Update Android port

* java/debug.sh (is_root): Fix tee detection again for old
systems which don't return exit codes from adb shell.
* src/android.c (android_run_select_thread, NATIVE_NAME,
JNICALL):
* src/android.h (NATIVE_NAME):
* src/androidterm.c (JNICALL, NATIVE_NAME): Apply stack
alignment to all JNICALL functions.
---
 java/debug.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index f07bb98ed7d..83690e0b536 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -281,7 +281,7 @@ else
     # Upload the specified gdbserver binary to the device.
     adb -s $device push "$gdbserver" "$gdbserver_bin"
 
-    if adb -s $device shell ls /system/bin/tee; then
+    if (adb -s $device shell ls /system/bin | grep -G tee); then
 	# Copy it to the user directory.
 	adb -s $device shell "$gdbserver_cat"
 	adb -s $device shell "run-as $package chmod +x gdbserver"
-- 
cgit v1.2.1


From 682a6542cd7298e5116cd37651f762e084b6a5c0 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Thu, 9 Mar 2023 14:50:32 +0800
Subject: Update Android port

* java/debug.sh (is_root): Port to android versions which don't
support `chmod +x'.
* src/android.c (android_content_name_p): Disable before API
level 19.
---
 java/debug.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 83690e0b536..339b3604810 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -284,7 +284,7 @@ else
     if (adb -s $device shell ls /system/bin | grep -G tee); then
 	# Copy it to the user directory.
 	adb -s $device shell "$gdbserver_cat"
-	adb -s $device shell "run-as $package chmod +x gdbserver"
+	adb -s $device shell "run-as $package chmod 777 gdbserver"
 	gdbserver_cmd="./gdbserver"
     else
 	# Hopefully this is an old version of Android which allows
-- 
cgit v1.2.1


From 57903519eb61632c4a85fbaf420109892955079a Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Wed, 31 May 2023 10:13:04 +0800
Subject: Update Android port

* java/debug.sh (is_root): Go back to using unix sockets; allow
adb to forward them correctly.
* java/org/gnu/emacs/EmacsInputConnection.java
(getExtractedText): Don't print text if NULL.
* java/org/gnu/emacs/EmacsService.java (EmacsService): New field
`imSyncInProgress'.
(updateIC): If an IM sync might be in progress, avoid deadlocks.
* java/org/gnu/emacs/EmacsView.java (onCreateInputConnection):
Set `imSyncInProgress' across synchronization point.
* src/android.c (android_check_query): Use __atomic_store_n.
(android_answer_query): New function.
(android_begin_query): Set `android_servicing_query' to 2.
Check once, and don't spin waiting for query to complete.
(android_end_query): Use __atomic_store_n.
(android_run_in_emacs_thread): Compare-and-exchange flag.  If
originally 1, fail.
* src/textconv.c (really_set_composing_text): Clear conversion
region if text is empty.
---
 java/debug.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 339b3604810..0458003fe72 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -19,6 +19,7 @@
 ## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set -m
+set -x
 oldpwd=`pwd`
 cd `dirname $0`
 
@@ -310,22 +311,26 @@ rm -f /tmp/file-descriptor-stamp
 
 if [ -z "$gdbserver" ]; then
     if [ "$is_root" = "yes" ]; then
-	adb -s $device shell $gdbserver_bin --once \
+	adb -s $device shell $gdbserver_bin --multi \
 	    "+/data/local/tmp/debug.$package.socket" --attach $pid >&5 &
 	gdb_socket="localfilesystem:/data/local/tmp/debug.$package.socket"
-    else	
-	adb -s $device shell run-as $package $gdbserver_bin --once \
+    else
+	adb -s $device shell run-as $package $gdbserver_bin --multi \
 	    "+debug.$package.socket" --attach $pid >&5 &
 	gdb_socket="localfilesystem:$app_data_dir/debug.$package.socket"
     fi
 else
     # Normally the program cannot access $gdbserver_bin when it is
     # placed in /data/local/tmp.
-    adb -s $device shell run-as $package $gdbserver_cmd --once \
-	"0.0.0.0:7654" --attach $pid >&5 &
-    gdb_socket="tcp:7654"
+    adb -s $device shell run-as $package $gdbserver_cmd --multi \
+	"+debug.$package.socket" --attach $pid >&5 &
+    gdb_socket="localfilesystem:$app_data_dir/debug.$package.socket"
 fi
 
+# In order to allow adb to forward to the gdbserver socket, make the
+# app data directory a+x.
+adb -s $device shell run-as $package chmod a+x $app_data_dir
+
 # Wait until gdbserver successfully runs.
 line=
 while read -u 5 line; do
-- 
cgit v1.2.1


From 740af4668c8d9bc8e4ee1e60ebeb366690fee93e Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sun, 4 Jun 2023 12:04:15 +0800
Subject: Fix input method synchronization problems

* java/debug.sh (gdbserver_cmd, is_root): Prefer TCP again.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function `queryAndSpin'.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(icBeginSynchronous, icEndSynchronous, viewGetSelection): New
synchronization functions.
(resetIC, updateCursorAnchorInfo): Call those instead.
* java/org/gnu/emacs/EmacsView.java (onCreateInputConnection):
Call viewGetSelection.
* src/android.c (JNICALL, android_answer_query_spin): New
functions.
---
 java/debug.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'java/debug.sh')

diff --git a/java/debug.sh b/java/debug.sh
index 0458003fe72..d6e439bec90 100755
--- a/java/debug.sh
+++ b/java/debug.sh
@@ -19,7 +19,6 @@
 ## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set -m
-set -x
 oldpwd=`pwd`
 cd `dirname $0`
 
@@ -273,7 +272,7 @@ fi
 gdbserver_cmd=
 is_root=
 if [ -z "$gdbserver" ]; then
-    gdbserver_bin=/system/bin/gdbserver
+    gdbserver_bin=/system/bin/gdbserver64
 else
     gdbserver_bin=/data/local/tmp/gdbserver
     gdbserver_cat="cat $gdbserver_bin | run-as $package sh -c \
@@ -312,12 +311,12 @@ rm -f /tmp/file-descriptor-stamp
 if [ -z "$gdbserver" ]; then
     if [ "$is_root" = "yes" ]; then
 	adb -s $device shell $gdbserver_bin --multi \
-	    "+/data/local/tmp/debug.$package.socket" --attach $pid >&5 &
-	gdb_socket="localfilesystem:/data/local/tmp/debug.$package.socket"
+	    "0.0.0.0:7564" --attach $pid >&5 &
+	gdb_socket="tcp:7564"
     else
-	adb -s $device shell run-as $package $gdbserver_bin --multi \
-	    "+debug.$package.socket" --attach $pid >&5 &
-	gdb_socket="localfilesystem:$app_data_dir/debug.$package.socket"
+	adb -s $device shell $gdbserver_bin --multi \
+	    "0.0.0.0:7564" --attach $pid >&5 &
+	gdb_socket="tcp:7564"
     fi
 else
     # Normally the program cannot access $gdbserver_bin when it is
-- 
cgit v1.2.1