* .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.
330 lines
7.6 KiB
Java
330 lines
7.6 KiB
Java
/* 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.app.AlertDialog;
|
||
import android.content.DialogInterface;
|
||
import android.content.Context;
|
||
import android.util.Log;
|
||
|
||
import android.widget.Button;
|
||
import android.widget.LinearLayout;
|
||
import android.widget.FrameLayout;
|
||
|
||
import android.view.View;
|
||
import android.view.ViewGroup;
|
||
|
||
/* Toolkit dialog implementation. This object is built from JNI and
|
||
describes a single alert dialog. Then, `inflate' turns it into
|
||
AlertDialog. */
|
||
|
||
public class EmacsDialog implements DialogInterface.OnDismissListener
|
||
{
|
||
private static final String TAG = "EmacsDialog";
|
||
|
||
/* List of buttons in this dialog. */
|
||
private List<EmacsButton> buttons;
|
||
|
||
/* Dialog title. */
|
||
private String title;
|
||
|
||
/* Dialog text. */
|
||
private String text;
|
||
|
||
/* Whether or not a selection has already been made. */
|
||
private boolean wasButtonClicked;
|
||
|
||
/* Dialog to dismiss after click. */
|
||
private AlertDialog dismissDialog;
|
||
|
||
private class EmacsButton implements View.OnClickListener,
|
||
DialogInterface.OnClickListener
|
||
{
|
||
/* Name of this button. */
|
||
public String name;
|
||
|
||
/* ID of this button. */
|
||
public int id;
|
||
|
||
/* Whether or not the button is enabled. */
|
||
public boolean enabled;
|
||
|
||
@Override
|
||
public void
|
||
onClick (View view)
|
||
{
|
||
Log.d (TAG, "onClicked " + this);
|
||
|
||
wasButtonClicked = true;
|
||
EmacsNative.sendContextMenu ((short) 0, id);
|
||
dismissDialog.dismiss ();
|
||
}
|
||
|
||
@Override
|
||
public void
|
||
onClick (DialogInterface dialog, int which)
|
||
{
|
||
Log.d (TAG, "onClicked " + this);
|
||
|
||
wasButtonClicked = true;
|
||
EmacsNative.sendContextMenu ((short) 0, id);
|
||
}
|
||
};
|
||
|
||
/* Create a popup dialog with the title TITLE and the text TEXT.
|
||
TITLE may be NULL. */
|
||
|
||
public static EmacsDialog
|
||
createDialog (String title, String text)
|
||
{
|
||
EmacsDialog dialog;
|
||
|
||
dialog = new EmacsDialog ();
|
||
dialog.buttons = new ArrayList<EmacsButton> ();
|
||
dialog.title = title;
|
||
dialog.text = text;
|
||
|
||
return dialog;
|
||
}
|
||
|
||
/* Add a button named NAME, with the identifier ID. If DISABLE,
|
||
disable the button. */
|
||
|
||
public void
|
||
addButton (String name, int id, boolean disable)
|
||
{
|
||
EmacsButton button;
|
||
|
||
button = new EmacsButton ();
|
||
button.name = name;
|
||
button.id = id;
|
||
button.enabled = !disable;
|
||
buttons.add (button);
|
||
}
|
||
|
||
/* Turn this dialog into an AlertDialog for the specified
|
||
CONTEXT.
|
||
|
||
Upon a button being selected, the dialog will send an
|
||
ANDROID_CONTEXT_MENU event with the id of that button.
|
||
|
||
Upon the dialog being dismissed, an ANDROID_CONTEXT_MENU event
|
||
will be sent with an id of 0. */
|
||
|
||
public AlertDialog
|
||
toAlertDialog (Context context)
|
||
{
|
||
AlertDialog dialog;
|
||
int size;
|
||
EmacsButton button;
|
||
LinearLayout layout;
|
||
Button buttonView;
|
||
ViewGroup.LayoutParams layoutParams;
|
||
|
||
size = buttons.size ();
|
||
|
||
if (size <= 3)
|
||
{
|
||
dialog = new AlertDialog.Builder (context).create ();
|
||
dialog.setMessage (text);
|
||
dialog.setCancelable (true);
|
||
dialog.setOnDismissListener (this);
|
||
|
||
if (title != null)
|
||
dialog.setTitle (title);
|
||
|
||
/* There are less than 4 buttons. Add the buttons the way
|
||
Android intends them to be added. */
|
||
|
||
if (size >= 1)
|
||
{
|
||
button = buttons.get (0);
|
||
dialog.setButton (DialogInterface.BUTTON_POSITIVE,
|
||
button.name, button);
|
||
}
|
||
|
||
if (size >= 2)
|
||
{
|
||
button = buttons.get (1);
|
||
dialog.setButton (DialogInterface.BUTTON_NEUTRAL,
|
||
button.name, button);
|
||
}
|
||
|
||
if (size >= 3)
|
||
{
|
||
button = buttons.get (2);
|
||
dialog.setButton (DialogInterface.BUTTON_NEGATIVE,
|
||
button.name, button);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
/* There are more than 4 buttons. Add them all to a
|
||
LinearLayout. */
|
||
layout = new LinearLayout (context);
|
||
layoutParams
|
||
= new LinearLayout.LayoutParams (ViewGroup.LayoutParams.WRAP_CONTENT,
|
||
ViewGroup.LayoutParams.WRAP_CONTENT);
|
||
|
||
for (EmacsButton emacsButton : buttons)
|
||
{
|
||
buttonView = new Button (context);
|
||
buttonView.setText (emacsButton.name);
|
||
buttonView.setOnClickListener (emacsButton);
|
||
buttonView.setLayoutParams (layoutParams);
|
||
buttonView.setEnabled (emacsButton.enabled);
|
||
layout.addView (buttonView);
|
||
}
|
||
|
||
layoutParams
|
||
= new FrameLayout.LayoutParams (ViewGroup.LayoutParams.MATCH_PARENT,
|
||
ViewGroup.LayoutParams.WRAP_CONTENT);
|
||
layout.setLayoutParams (layoutParams);
|
||
|
||
/* Add that layout to the dialog's custom view.
|
||
|
||
android.R.id.custom is documented to work. But looking it
|
||
up returns NULL, so setView must be used instead. */
|
||
|
||
dialog = new AlertDialog.Builder (context).setView (layout).create ();
|
||
dialog.setMessage (text);
|
||
dialog.setCancelable (true);
|
||
dialog.setOnDismissListener (this);
|
||
|
||
if (title != null)
|
||
dialog.setTitle (title);
|
||
}
|
||
|
||
return dialog;
|
||
}
|
||
|
||
/* Internal helper for display run on the main thread. */
|
||
|
||
private boolean
|
||
display1 ()
|
||
{
|
||
EmacsActivity activity;
|
||
int size;
|
||
Button buttonView;
|
||
EmacsButton button;
|
||
AlertDialog dialog;
|
||
|
||
if (EmacsActivity.focusedActivities.isEmpty ())
|
||
return false;
|
||
|
||
activity = EmacsActivity.focusedActivities.get (0);
|
||
dialog = dismissDialog = toAlertDialog (activity);
|
||
dismissDialog.show ();
|
||
|
||
/* If there are less than four buttons, then they must be
|
||
individually enabled or disabled after the dialog is
|
||
displayed. */
|
||
size = buttons.size ();
|
||
|
||
if (size <= 3)
|
||
{
|
||
if (size >= 1)
|
||
{
|
||
button = buttons.get (0);
|
||
buttonView
|
||
= dialog.getButton (DialogInterface.BUTTON_POSITIVE);
|
||
buttonView.setEnabled (button.enabled);
|
||
}
|
||
|
||
if (size >= 2)
|
||
{
|
||
button = buttons.get (1);
|
||
dialog.setButton (DialogInterface.BUTTON_NEUTRAL,
|
||
button.name, button);
|
||
buttonView
|
||
= dialog.getButton (DialogInterface.BUTTON_NEUTRAL);
|
||
buttonView.setEnabled (button.enabled);
|
||
}
|
||
|
||
if (size >= 3)
|
||
{
|
||
button = buttons.get (2);
|
||
buttonView
|
||
= dialog.getButton (DialogInterface.BUTTON_NEGATIVE);
|
||
buttonView.setEnabled (button.enabled);
|
||
}
|
||
}
|
||
|
||
return true;
|
||
}
|
||
|
||
/* Display this dialog for a suitable activity.
|
||
Value is false if the dialog could not be displayed,
|
||
and true otherwise. */
|
||
|
||
public boolean
|
||
display ()
|
||
{
|
||
Runnable runnable;
|
||
final Holder<Boolean> rc;
|
||
|
||
rc = new Holder<Boolean> ();
|
||
runnable = new Runnable () {
|
||
@Override
|
||
public void
|
||
run ()
|
||
{
|
||
synchronized (this)
|
||
{
|
||
rc.thing = display1 ();
|
||
notify ();
|
||
}
|
||
}
|
||
};
|
||
|
||
synchronized (runnable)
|
||
{
|
||
EmacsService.SERVICE.runOnUiThread (runnable);
|
||
|
||
try
|
||
{
|
||
runnable.wait ();
|
||
}
|
||
catch (InterruptedException e)
|
||
{
|
||
EmacsNative.emacsAbort ();
|
||
}
|
||
}
|
||
|
||
return rc.thing;
|
||
}
|
||
|
||
|
||
|
||
@Override
|
||
public void
|
||
onDismiss (DialogInterface dialog)
|
||
{
|
||
Log.d (TAG, "onDismiss: " + this);
|
||
|
||
if (wasButtonClicked)
|
||
return;
|
||
|
||
EmacsNative.sendContextMenu ((short) 0, 0);
|
||
}
|
||
};
|