mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-25 07:28:20 +00:00
a496509ced
* .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.
281 lines
7.0 KiB
C
281 lines
7.0 KiB
C
/* Android asset directory tool.
|
||
|
||
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/>. */
|
||
|
||
#include <config.h>
|
||
|
||
#include <stdio.h>
|
||
#include <fcntl.h>
|
||
#include <errno.h>
|
||
#include <endian.h>
|
||
#include <stdlib.h>
|
||
#include <dirent.h>
|
||
#include <string.h>
|
||
#include <unistd.h>
|
||
|
||
#include <sys/stat.h>
|
||
|
||
/* This program takes a directory as input, and generates a
|
||
``directory-tree'' file suitable for inclusion in an Android
|
||
application package.
|
||
|
||
Such a file records the layout of the `assets' directory in the
|
||
package. Emacs records this information itself and uses it in the
|
||
Android emulation of readdir, because the system asset manager APIs
|
||
are routinely buggy, and are often unable to locate directories or
|
||
files.
|
||
|
||
The file is packed, with no data alignment guarantees made. The
|
||
file starts with the bytes "EMACS", following which is the name of
|
||
the first file or directory, a NULL byte and an unsigned int
|
||
indicating the offset from the start of the file to the start of
|
||
the next sibling. Following that is a list of subdirectories or
|
||
files in the same format. The long is stored LSB first. */
|
||
|
||
|
||
|
||
struct directory_tree
|
||
{
|
||
/* The offset to the next sibling. */
|
||
size_t offset;
|
||
|
||
/* The name of this directory or file. */
|
||
char *name;
|
||
|
||
/* Subdirectories and files inside this directory. */
|
||
struct directory_tree *children, *next;
|
||
};
|
||
|
||
/* Exit with EXIT_FAILURE, after printing a description of a failing
|
||
function WHAT along with the details of the error. */
|
||
|
||
static _Noreturn void
|
||
croak (const char *what)
|
||
{
|
||
perror (what);
|
||
exit (EXIT_FAILURE);
|
||
}
|
||
|
||
/* Like malloc, but aborts on failure. */
|
||
|
||
static void *
|
||
xmalloc (size_t size)
|
||
{
|
||
void *ptr;
|
||
|
||
ptr = malloc (size);
|
||
|
||
if (!ptr)
|
||
croak ("malloc");
|
||
|
||
return ptr;
|
||
}
|
||
|
||
/* Recursively build a struct directory_tree structure for each
|
||
subdirectory or file in DIR, in preparation for writing it out to
|
||
disk. PARENT should be the directory tree associated with the
|
||
parent directory, or else PARENT->offset must be initialized to
|
||
5. */
|
||
|
||
static void
|
||
main_1 (DIR *dir, struct directory_tree *parent)
|
||
{
|
||
struct dirent *dirent;
|
||
int dir_fd, fd;
|
||
struct stat statb;
|
||
struct directory_tree *this, **last;
|
||
size_t length;
|
||
DIR *otherdir;
|
||
|
||
dir_fd = dirfd (dir);
|
||
last = &parent->children;
|
||
|
||
while ((dirent = readdir (dir)))
|
||
{
|
||
/* Determine what kind of file DIRENT is. */
|
||
|
||
if (fstatat (dir_fd, dirent->d_name, &statb,
|
||
AT_SYMLINK_NOFOLLOW) == -1)
|
||
croak ("fstatat");
|
||
|
||
/* Ignore . and ... */
|
||
|
||
if (!strcmp (dirent->d_name, ".")
|
||
|| !strcmp (dirent->d_name, ".."))
|
||
continue;
|
||
|
||
length = strlen (dirent->d_name);
|
||
|
||
if (statb.st_mode & S_IFDIR)
|
||
{
|
||
/* This is a directory. Write its name followed by a
|
||
trailing slash, then a NULL byte, and the offset to the
|
||
next sibling. */
|
||
this = xmalloc (sizeof *this);
|
||
this->children = NULL;
|
||
this->next = NULL;
|
||
*last = this;
|
||
last = &this->next;
|
||
this->name = xmalloc (length + 2);
|
||
strcpy (this->name, dirent->d_name);
|
||
|
||
/* Now record the offset to the end of this directory. This
|
||
is length + 1, for the file name, and 5 more bytes for
|
||
the trailing NULL and long. */
|
||
this->offset = parent->offset + length + 6;
|
||
|
||
/* Terminate that with a slash and trailing NULL byte. */
|
||
this->name[length] = '/';
|
||
this->name[length + 1] = '\0';
|
||
|
||
/* Open and build that directory recursively. */
|
||
|
||
fd = openat (dir_fd, dirent->d_name, O_DIRECTORY,
|
||
O_RDONLY);
|
||
if (fd < 0)
|
||
croak ("openat");
|
||
otherdir = fdopendir (fd);
|
||
if (!otherdir)
|
||
croak ("fdopendir");
|
||
|
||
main_1 (otherdir, this);
|
||
|
||
/* Close this directory. */
|
||
closedir (otherdir);
|
||
|
||
/* Finally, set parent->offset to this->offset as well. */
|
||
parent->offset = this->offset;
|
||
}
|
||
else if (statb.st_mode & S_IFREG)
|
||
{
|
||
/* This is a regular file. */
|
||
this = xmalloc (sizeof *this);
|
||
this->children = NULL;
|
||
this->next = NULL;
|
||
*last = this;
|
||
last = &this->next;
|
||
this->name = xmalloc (length + 1);
|
||
strcpy (this->name, dirent->d_name);
|
||
|
||
/* This is one byte shorter because there is no trailing
|
||
slash. */
|
||
this->offset = parent->offset + length + 5;
|
||
parent->offset = this->offset;
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Write the struct directory_tree TREE and all of is children to the
|
||
file descriptor FD. OFFSET is the offset of TREE and may be
|
||
modified; it is only used for checking purposes. */
|
||
|
||
static void
|
||
main_2 (int fd, struct directory_tree *tree, size_t *offset)
|
||
{
|
||
ssize_t size;
|
||
struct directory_tree *child;
|
||
unsigned int output;
|
||
|
||
/* Write tree->name with the trailing NULL byte. */
|
||
size = strlen (tree->name) + 1;
|
||
if (write (fd, tree->name, size) < size)
|
||
croak ("write");
|
||
|
||
/* Write the offset. */
|
||
output = htole32 (tree->offset);
|
||
if (write (fd, &output, 4) < 1)
|
||
croak ("write");
|
||
size += 4;
|
||
|
||
/* Now update offset. */
|
||
*offset += size;
|
||
|
||
/* Write out each child. */
|
||
for (child = tree->children; child; child = child->next)
|
||
main_2 (fd, child, offset);
|
||
|
||
/* Verify the offset is correct. */
|
||
if (tree->offset != *offset)
|
||
{
|
||
fprintf (stderr,
|
||
"asset-directory-tool: invalid offset: expected %tu, "
|
||
"got %tu.\n"
|
||
"Please report this bug to bug-gnu-emacs@gnu.org, along\n"
|
||
"with an archive containing the contents of the java/inst"
|
||
"all_temp directory.\n",
|
||
tree->offset, *offset);
|
||
abort ();
|
||
}
|
||
}
|
||
|
||
int
|
||
main (int argc, char **argv)
|
||
{
|
||
int fd;
|
||
DIR *indir;
|
||
struct directory_tree tree;
|
||
size_t offset;
|
||
|
||
if (argc != 3)
|
||
{
|
||
fprintf (stderr, "usage: %s directory output-file\n",
|
||
argv[0]);
|
||
return EXIT_FAILURE;
|
||
}
|
||
|
||
fd = open (argv[2], O_CREAT | O_TRUNC | O_RDWR,
|
||
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
|
||
|
||
if (fd < 0)
|
||
{
|
||
perror ("open");
|
||
return EXIT_FAILURE;
|
||
}
|
||
|
||
indir = opendir (argv[1]);
|
||
|
||
if (!indir)
|
||
{
|
||
perror ("opendir");
|
||
return EXIT_FAILURE;
|
||
}
|
||
|
||
/* Write the first 5 byte header to FD. */
|
||
|
||
if (write (fd, "EMACS", 5) < 5)
|
||
{
|
||
perror ("write");
|
||
return EXIT_FAILURE;
|
||
}
|
||
|
||
/* Now iterate through children of INDIR, building the directory
|
||
tree. */
|
||
tree.offset = 5;
|
||
tree.children = NULL;
|
||
|
||
main_1 (indir, &tree);
|
||
closedir (indir);
|
||
|
||
/* Finally, write the directory tree to the output file. */
|
||
offset = 5;
|
||
for (; tree.children; tree.children = tree.children->next)
|
||
main_2 (fd, tree.children, &offset);
|
||
|
||
return 0;
|
||
}
|