mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
a32963e11f
* 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.
152 lines
4.8 KiB
Makefile
152 lines
4.8 KiB
Makefile
### @configure_input@
|
|
|
|
# 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/>.
|
|
|
|
top_builddir = @top_builddir@
|
|
|
|
-include ${top_builddir}/src/verbose.mk
|
|
|
|
SHELL = @SHELL@
|
|
JAVAC = @JAVAC@
|
|
AAPT = @AAPT@
|
|
DX = @DX@
|
|
ZIPALIGN = @ZIPALIGN@
|
|
JARSIGNER = @JARSIGNER@
|
|
ANDROID_JAR = @ANDROID_JAR@
|
|
ANDROID_ABI = @ANDROID_ABI@
|
|
|
|
WARN_JAVAFLAGS = -Xlint:deprecation
|
|
JAVAFLAGS = -classpath "$(ANDROID_JAR):." -target 1.7 -source 1.7 \
|
|
$(WARN_JAVAFLAGS)
|
|
|
|
SIGN_EMACS = -keystore emacs.keystore -storepass emacs1
|
|
|
|
JAVA_FILES = $(shell find . -type f -name *.java)
|
|
CLASS_FILES = $(foreach file,$(JAVA_FILES),$(basename $(file)).class)
|
|
|
|
# How this stuff works.
|
|
|
|
# emacs.apk depends on emacs.apk-in, which is simply a ZIP archive
|
|
# containing the following files:
|
|
# lib/$(ANDROID_ABI)/libemacs.so
|
|
# lib/$(ANDROID_ABI)/libandroid-emacs.so
|
|
# lib/$(ANDROID_ABI)/libctags.so
|
|
# lib/$(ANDROID_ABI)/libhexl.so
|
|
# lib/$(ANDROID_ABI)/libmovemail.so
|
|
# lib/$(ANDROID_ABI)/librcs2log.so
|
|
# lib/$(ANDROID_ABI)/libebrowse.so
|
|
# assets/info/
|
|
# assets/etc/
|
|
# assets/lisp/
|
|
|
|
.PHONY: emacs.apk-in all
|
|
all: emacs.apk
|
|
|
|
# Binaries to cross-compile.
|
|
CROSS_BINS = ../xcompile/src/android-emacs ../xcompile/lib-src/ctags \
|
|
../xcompile/lib-src/hexl ../xcompile/lib-src/movemail \
|
|
../xcompile/lib-src/ebrowse ../xcompile/lib-src/emacsclient
|
|
|
|
# Libraries to cross-compile.
|
|
CROSS_LIBS = ../xcompile/src/libemacs.so
|
|
|
|
.PHONY: $(CROSS_BINS) $(CROSS_LIBS)
|
|
|
|
../xcompile/src/android-emacs ../xcompile/src/libemacs.so:
|
|
make -C ../xcompile src/$(notdir $@)
|
|
|
|
../xcompile/lib-src/hexl ../xcompile/lib-src/movemail \
|
|
../xcompile/lib-src/ctags ../xcompile/lib-src/ebrowse &:
|
|
make -C ../xcompile lib-src/$(notdir $@)
|
|
|
|
emacs.apk-in: $(CROSS_BINS) $(CROSS_LIBS) AndroidManifest.xml
|
|
# Make the working directory for this stuff
|
|
rm -rf install_temp
|
|
mkdir -p install_temp/lib/$(ANDROID_ABI)
|
|
mkdir -p install_temp/assets/etc
|
|
mkdir -p install_temp/assets/lisp
|
|
mkdir -p install_temp/assets/info
|
|
# Install architecture independents to assets/etc and assets/lisp
|
|
cp -r $(top_builddir)/lisp install_temp/assets
|
|
cp -r $(top_builddir)/etc install_temp/assets
|
|
cp -r $(top_builddir)/info install_temp/assets
|
|
# Remove undesirable files from those directories.
|
|
for subdir in `find install_temp -type d -print`; do \
|
|
chmod a+rx $${subdir} ; \
|
|
rm -rf $${subdir}/.gitignore ; \
|
|
rm -rf $${subdir}/.DS_Store ; \
|
|
rm -rf $${subdir}/#* ; \
|
|
rm -rf $${subdir}/.#* ; \
|
|
rm -rf $${subdir}/*~ ; \
|
|
rm -rf $${subdir}/*.orig ; \
|
|
rm -rf $${subdir}/ChangeLog* ; \
|
|
rm -rf $${subdir}/[mM]akefile*[.-]in ; \
|
|
rm -rf $${subdir}/Makefile; \
|
|
done
|
|
# Install architecture dependents to lib/$(ANDROID_ABI). This
|
|
# perculiar naming scheme is required to make Android preserve these
|
|
# binaries upon installation.
|
|
for file in $(CROSS_BINS); do \
|
|
if [ -x $$file ]; then \
|
|
filename=`basename $$file`; \
|
|
cp -f $$file install_temp/lib/$(ANDROID_ABI)/lib$${filename}.so; \
|
|
fi \
|
|
done
|
|
for file in $(CROSS_LIBS); do \
|
|
if [ -x $$file ]; then \
|
|
cp -f $$file install_temp/lib/$(ANDROID_ABI); \
|
|
fi \
|
|
done
|
|
# Package everything.
|
|
$(AAPT) package -I "$(ANDROID_JAR)" -F $@ -f -M AndroidManifest.xml
|
|
pushd install_temp; $(AAPT) add ../$@ `find lib -type f`; popd
|
|
pushd install_temp; $(AAPT) add ../$@ `find assets -type f`; popd
|
|
rm -rf install_temp
|
|
|
|
.SUFFIXES: .java .class
|
|
.java.class &:
|
|
$(AM_V_JAVAC) $(JAVAC) $(JAVAFLAGS) $<
|
|
|
|
# N.B. that find must be called all over again in case javac generated
|
|
# nested classes.
|
|
|
|
classes.dex: $(CLASS_FILES)
|
|
$(AM_V_DX) $(DX) --classpath $(ANDROID_JAR) \
|
|
$(subst $$,\$$,$(shell find . -type f -name *.class))
|
|
|
|
# When emacs.keystore expires, regenerate it with:
|
|
#
|
|
# keytool -genkey -v -keystore emacs.keystore -alias "Emacs keystore" \
|
|
# -keyalg RSA -sigalg SHA1withRSA -keysize 2048 -validity 100000
|
|
|
|
.PHONY: clean maintainer-clean
|
|
|
|
emacs.apk: classes.dex emacs.apk-in emacs.keystore
|
|
cp -f emacs.apk-in $@.unaligned
|
|
$(AAPT) add $@.unaligned classes.dex
|
|
$(JARSIGNER) $(SIGN_EMACS) $@.unaligned "Emacs keystore"
|
|
$(ZIPALIGN) -f 4 $@.unaligned $@
|
|
rm -f $@.unaligned
|
|
|
|
clean:
|
|
rm -f emacs.apk emacs.apk-in *.dex *.unaligned *.class
|
|
rm -rf install-temp
|
|
find . -name '*.class' -delete
|
|
|
|
maintainer-clean: clean
|