mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-14 07:20:35 -08:00
* .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.
135 lines
5 KiB
C
135 lines
5 KiB
C
/* Variable-sized buffer with on-stack default allocation.
|
|
Copyright (C) 2015-2023 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SCRATCH_BUFFER_H
|
|
#define _SCRATCH_BUFFER_H
|
|
|
|
/* Scratch buffers with a default stack allocation and fallback to
|
|
heap allocation. It is expected that this function is used in this
|
|
way:
|
|
|
|
struct scratch_buffer tmpbuf;
|
|
scratch_buffer_init (&tmpbuf);
|
|
|
|
while (!function_that_uses_buffer (tmpbuf.data, tmpbuf.length))
|
|
if (!scratch_buffer_grow (&tmpbuf))
|
|
return -1;
|
|
|
|
scratch_buffer_free (&tmpbuf);
|
|
return 0;
|
|
|
|
The allocation functions (scratch_buffer_grow,
|
|
scratch_buffer_grow_preserve, scratch_buffer_set_array_size) make
|
|
sure that the heap allocation, if any, is freed, so that the code
|
|
above does not have a memory leak. The buffer still remains in a
|
|
state that can be deallocated using scratch_buffer_free, so a loop
|
|
like this is valid as well:
|
|
|
|
struct scratch_buffer tmpbuf;
|
|
scratch_buffer_init (&tmpbuf);
|
|
|
|
while (!function_that_uses_buffer (tmpbuf.data, tmpbuf.length))
|
|
if (!scratch_buffer_grow (&tmpbuf))
|
|
break;
|
|
|
|
scratch_buffer_free (&tmpbuf);
|
|
|
|
scratch_buffer_grow and scratch_buffer_grow_preserve are guaranteed
|
|
to grow the buffer by at least 512 bytes. This means that when
|
|
using the scratch buffer as a backing store for a non-character
|
|
array whose element size, in bytes, is 512 or smaller, the scratch
|
|
buffer only has to grow once to make room for at least one more
|
|
element.
|
|
*/
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
|
|
/* Scratch buffer. Must be initialized with scratch_buffer_init
|
|
before its use. */
|
|
struct scratch_buffer {
|
|
void *data; /* Pointer to the beginning of the scratch area. */
|
|
size_t length; /* Allocated space at the data pointer, in bytes. */
|
|
union { max_align_t __align; char __c[1024]; } __space;
|
|
};
|
|
|
|
/* Initializes *BUFFER so that BUFFER->data points to BUFFER->__space
|
|
and BUFFER->length reflects the available space. */
|
|
static inline void
|
|
scratch_buffer_init (struct scratch_buffer *buffer)
|
|
{
|
|
buffer->data = buffer->__space.__c;
|
|
buffer->length = sizeof (buffer->__space);
|
|
}
|
|
|
|
/* Deallocates *BUFFER (if it was heap-allocated). */
|
|
static inline void
|
|
scratch_buffer_free (struct scratch_buffer *buffer)
|
|
{
|
|
if (buffer->data != buffer->__space.__c)
|
|
free (buffer->data);
|
|
}
|
|
|
|
/* Grow *BUFFER by some arbitrary amount. The buffer contents is NOT
|
|
preserved. Return true on success, false on allocation failure (in
|
|
which case the old buffer is freed). On success, the new buffer is
|
|
larger than the previous size. On failure, *BUFFER is deallocated,
|
|
but remains in a free-able state, and errno is set. */
|
|
bool __libc_scratch_buffer_grow (struct scratch_buffer *buffer);
|
|
libc_hidden_proto (__libc_scratch_buffer_grow)
|
|
|
|
/* Alias for __libc_scratch_buffer_grow. */
|
|
static __always_inline bool
|
|
scratch_buffer_grow (struct scratch_buffer *buffer)
|
|
{
|
|
return __glibc_likely (__libc_scratch_buffer_grow (buffer));
|
|
}
|
|
|
|
/* Like __libc_scratch_buffer_grow, but preserve the old buffer
|
|
contents on success, as a prefix of the new buffer. */
|
|
bool __libc_scratch_buffer_grow_preserve (struct scratch_buffer *buffer);
|
|
libc_hidden_proto (__libc_scratch_buffer_grow_preserve)
|
|
|
|
/* Alias for __libc_scratch_buffer_grow_preserve. */
|
|
static __always_inline bool
|
|
scratch_buffer_grow_preserve (struct scratch_buffer *buffer)
|
|
{
|
|
return __glibc_likely (__libc_scratch_buffer_grow_preserve (buffer));
|
|
}
|
|
|
|
/* Grow *BUFFER so that it can store at least NELEM elements of SIZE
|
|
bytes. The buffer contents are NOT preserved. Both NELEM and SIZE
|
|
can be zero. Return true on success, false on allocation failure
|
|
(in which case the old buffer is freed, but *BUFFER remains in a
|
|
free-able state, and errno is set). It is unspecified whether this
|
|
function can reduce the array size. */
|
|
bool __libc_scratch_buffer_set_array_size (struct scratch_buffer *buffer,
|
|
size_t nelem, size_t size);
|
|
libc_hidden_proto (__libc_scratch_buffer_set_array_size)
|
|
|
|
/* Alias for __libc_scratch_set_array_size. */
|
|
static __always_inline bool
|
|
scratch_buffer_set_array_size (struct scratch_buffer *buffer,
|
|
size_t nelem, size_t size)
|
|
{
|
|
return __glibc_likely (__libc_scratch_buffer_set_array_size
|
|
(buffer, nelem, size));
|
|
}
|
|
|
|
#endif /* _SCRATCH_BUFFER_H */
|