mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -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.
218 lines
8.1 KiB
C
218 lines
8.1 KiB
C
/* Implementation details of FILE streams.
|
|
Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc.
|
|
|
|
This file 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.
|
|
|
|
This file 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 this program. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
/* Many stdio implementations have the same logic and therefore can share
|
|
the same implementation of stdio extension API, except that some fields
|
|
have different naming conventions, or their access requires some casts. */
|
|
|
|
/* Glibc 2.28 made _IO_UNBUFFERED and _IO_IN_BACKUP private. For now, work
|
|
around this problem by defining them ourselves. FIXME: Do not rely on glibc
|
|
internals. */
|
|
#if defined _IO_EOF_SEEN
|
|
# if !defined _IO_UNBUFFERED
|
|
# define _IO_UNBUFFERED 0x2
|
|
# endif
|
|
# if !defined _IO_IN_BACKUP
|
|
# define _IO_IN_BACKUP 0x100
|
|
# endif
|
|
#endif
|
|
|
|
/* BSD stdio derived implementations. */
|
|
|
|
#if defined __NetBSD__ /* NetBSD */
|
|
/* Get __NetBSD_Version__. */
|
|
# include <sys/param.h>
|
|
#endif
|
|
|
|
#include <errno.h> /* For detecting Plan9. */
|
|
|
|
#if defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
|
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
|
|
|
# if defined __DragonFly__ /* DragonFly */
|
|
/* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>. */
|
|
# define fp_ ((struct { struct __FILE_public pub; \
|
|
struct { unsigned char *_base; int _size; } _bf; \
|
|
void *cookie; \
|
|
void *_close; \
|
|
void *_read; \
|
|
void *_seek; \
|
|
void *_write; \
|
|
struct { unsigned char *_base; int _size; } _ub; \
|
|
int _ur; \
|
|
unsigned char _ubuf[3]; \
|
|
unsigned char _nbuf[1]; \
|
|
struct { unsigned char *_base; int _size; } _lb; \
|
|
int _blksize; \
|
|
fpos_t _offset; \
|
|
/* More fields, not relevant here. */ \
|
|
} *) fp)
|
|
/* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>. */
|
|
# define _p pub._p
|
|
# define _flags pub._flags
|
|
# define _r pub._r
|
|
# define _w pub._w
|
|
# elif defined __ANDROID__ /* Android */
|
|
# ifdef __LP64__
|
|
# define _gl_flags_file_t int
|
|
# else
|
|
# define _gl_flags_file_t short
|
|
# endif
|
|
# ifdef __LP64__
|
|
# define _gl_file_offset_t int64_t
|
|
# else
|
|
/* see https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md */
|
|
# define _gl_file_offset_t __kernel_off_t
|
|
# endif
|
|
/* Up to this commit from 2015-10-12
|
|
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
|
the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
|
|
see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
|
|
and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
|
|
After this commit, the innards of FILE are hidden. */
|
|
# define fp_ ((struct { unsigned char *_p; \
|
|
int _r; \
|
|
int _w; \
|
|
_gl_flags_file_t _flags; \
|
|
_gl_flags_file_t _file; \
|
|
struct { unsigned char *_base; size_t _size; } _bf; \
|
|
int _lbfsize; \
|
|
void *_cookie; \
|
|
void *_close; \
|
|
void *_read; \
|
|
void *_seek; \
|
|
void *_write; \
|
|
struct { unsigned char *_base; size_t _size; } _ext; \
|
|
unsigned char *_up; \
|
|
int _ur; \
|
|
unsigned char _ubuf[3]; \
|
|
unsigned char _nbuf[1]; \
|
|
struct { unsigned char *_base; size_t _size; } _lb; \
|
|
int _blksize; \
|
|
_gl_file_offset_t _offset; \
|
|
/* More fields, not relevant here. */ \
|
|
} *) fp)
|
|
# else
|
|
# define fp_ fp
|
|
# endif
|
|
|
|
# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
|
|
/* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
|
|
and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
|
|
and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
|
|
struct __sfileext
|
|
{
|
|
struct __sbuf _ub; /* ungetc buffer */
|
|
/* More fields, not relevant here. */
|
|
};
|
|
# define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
|
|
# elif defined __ANDROID__ /* Android */
|
|
struct __sfileext
|
|
{
|
|
struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
|
|
/* More fields, not relevant here. */
|
|
};
|
|
# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
|
|
# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
|
|
# define fp_ub fp_->_ub
|
|
# endif
|
|
|
|
# define HASUB(fp) (fp_ub._base != NULL)
|
|
|
|
# if defined __ANDROID__ /* Android */
|
|
/* Needed after this commit from 2016-01-25
|
|
<https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
|
|
# ifndef __SEOF
|
|
# define __SLBF 1
|
|
# define __SNBF 2
|
|
# define __SRD 4
|
|
# define __SWR 8
|
|
# define __SRW 0x10
|
|
# define __SEOF 0x20
|
|
# define __SERR 0x40
|
|
# endif
|
|
# ifndef __SOFF
|
|
# define __SOFF 0x1000
|
|
# endif
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
|
/* SystemV derived implementations. */
|
|
|
|
#ifdef __TANDEM /* NonStop Kernel */
|
|
# ifndef _IOERR
|
|
/* These values were determined by the program 'stdioext-flags' at
|
|
<https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
|
|
# define _IOERR 0x40
|
|
# define _IOREAD 0x80
|
|
# define _IOWRT 0x4
|
|
# define _IORW 0x100
|
|
# endif
|
|
#endif
|
|
|
|
#if defined _IOERR
|
|
|
|
# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
|
|
# define fp_ ((struct { unsigned char *_ptr; \
|
|
unsigned char *_base; \
|
|
unsigned char *_end; \
|
|
long _cnt; \
|
|
int _file; \
|
|
unsigned int _flag; \
|
|
} *) fp)
|
|
# elif defined __VMS /* OpenVMS */
|
|
# define fp_ ((struct _iobuf *) fp)
|
|
# else
|
|
# define fp_ fp
|
|
# endif
|
|
|
|
# if defined _SCO_DS || (defined __SCO_VERSION__ || defined __sysv5__) /* OpenServer 5, OpenServer 6, UnixWare 7 */
|
|
# define _cnt __cnt
|
|
# define _ptr __ptr
|
|
# define _base __base
|
|
# define _flag __flag
|
|
# endif
|
|
|
|
#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */
|
|
|
|
/* <stdio.h> does not define the innards of FILE any more. */
|
|
# define WINDOWS_OPAQUE_FILE
|
|
|
|
struct _gl_real_FILE
|
|
{
|
|
/* Note: Compared to older Windows and to mingw, it has the fields
|
|
_base and _cnt swapped. */
|
|
unsigned char *_ptr;
|
|
unsigned char *_base;
|
|
int _cnt;
|
|
int _flag;
|
|
int _file;
|
|
int _charbuf;
|
|
int _bufsiz;
|
|
};
|
|
# define fp_ ((struct _gl_real_FILE *) fp)
|
|
|
|
/* These values were determined by a program similar to the one at
|
|
<https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
|
|
# define _IOREAD 0x1
|
|
# define _IOWRT 0x2
|
|
# define _IORW 0x4
|
|
# define _IOEOF 0x8
|
|
# define _IOERR 0x10
|
|
|
|
#endif
|