mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-18 02:47:36 +00:00
* Makefile.in (java): Depend on info. (MAKEFILE_NAME): (config.status): Remove unneeded changes. * configure.ac (BUILD_DETAILS, ANDROID_STUBIFY): Don't require a C++ compiler on Android. * java/AndroidManifest.xml: <EmacsActivity>: Set launchMode appropriately. <EmacsMultitaskActivity>: New activity. * java/Makefile.in (CROSS_BINS): Add EmacsClient. * java/org/gnu/emacs/EmacsActivity.java (EmacsActivity) (onCreate): Use the window attachment manager. * java/org/gnu/emacs/EmacsCopyArea.java (EmacsCopyArea) (paintTo): Implement clip masks correctly. * java/org/gnu/emacs/EmacsDrawRectangle.java (getRect, paintTo): Fix damage tracking rectangles. * java/org/gnu/emacs/EmacsFontDriver.java (FontSpec, toString): New function. (FontMetrics, EmacsFontDriver): Fix signature of textExtents. * java/org/gnu/emacs/EmacsMultitaskActivity.java (EmacsMultitaskActivity): New file. * java/org/gnu/emacs/EmacsNative.java (EmacsNative): New functions sendFocusIn, sendFocusOut, sendWindowAction. * java/org/gnu/emacs/EmacsPaintQueue.java (run): Fix clipping handling. * java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap): Add constructor for mutable pixmaps. * java/org/gnu/emacs/EmacsSdk23FontDriver.java (EmacsSdk23FontDriver): New file. * java/org/gnu/emacs/EmacsSdk7FontDriver.java (EmacsSdk7FontDriver, Sdk7Typeface, Sdk7FontEntity, Sdk7FontObject) (checkMatch, hasChar, encodeChar): Implement text display and fix font metrics semantics. * java/org/gnu/emacs/EmacsService.java (EmacsService): Remove availableChildren. (getLibraryDirectory, onCreate): Pass pixel density to Emacs. (clearArea): Fix arguments. Switch to using the window attachment manager. * java/org/gnu/emacs/EmacsSurfaceView.java (surfaceChanged) (surfaceCreated): Flip buffers on surface attachment. * java/org/gnu/emacs/EmacsView.java (EmacsView, swapBuffers): New argument FORCE. Always swap if it is true. (onKeyMultiple, onFocusChanged): New functions. * java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, destroyHandle) (run): Switch to using the window attachment manager. * java/org/gnu/emacs/EmacsWindowAttachmentManager.java (EmacsWindowAttachmentManager): New file. * lisp/cus-edit.el (custom-button, custom-button-mouse) (custom-button-pressed): * lisp/faces.el (tool-bar): Define faces correctly on Android. * src/android.c (struct android_emacs_pixmap): Add mutable constructor. (struct android_emacs_drawable): New structure. (android_write_event): Check if event queue hasn't yet been initialized. (android_select): Set errno to EINTR if pselect fails. (android_close): Remove unused debugging code. (android_get_home_directory): New function. (Java_org_gnu_emacs_EmacsNative_setEmacsParams): Set pixel density and compute game path. (android_init_emacs_drawable): New function. (Java_org_gnu_emacs_EmacsNative_sendKeyPress): New argument `unicode_char'. Pass it in events. (Java_org_gnu_emacs_EmacsNative_sendKeyRelease): Likewise. (Java_org_gnu_emacs_EmacsNative_sendFocusIn) (Java_org_gnu_emacs_EmacsNative_sendFocusOut) (Java_org_gnu_emacs_EmacsNative_sendWindowAction): New functions. (android_resolve_handle): Export function. (android_change_gc): Clear clip rects under the right circumstances. Set right clip mask field. (android_create_pixmap_from_bitmap_data): Use correct alpha channels. (android_create_pixmap): Create mutable pixmap and avoid redundant color array allocation. (android_create_bitmap_from_data, android_create_image) (android_destroy_image, android_put_pixel, android_get_pixel) (android_get_image, android_put_image, faccessat): New functions. * src/android.h: Update prototypes. * src/androidfns.c (android_default_font_parameter): Prefer monospace to Droid Sans Mono. * src/androidfont.c (struct android_emacs_font_driver): New method `draw'. (struct android_emacs_font_spec): New field `dpi'. (struct androidfont_info): Add font metrics cache. (android_init_font_driver, android_init_font_spec): Adjust accordingly. (androidfont_from_lisp, androidfont_from_java): Handle new fields. (androidfont_draw): Implement function. (androidfont_open_font): Set pixel size correctly. (androidfont_close_font): Free metrics cache. (androidfont_cache_text_extents) (androidfont_check_cached_extents): New functions. (androidfont_text_extents): Cache glyph metrics somewhere for future use. (androidfont_list_family): Implement function. * src/androidgui.h (enum android_event_type): New focus and window action events. (enum android_modifier_mask): New masks. (struct android_key_event): New field `unicode_char'. (ANDROID_IS_MODIFIER_KEY): Newmacro. (struct android_focus_event, struct android_window_action_event): New structs. (union android_event): Add new fields. (enum android_image_format, struct android_image): New enums and structs. * src/androidterm.c (android_android_to_emacs_modifiers) (android_emacs_to_android_modifiers, android_lower_frame) (android_raise_frame, android_new_focus_frame) (android_focus_changed, android_detect_focus_change): New functions. (handle_one_android_event): Implement focus and key event handling. (android_frame_rehighlight): New function. (android_frame_raise_lower): Implement accordingly. (android_make_frame_invisible): Clear highlight_frame if required. (android_free_frame_resources): Clear x_focus_event_frame if required. (android_draw_fringe_bitmap, android_draw_image_foreground) (android_draw_image_foreground_1) (android_draw_image_glyph_string): Remove unnecessary code. (android_create_terminal, android_term_init): Set the baud rate to something sensible. * src/androidterm.h (struct android_bitmap_record): Make structure the same as on X. (struct android_display_info): New focus tracking fields. (struct android_output): Likewise. * src/dispextern.h (struct image): Add ximg and mask_img on Android. * src/emacs.c (android_emacs_init): Fix argc sorting iteration. * src/fileio.c (user_homedir): (get_homedir): Implement correctly on Android. * src/font.h (PT_PER_INCH): Define correctly on Android. * src/fringe.c (X, swap_nibble, init_fringe_bitmap): Swap fringe bitmaps correctly on Android. * src/image.c (GET_PIXEL, image_create_bitmap_from_data) (image_create_bitmap_from_file, free_bitmap_record) (image_unget_x_image_or_dc, struct image_type) (prepare_image_for_display, image_clear_image_1) (image_size_in_bytes, x_check_image_size) (x_create_x_image_and_pixmap, x_destroy_x_image) (image_check_image_size, image_create_x_image_and_pixmap_1) (image_destroy_x_image, gui_put_x_image, image_put_x_image) (image_get_x_image, image_unget_x_image) (Create_Pixmap_From_Bitmap_Data, image_pixmap_draw_cross) (MaskForeground, image_types, syms_of_image): Implement all of the above on Android in terms of an API very similar to X. * src/keyboard.c (FUNCTION_KEY_OFFSET, lispy_function_keys): Define on Android to something sensible. * src/lread.c (build_load_history): Fix problem.
353 lines
7.6 KiB
Java
353 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.lang.Runnable;
|
||
import java.io.IOException;
|
||
import java.util.List;
|
||
import java.util.ArrayList;
|
||
|
||
import android.graphics.Canvas;
|
||
import android.graphics.Bitmap;
|
||
import android.graphics.Point;
|
||
|
||
import android.view.View;
|
||
|
||
import android.annotation.TargetApi;
|
||
import android.app.Service;
|
||
import android.content.Context;
|
||
import android.content.Intent;
|
||
import android.content.res.AssetManager;
|
||
import android.os.Build;
|
||
import android.os.Looper;
|
||
import android.os.IBinder;
|
||
import android.os.Handler;
|
||
|
||
import android.util.Log;
|
||
import android.util.DisplayMetrics;
|
||
|
||
class Holder<T>
|
||
{
|
||
T thing;
|
||
};
|
||
|
||
/* EmacsService is the service that starts the thread running Emacs
|
||
and handles requests by that Emacs instance. */
|
||
|
||
public class EmacsService extends Service
|
||
{
|
||
public static final String TAG = "EmacsService";
|
||
public static final int MAX_PENDING_REQUESTS = 256;
|
||
public static volatile EmacsService SERVICE;
|
||
|
||
private EmacsThread thread;
|
||
private Handler handler;
|
||
private EmacsPaintQueue paintQueue;
|
||
|
||
/* Display metrics used by font backends. */
|
||
public DisplayMetrics metrics;
|
||
|
||
@Override
|
||
public int
|
||
onStartCommand (Intent intent, int flags, int startId)
|
||
{
|
||
return START_NOT_STICKY;
|
||
}
|
||
|
||
@Override
|
||
public IBinder
|
||
onBind (Intent intent)
|
||
{
|
||
return null;
|
||
}
|
||
|
||
@TargetApi (Build.VERSION_CODES.GINGERBREAD)
|
||
String
|
||
getLibraryDirectory ()
|
||
{
|
||
int apiLevel;
|
||
Context context;
|
||
|
||
context = getApplicationContext ();
|
||
apiLevel = Build.VERSION.SDK_INT;
|
||
|
||
if (apiLevel >= Build.VERSION_CODES.GINGERBREAD)
|
||
return context.getApplicationInfo().nativeLibraryDir;
|
||
else if (apiLevel >= Build.VERSION_CODES.DONUT)
|
||
return context.getApplicationInfo().dataDir + "/lib";
|
||
|
||
return "/data/data/" + context.getPackageName() + "/lib";
|
||
}
|
||
|
||
@Override
|
||
public void
|
||
onCreate ()
|
||
{
|
||
AssetManager manager;
|
||
Context app_context;
|
||
String filesDir, libDir;
|
||
double pixelDensityX;
|
||
double pixelDensityY;
|
||
|
||
SERVICE = this;
|
||
handler = new Handler (Looper.getMainLooper ());
|
||
manager = getAssets ();
|
||
app_context = getApplicationContext ();
|
||
metrics = getResources ().getDisplayMetrics ();
|
||
pixelDensityX = metrics.xdpi;
|
||
pixelDensityY = metrics.ydpi;
|
||
|
||
try
|
||
{
|
||
/* Configure Emacs with the asset manager and other necessary
|
||
parameters. */
|
||
filesDir = app_context.getFilesDir ().getCanonicalPath ();
|
||
libDir = getLibraryDirectory ();
|
||
|
||
Log.d (TAG, "Initializing Emacs, where filesDir = " + filesDir
|
||
+ " and libDir = " + libDir);
|
||
|
||
EmacsNative.setEmacsParams (manager, filesDir, libDir,
|
||
(float) pixelDensityX,
|
||
(float) pixelDensityY,
|
||
this);
|
||
|
||
/* Start the thread that runs Emacs. */
|
||
thread = new EmacsThread (this);
|
||
thread.start ();
|
||
}
|
||
catch (IOException exception)
|
||
{
|
||
EmacsNative.emacsAbort ();
|
||
return;
|
||
}
|
||
}
|
||
|
||
|
||
|
||
/* Functions from here on must only be called from the Emacs
|
||
thread. */
|
||
|
||
void
|
||
runOnUiThread (Runnable runnable)
|
||
{
|
||
handler.post (runnable);
|
||
}
|
||
|
||
EmacsView
|
||
getEmacsView (final EmacsWindow window, final int visibility,
|
||
final boolean isFocusedByDefault)
|
||
{
|
||
Runnable runnable;
|
||
final Holder<EmacsView> view;
|
||
|
||
view = new Holder<EmacsView> ();
|
||
|
||
runnable = new Runnable () {
|
||
public void
|
||
run ()
|
||
{
|
||
synchronized (this)
|
||
{
|
||
view.thing = new EmacsView (window);
|
||
view.thing.setVisibility (visibility);
|
||
view.thing.setFocusedByDefault (isFocusedByDefault);
|
||
notify ();
|
||
}
|
||
}
|
||
};
|
||
|
||
synchronized (runnable)
|
||
{
|
||
runOnUiThread (runnable);
|
||
|
||
try
|
||
{
|
||
runnable.wait ();
|
||
}
|
||
catch (InterruptedException e)
|
||
{
|
||
EmacsNative.emacsAbort ();
|
||
}
|
||
}
|
||
|
||
return view.thing;
|
||
}
|
||
|
||
/* X drawing operations. These are quite primitive operations. The
|
||
drawing queue is kept on the Emacs thread, but is periodically
|
||
flushed to the application thread, upon buffers swaps and once it
|
||
gets too big. */
|
||
|
||
|
||
|
||
private void
|
||
ensurePaintQueue ()
|
||
{
|
||
if (paintQueue == null)
|
||
paintQueue = new EmacsPaintQueue ();
|
||
}
|
||
|
||
public void
|
||
flushPaintQueue ()
|
||
{
|
||
final EmacsPaintQueue queue;
|
||
|
||
if (paintQueue == null)
|
||
return;
|
||
|
||
if (paintQueue.numRequests < 1)
|
||
/* No requests to flush. */
|
||
return;
|
||
|
||
queue = paintQueue;
|
||
|
||
handler.post (new Runnable () {
|
||
@Override
|
||
public void
|
||
run ()
|
||
{
|
||
queue.run ();
|
||
}
|
||
});
|
||
|
||
/* Clear the paint queue. */
|
||
paintQueue = null;
|
||
}
|
||
|
||
private void
|
||
checkFlush ()
|
||
{
|
||
if (paintQueue != null
|
||
&& paintQueue.numRequests > MAX_PENDING_REQUESTS)
|
||
flushPaintQueue ();
|
||
}
|
||
|
||
public void
|
||
fillRectangle (EmacsDrawable drawable, EmacsGC gc,
|
||
int x, int y, int width, int height)
|
||
{
|
||
EmacsPaintReq req;
|
||
|
||
ensurePaintQueue ();
|
||
|
||
req = new EmacsFillRectangle (drawable, x, y,
|
||
width, height,
|
||
gc.immutableGC ());
|
||
paintQueue.appendPaintOperation (req);
|
||
checkFlush ();
|
||
}
|
||
|
||
public void
|
||
fillPolygon (EmacsDrawable drawable, EmacsGC gc,
|
||
Point points[])
|
||
{
|
||
EmacsPaintReq req;
|
||
|
||
ensurePaintQueue ();
|
||
|
||
req = new EmacsFillPolygon (drawable, points,
|
||
gc.immutableGC ());
|
||
paintQueue.appendPaintOperation (req);
|
||
checkFlush ();
|
||
}
|
||
|
||
public void
|
||
drawRectangle (EmacsDrawable drawable, EmacsGC gc,
|
||
int x, int y, int width, int height)
|
||
{
|
||
EmacsPaintReq req;
|
||
|
||
ensurePaintQueue ();
|
||
|
||
req = new EmacsDrawRectangle (drawable, x, y,
|
||
width, height,
|
||
gc.immutableGC ());
|
||
paintQueue.appendPaintOperation (req);
|
||
checkFlush ();
|
||
}
|
||
|
||
public void
|
||
drawLine (EmacsDrawable drawable, EmacsGC gc,
|
||
int x, int y, int x2, int y2)
|
||
{
|
||
EmacsPaintReq req;
|
||
|
||
ensurePaintQueue ();
|
||
|
||
req = new EmacsDrawLine (drawable, x, y,
|
||
x2, y2,
|
||
gc.immutableGC ());
|
||
paintQueue.appendPaintOperation (req);
|
||
checkFlush ();
|
||
}
|
||
|
||
public void
|
||
drawPoint (EmacsDrawable drawable, EmacsGC gc,
|
||
int x, int y)
|
||
{
|
||
EmacsPaintReq req;
|
||
|
||
ensurePaintQueue ();
|
||
|
||
req = new EmacsDrawPoint (drawable, x, y,
|
||
gc.immutableGC ());
|
||
paintQueue.appendPaintOperation (req);
|
||
checkFlush ();
|
||
}
|
||
|
||
public void
|
||
copyArea (EmacsDrawable srcDrawable, EmacsDrawable dstDrawable,
|
||
EmacsGC gc,
|
||
int srcX, int srcY, int width, int height, int destX,
|
||
int destY)
|
||
{
|
||
EmacsPaintReq req;
|
||
|
||
ensurePaintQueue ();
|
||
|
||
req = new EmacsCopyArea (srcDrawable, dstDrawable,
|
||
srcX, srcY, width, height, destX,
|
||
destY, gc.immutableGC ());
|
||
paintQueue.appendPaintOperation (req);
|
||
checkFlush ();
|
||
}
|
||
|
||
public void
|
||
clearWindow (EmacsWindow window)
|
||
{
|
||
window.clearWindow ();
|
||
}
|
||
|
||
public void
|
||
clearArea (EmacsWindow window, int x, int y, int width,
|
||
int height)
|
||
{
|
||
window.clearArea (x, y, width, height);
|
||
}
|
||
|
||
public void
|
||
appendPaintOperation (EmacsPaintReq op)
|
||
{
|
||
ensurePaintQueue ();
|
||
paintQueue.appendPaintOperation (op);
|
||
checkFlush ();
|
||
}
|
||
};
|