mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

Update Android port

Browse source 
* doc/emacs/android.texi (Android Fonts):
* doc/emacs/input.texi (On-Screen Keyboards):
* doc/lispref/commands.texi (Misc Events): Update documentation.
* java/org/gnu/emacs/EmacsInputConnection.java (setSelection):
New function.
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView)
(reconfigureFrontBuffer): Make bitmap references weak
references.
* java/org/gnu/emacs/EmacsView.java (handleDirtyBitmap): Don't
clear surfaceView bitmap.
* lisp/comint.el (comint-mode):
* lisp/international/fontset.el (script-representative-chars)
(setup-default-fontset): Improve detection of CJK fonts.
* lisp/isearch.el (set-text-conversion-style): New variable.
(isearch-mode, isearch-done): Save and restore the text
conversion style.
* lisp/minibuffer.el (minibuffer-mode): Set an appropriate text
conversion style.
* lisp/simple.el (analyze-text-conversion): Run
post-self-insert-hook properly.
* lisp/subr.el (read-char-from-minibuffer): Disable text
conversion when reading character.
* src/androidterm.c (show_back_buffer): Don't check that F is
not garbaged.
(android_update_selection, android_reset_conversion): Use the
ephemeral last point and handle text conversion being disabled.
* src/buffer.c (syms_of_buffer): Convert old style DEFVAR.
* src/keyboard.c (kbd_buffer_get_event): Handle text conversion
first.
* src/lisp.h: Update prototypes.
* src/lread.c (read_filtered_event): Temporarily disable text
conversion.
* src/sfnt.c (sfnt_decompose_glyph_1, sfnt_decompose_glyph_2):
New functions.
(sfnt_decompose_glyph, sfnt_decompose_instructed_outline):
Refactor contour decomposition to those two functions.
(main): Update tests.
* src/sfntfont-android.c (system_font_directories): Add empty
field.
(Fandroid_enumerate_fonts, init_sfntfont_android): Enumerate
fonts in a user fonts directory.
* src/sfntfont.c (struct sfnt_font_desc): New field
`num_glyphs'.
(sfnt_enum_font_1): Set num_glyphs and avoid duplicate fonts.
(sfntfont_glyph_valid): New function.
(sfntfont_lookup_char, sfntfont_list_1): Make sure glyphs found
are valid.

* src/textconv.c (sync_overlay, really_commit_text)
(really_set_composing_text, really_set_composing_region)
(really_delete_surrounding_text, really_set_point_and_mark)
(handle_pending_conversion_events_1)
(handle_pending_conversion_events, conversion_disabled_p)
(disable_text_conversion, resume_text_conversion)
(Fset_text_conversion_style, syms_of_textconv): Update to
respect new options.
* src/textconv.h:
* src/window.h (GCALIGNED_STRUCT): New field
`ephemeral_last_point'.
* src/xdisp.c (mark_window_display_accurate_1): Set it.
This commit is contained in:
Po Lu 2023-02-16 23:57:01 +08:00
parent cf24b61985
commit 2dcce30290
24 changed files with 803 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

17
java/org/gnu/emacs/EmacsSurfaceView.java
View file

@ -28,6 +28,8 @@ import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.Paint;
import java.lang.ref.WeakReference;
/* This originally extended SurfaceView. However, doing so proved to
be too slow, and Android's surface view keeps up to three of its
own back buffers, which use too much memory (up to 96 MB for a
@ -39,7 +41,7 @@ public class EmacsSurfaceView extends View
private EmacsView view;
private Bitmap frontBuffer;
private Canvas bitmapCanvas;
private Bitmap bitmap;
private WeakReference<Bitmap> bitmap;
private Paint bitmapPaint;
public
@ -49,10 +51,11 @@ public class EmacsSurfaceView extends View
this.view = view;
this.bitmapPaint = new Paint ();
this.bitmap = new WeakReference<Bitmap> (null);
}
private void
copyToFrontBuffer (Rect damageRect)
copyToFrontBuffer (Bitmap bitmap, Rect damageRect)
{
if (damageRect != null)
bitmapCanvas.drawBitmap (bitmap, damageRect, damageRect,
@ -73,7 +76,7 @@ public class EmacsSurfaceView extends View
bitmapCanvas = null;
}
this.bitmap = bitmap;
this.bitmap = new WeakReference<Bitmap> (bitmap);
/* Next, create the new front buffer if necessary. */
@ -92,20 +95,20 @@ public class EmacsSurfaceView extends View
bitmapCanvas = new Canvas (frontBuffer);
/* And copy over the bitmap contents. */
copyToFrontBuffer (null);
copyToFrontBuffer (bitmap, null);
}
else if (bitmap != null)
/* Just copy over the bitmap contents. */
copyToFrontBuffer (null);
copyToFrontBuffer (bitmap, null);
}
public synchronized void
setBitmap (Bitmap bitmap, Rect damageRect)
{
if (bitmap != this.bitmap)
if (bitmap != this.bitmap.get ())
reconfigureFrontBuffer (bitmap);
else if (bitmap != null)
copyToFrontBuffer (damageRect);
copyToFrontBuffer (bitmap, damageRect);
if (bitmap != null)
{