* .gitignore: Don't ignore verbose.mk.android. * doc/emacs/Makefile.in (EMACSSOURCES): Add android.texi and input.texi. * doc/emacs/android.texi (Android): Document support for the on-screen keyboard. (Android Startup): Document how to start Emacs with -Q on Android. (Android Environment): Document how Emacs works around the system ``task killer''. Document changes to frame deletion behavior. * doc/emacs/emacs.texi (Top): * doc/emacs/input.texi (Other Input Devices, On-Screen Keyboards): Document how to use Emacs with virtual keyboards. * doc/lispref/commands.texi (Touchscreen Events): Document changes to `touch-screen-track-drag'. * doc/lispref/frames.texi (Frames, On-Screen Keyboards): New node. * java/AndroidManifest.xml.in: Add settings activity and appropriate OSK adjustment mode. * java/org/gnu/emacs/EmacsActivity.java (onCreate): Allow creating Emacs with -Q. (onDestroy): Don't remove if killed by the system. * java/org/gnu/emacs/EmacsContextMenu.java (inflateMenuItems): Fix context menus again. * java/org/gnu/emacs/EmacsNative.java (EmacsNative): Make all event sending functions return long. * java/org/gnu/emacs/EmacsPreferencesActivity.java (EmacsPreferencesActivity): New class. * java/org/gnu/emacs/EmacsService.java (EmacsService) (onStartCommand, onCreate, startEmacsService): Start as a foreground service if necessary to bypass system restrictions. * java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView): * java/org/gnu/emacs/EmacsThread.java (EmacsThread, run): * java/org/gnu/emacs/EmacsView.java (EmacsView, onLayout) (onDetachedFromWindow): * java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, viewLayout): Implement frame resize synchronization.. * java/org/gnu/emacs/EmacsWindowAttachmentManager.java (EmacsWindowAttachmentManager, removeWindowConsumer): Adjust accordingly for changes to frame deletion behavior. * lisp/frame.el (android-toggle-on-screen-keyboard) (frame-toggle-on-screen-keyboard): New function. * lisp/minibuffer.el (minibuffer-setup-on-screen-keyboard) (minibuffer-exit-on-screen-keyboard): New functions. (minibuffer-setup-hook, minibuffer-exit-hook): Add new functions to hooks. * lisp/touch-screen.el (touch-screen-relative-xy): Accept new value of window `frame'. Return frame coordinates in that case. (touch-screen-set-point-commands): New variable. (touch-screen-handle-point-up): Respect that variable. (touch-screen-track-drag): Return `no-drag' where appropriate. (touch-screen-drag-mode-line-1, touch-screen-drag-mode-line): Refactor to use `no-drag'. * src/android.c (struct android_emacs_window): New methods. Make all event sending functions return the event serial. (android_toggle_on_screen_keyboard, android_window_updated): New functions. * src/android.h: Update prototypes. * src/androidfns.c (Fandroid_toggle_on_screen_keyboard) (syms_of_androidfns): New function. * src/androidgui.h (struct android_any_event) (struct android_key_event, struct android_configure_event) (struct android_focus_event, struct android_window_action_event) (struct android_crossing_event, struct android_motion_event) (struct android_button_event, struct android_touch_event) (struct android_wheel_event, struct android_iconify_event) (struct android_menu_event): Add `serial' fields. * src/androidterm.c (handle_one_android_event) (android_frame_up_to_date): * src/androidterm.h (struct android_output): Implement frame resize synchronization.
213 lines
5.4 KiB
Java
213 lines
5.4 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.ArrayList;
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
|
|
import android.content.Intent;
|
|
import android.util.Log;
|
|
|
|
/* Code to paper over the differences in lifecycles between
|
|
"activities" and windows. There are four interfaces to an instance
|
|
of this class:
|
|
|
|
registerWindowConsumer (WindowConsumer)
|
|
registerWindow (EmacsWindow)
|
|
removeWindowConsumer (WindowConsumer)
|
|
removeWindow (EmacsWindow)
|
|
|
|
A WindowConsumer is expected to allow an EmacsWindow to be attached
|
|
to it, and be created or destroyed.
|
|
|
|
Every time a window is created, registerWindow checks the list of
|
|
window consumers. If a consumer exists and does not currently have
|
|
a window of its own attached, it gets the new window. Otherwise,
|
|
the window attachment manager starts a new consumer.
|
|
|
|
Every time a consumer is registered, registerWindowConsumer checks
|
|
the list of available windows. If a window exists and is not
|
|
currently attached to a consumer, then the consumer gets it.
|
|
|
|
Finally, every time a window is removed, the consumer is
|
|
destroyed. */
|
|
|
|
public class EmacsWindowAttachmentManager
|
|
{
|
|
public static EmacsWindowAttachmentManager MANAGER;
|
|
private final static String TAG = "EmacsWindowAttachmentManager";
|
|
|
|
static
|
|
{
|
|
MANAGER = new EmacsWindowAttachmentManager ();
|
|
};
|
|
|
|
public interface WindowConsumer
|
|
{
|
|
public void attachWindow (EmacsWindow window);
|
|
public EmacsWindow getAttachedWindow ();
|
|
public void detachWindow ();
|
|
public void destroy ();
|
|
};
|
|
|
|
private List<WindowConsumer> consumers;
|
|
public List<EmacsWindow> windows;
|
|
|
|
public
|
|
EmacsWindowAttachmentManager ()
|
|
{
|
|
consumers = new LinkedList<WindowConsumer> ();
|
|
windows = new LinkedList<EmacsWindow> ();
|
|
}
|
|
|
|
public void
|
|
registerWindowConsumer (WindowConsumer consumer)
|
|
{
|
|
Log.d (TAG, "registerWindowConsumer " + consumer);
|
|
|
|
consumers.add (consumer);
|
|
|
|
for (EmacsWindow window : windows)
|
|
{
|
|
if (window.getAttachedConsumer () == null)
|
|
{
|
|
Log.d (TAG, "registerWindowConsumer: attaching " + window);
|
|
consumer.attachWindow (window);
|
|
return;
|
|
}
|
|
}
|
|
|
|
Log.d (TAG, "registerWindowConsumer: sendWindowAction 0, 0");
|
|
EmacsNative.sendWindowAction ((short) 0, 0);
|
|
}
|
|
|
|
public synchronized void
|
|
registerWindow (EmacsWindow window)
|
|
{
|
|
Intent intent;
|
|
|
|
Log.d (TAG, "registerWindow (maybe): " + window);
|
|
|
|
if (windows.contains (window))
|
|
/* The window is already registered. */
|
|
return;
|
|
|
|
Log.d (TAG, "registerWindow: " + window);
|
|
|
|
windows.add (window);
|
|
|
|
for (WindowConsumer consumer : consumers)
|
|
{
|
|
if (consumer.getAttachedWindow () == null)
|
|
{
|
|
Log.d (TAG, "registerWindow: attaching " + consumer);
|
|
consumer.attachWindow (window);
|
|
return;
|
|
}
|
|
}
|
|
|
|
intent = new Intent (EmacsService.SERVICE,
|
|
EmacsMultitaskActivity.class);
|
|
intent.addFlags (Intent.FLAG_ACTIVITY_NEW_DOCUMENT
|
|
| Intent.FLAG_ACTIVITY_NEW_TASK
|
|
| Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
|
|
EmacsService.SERVICE.startActivity (intent);
|
|
Log.d (TAG, "registerWindow: startActivity");
|
|
}
|
|
|
|
public void
|
|
removeWindowConsumer (WindowConsumer consumer, boolean isFinishing)
|
|
{
|
|
EmacsWindow window;
|
|
|
|
Log.d (TAG, "removeWindowConsumer " + consumer);
|
|
|
|
window = consumer.getAttachedWindow ();
|
|
|
|
if (window != null)
|
|
{
|
|
Log.d (TAG, "removeWindowConsumer: detaching " + window);
|
|
|
|
consumer.detachWindow ();
|
|
window.onActivityDetached (isFinishing);
|
|
}
|
|
|
|
Log.d (TAG, "removeWindowConsumer: removing " + consumer);
|
|
consumers.remove (consumer);
|
|
}
|
|
|
|
public synchronized void
|
|
detachWindow (EmacsWindow window)
|
|
{
|
|
WindowConsumer consumer;
|
|
|
|
Log.d (TAG, "detachWindow " + window);
|
|
|
|
if (window.getAttachedConsumer () != null)
|
|
{
|
|
consumer = window.getAttachedConsumer ();
|
|
|
|
Log.d (TAG, "detachWindow: removing" + consumer);
|
|
|
|
consumers.remove (consumer);
|
|
consumer.destroy ();
|
|
}
|
|
|
|
windows.remove (window);
|
|
}
|
|
|
|
public void
|
|
noticeIconified (WindowConsumer consumer)
|
|
{
|
|
EmacsWindow window;
|
|
|
|
Log.d (TAG, "noticeIconified " + consumer);
|
|
|
|
/* If a window is attached, send the appropriate iconification
|
|
events. */
|
|
window = consumer.getAttachedWindow ();
|
|
|
|
if (window != null)
|
|
window.noticeIconified ();
|
|
}
|
|
|
|
public void
|
|
noticeDeiconified (WindowConsumer consumer)
|
|
{
|
|
EmacsWindow window;
|
|
|
|
Log.d (TAG, "noticeDeiconified " + consumer);
|
|
|
|
/* If a window is attached, send the appropriate iconification
|
|
events. */
|
|
window = consumer.getAttachedWindow ();
|
|
|
|
if (window != null)
|
|
window.noticeDeiconified ();
|
|
}
|
|
|
|
public synchronized List<EmacsWindow>
|
|
copyWindows ()
|
|
{
|
|
return new ArrayList<EmacsWindow> (windows);
|
|
}
|
|
};
|