mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-31 09:20:54 -08:00
Fixes Bug#15880. This patch also makes Q constants (e.g., Qnil) constant addresses from the C point of view. * make-docfile.c: Revamp to generate table of symbols, too. Include <stdbool.h>. (xstrdup): New function. (main): Don't process the same file twice. (SYMBOL): New constant in enum global_type. (struct symbol): Turn 'value' member into a union, either v.value for int or v.svalue for string. All uses changed. (add_global): New arg svalue, which overrides value, so that globals can have a string value. (close_emacs_global): New arg num_symbols; all uses changed. Output lispsym decl. (write_globals): Output symbol globals too. Output more ATTRIBUTE_CONST, now that Qnil etc. are C constants. Output defsym_name table. (scan_c_file): Move most of guts into ... (scan_c_stream): ... new function. Scan for DEFSYMs and record symbols found. Don't read past EOF if file doesn't end in newline. * alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle: * casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c: * composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c: * frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c: * image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c: * macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m: * nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c: * search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c: * xselect.c, xsettings.c, xterm.c: Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs). These names are now defined automatically by make-docfile. * alloc.c (init_symbol): New function. (Fmake_symbol): Use it. (c_symbol_p): New function. (valid_lisp_object_p, purecopy): Use it. * alloc.c (marked_pinned_symbols): Use make_lisp_symbol instead of make_lisp_ptr. (garbage_collect_1): Mark lispsym symbols. (CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro. (mark_object): Use it. (sweep_symbols): Sweep lispsym symbols. (symbol_uses_obj): New function. (which_symbols): Use it. Work for lispsym symbols, too. (init_alloc_once): Initialize Vpurify_flag here; no need to wait, since Qt's address is already known now. (syms_of_alloc): Add lispsym count to symbols_consed. * buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0), when testing whether storage is all bits zero. * dispextern (struct image_type): * font.c (font_property_table): * frame.c (struct frame_parm_table, frame_parms): * keyboard.c (scroll_bar_parts, struct event_head): * xdisp.c (struct props): Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and Lisp_Object *, since Qfoo is no longer an object whose address can be taken. All uses changed. * eval.c (run_hook): New function. Most uses of Frun_hooks changed to use it, so that they no longer need to take the address of a Lisp sym. (syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable. * frame.c (syms_of_frame): Add defsyms for the frame_parms table. * keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here. DEFSYM Qdeactivate_mark before the corresponding var. * keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line instead of interning their symbols; this avoids duplicates. (LISP_INITIALLY, TAG_PTR) (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT): New macros. (LISP_INITIALLY_ZERO): Use it. (enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol) (EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*): Move decls up, to avoid forward uses. Include globals.h earlier, too. (make_lisp_symbol): New function. (XSETSYMBOL): Use it. (DEFSYM): Now just a placeholder for make-docfile. * lread.c (DEFINE_SYMBOLS): Define, for globals.h. (intern_sym): New function, with body taken from old intern_driver. (intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t. All uses changed. (define_symbol): New function. (init_obarray): Define the C symbols taken from lispsym. Use plain DEFSYM for Qt and Qnil. * syntax.c (init_syntax_once): No need to worry about Qchar_table_extra_slots.
332 lines
12 KiB
C
332 lines
12 KiB
C
/* Header for composite sequence handler.
|
|
Copyright (C) 2001-2015 Free Software Foundation, Inc.
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
|
National Institute of Advanced Industrial Science and Technology (AIST)
|
|
Registration Number H14PRO021
|
|
Copyright (C) 2003, 2006
|
|
National Institute of Advanced Industrial Science and Technology (AIST)
|
|
Registration Number H13PRO009
|
|
|
|
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 <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef EMACS_COMPOSITE_H
|
|
#define EMACS_COMPOSITE_H
|
|
|
|
#include "font.h"
|
|
|
|
INLINE_HEADER_BEGIN
|
|
|
|
/* Methods to display a sequence of components of a composition. */
|
|
enum composition_method {
|
|
/* Compose relatively without alternate characters. */
|
|
COMPOSITION_RELATIVE,
|
|
/* Compose by specified composition rules. This is not used in
|
|
Emacs 21 but we need it to decode files saved in the older
|
|
versions of Emacs. */
|
|
COMPOSITION_WITH_RULE,
|
|
/* Compose relatively with alternate characters. */
|
|
COMPOSITION_WITH_ALTCHARS,
|
|
/* Compose by specified composition rules with alternate characters. */
|
|
COMPOSITION_WITH_RULE_ALTCHARS,
|
|
/* This is not a method. */
|
|
COMPOSITION_NO
|
|
};
|
|
|
|
/* Maximum number of components a single composition can have. */
|
|
#define MAX_COMPOSITION_COMPONENTS 16
|
|
|
|
/* These operations access information about a composition that
|
|
has `composition' property PROP. PROP is:
|
|
((LENGTH . COMPONENTS) . MODIFICATION-FUNC)
|
|
or
|
|
(COMPOSITION-ID . (LENGTH COMPONENTS . MODIFICATION-FUNC))
|
|
They don't check validity of PROP. */
|
|
|
|
/* Return true if PROP is already registered. */
|
|
INLINE bool
|
|
composition_registered_p (Lisp_Object prop)
|
|
{
|
|
return INTEGERP (XCAR (prop));
|
|
}
|
|
|
|
/* Return ID number of the already registered composition. */
|
|
#define COMPOSITION_ID(prop) XINT (XCAR (prop))
|
|
|
|
/* Return length of the composition. */
|
|
#define COMPOSITION_LENGTH(prop) \
|
|
(composition_registered_p (prop) \
|
|
? XINT (XCAR (XCDR (prop))) \
|
|
: XINT (XCAR (XCAR (prop))))
|
|
|
|
/* Return components of the composition. */
|
|
#define COMPOSITION_COMPONENTS(prop) \
|
|
(composition_registered_p (prop) \
|
|
? XCAR (XCDR (XCDR (prop))) \
|
|
: XCDR (XCAR (prop)))
|
|
|
|
/* Return modification function of the composition. */
|
|
#define COMPOSITION_MODIFICATION_FUNC(prop) \
|
|
(composition_registered_p (prop) \
|
|
? XCDR (XCDR (XCDR (prop))) \
|
|
: CONSP (prop) ? XCDR (prop) : Qnil)
|
|
|
|
/* Return the Nth glyph of composition specified by CMP. CMP is a
|
|
pointer to `struct composition'. */
|
|
#define COMPOSITION_GLYPH(cmp, n) \
|
|
XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \
|
|
->key_and_value) \
|
|
->contents[cmp->hash_index * 2]) \
|
|
->contents[cmp->method == COMPOSITION_WITH_RULE_ALTCHARS \
|
|
? (n) * 2 : (n)])
|
|
|
|
/* Return the encoded composition rule to compose the Nth glyph of
|
|
rule-base composition specified by CMP. CMP is a pointer to
|
|
`struct composition'. */
|
|
#define COMPOSITION_RULE(cmp, n) \
|
|
XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \
|
|
->key_and_value) \
|
|
->contents[cmp->hash_index * 2]) \
|
|
->contents[(n) * 2 - 1])
|
|
|
|
/* Decode encoded composition rule RULE_CODE into GREF (global
|
|
reference point code), NREF (new ref. point code). Don't check RULE_CODE;
|
|
always set GREF and NREF to valid values. By side effect,
|
|
RULE_CODE is modified. */
|
|
|
|
#define COMPOSITION_DECODE_REFS(rule_code, gref, nref) \
|
|
do { \
|
|
rule_code &= 0xFF; \
|
|
gref = (rule_code) / 12; \
|
|
if (gref > 12) gref = 11; \
|
|
nref = (rule_code) % 12; \
|
|
} while (false)
|
|
|
|
/* Like COMPOSITION_DECODE_REFS (RULE_CODE, GREF, NREF), but also
|
|
decode RULE_CODE into XOFF and YOFF (vertical offset). */
|
|
|
|
#define COMPOSITION_DECODE_RULE(rule_code, gref, nref, xoff, yoff) \
|
|
do { \
|
|
xoff = (rule_code) >> 16; \
|
|
yoff = ((rule_code) >> 8) & 0xFF; \
|
|
COMPOSITION_DECODE_REFS (rule_code, gref, nref); \
|
|
} while (false)
|
|
|
|
/* Nonzero if the global reference point GREF and new reference point NREF are
|
|
valid. */
|
|
#define COMPOSITION_ENCODE_RULE_VALID(gref, nref) \
|
|
(UNSIGNED_CMP (gref, <, 12) && UNSIGNED_CMP (nref, <, 12))
|
|
|
|
/* Return encoded composition rule for the pair of global reference
|
|
point GREF and new reference point NREF. Arguments must be valid. */
|
|
#define COMPOSITION_ENCODE_RULE(gref, nref) \
|
|
((gref) * 12 + (nref))
|
|
|
|
/* Data structure that records information about a composition
|
|
currently used in some buffers or strings.
|
|
|
|
When a composition is assigned an ID number (by
|
|
get_composition_id), this structure is allocated for the
|
|
composition and linked in composition_table[ID].
|
|
|
|
Identical compositions appearing at different places have the same
|
|
ID, and thus share the same instance of this structure. */
|
|
|
|
struct composition {
|
|
/* Number of glyphs of the composition components. */
|
|
int glyph_len;
|
|
|
|
/* Width, ascent, and descent pixels of the composition. */
|
|
short pixel_width, ascent, descent;
|
|
|
|
short lbearing, rbearing;
|
|
|
|
/* How many columns the overall glyphs occupy on the screen. This
|
|
gives an approximate value for column calculation in
|
|
Fcurrent_column, and etc. */
|
|
int width;
|
|
|
|
/* Method of the composition. */
|
|
enum composition_method method;
|
|
|
|
/* Index to the composition hash table. */
|
|
ptrdiff_t hash_index;
|
|
|
|
/* For which font we have calculated the remaining members. The
|
|
actual type is device dependent. */
|
|
void *font;
|
|
|
|
/* Pointer to an array of x-offset and y-offset (by pixels) of
|
|
glyphs. This points to a sufficient memory space (sizeof (short) *
|
|
glyph_len * 2) that is allocated when the composition is
|
|
registered in composition_table. X-offset and Y-offset of Nth
|
|
glyph are (2N)th and (2N+1)th elements respectively. */
|
|
short *offsets;
|
|
};
|
|
|
|
/* Table of pointers to the structure `composition' indexed by
|
|
COMPOSITION-ID. */
|
|
extern struct composition **composition_table;
|
|
/* Number of the currently registered compositions. */
|
|
extern ptrdiff_t n_compositions;
|
|
|
|
/* Mask bits for CHECK_MASK arg to update_compositions.
|
|
For a change in the region FROM and TO, check compositions ... */
|
|
#define CHECK_HEAD 1 /* adjacent to FROM */
|
|
#define CHECK_TAIL 2 /* adjacent to TO */
|
|
#define CHECK_INSIDE 4 /* between FROM and TO */
|
|
#define CHECK_BORDER (CHECK_HEAD | CHECK_TAIL)
|
|
#define CHECK_ALL (CHECK_BORDER | CHECK_INSIDE)
|
|
|
|
extern Lisp_Object composition_hash_table;
|
|
extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t,
|
|
Lisp_Object, Lisp_Object);
|
|
extern bool find_composition (ptrdiff_t, ptrdiff_t, ptrdiff_t *, ptrdiff_t *,
|
|
Lisp_Object *, Lisp_Object);
|
|
extern void update_compositions (ptrdiff_t, ptrdiff_t, int);
|
|
extern void make_composition_value_copy (Lisp_Object);
|
|
extern void syms_of_composite (void);
|
|
extern void compose_text (ptrdiff_t, ptrdiff_t, Lisp_Object, Lisp_Object,
|
|
Lisp_Object);
|
|
|
|
/* Return the method of a composition with property PROP. */
|
|
|
|
INLINE enum composition_method
|
|
composition_method (Lisp_Object prop)
|
|
{
|
|
if (composition_registered_p (prop))
|
|
return composition_table[COMPOSITION_ID (prop)]->method;
|
|
else
|
|
{
|
|
Lisp_Object temp = XCDR (XCAR (prop));
|
|
return (NILP (temp)
|
|
? COMPOSITION_RELATIVE
|
|
: INTEGERP (temp) || STRINGP (temp)
|
|
? COMPOSITION_WITH_ALTCHARS
|
|
: COMPOSITION_WITH_RULE_ALTCHARS);
|
|
}
|
|
}
|
|
|
|
/* Given offsets START and END, return true if PROP is a valid composition
|
|
property with length END - START. */
|
|
|
|
INLINE bool
|
|
composition_valid_p (ptrdiff_t start, ptrdiff_t end, Lisp_Object prop)
|
|
{
|
|
return (CONSP (prop)
|
|
&& (composition_registered_p (prop)
|
|
? (COMPOSITION_ID (prop) >= 0
|
|
&& COMPOSITION_ID (prop) <= n_compositions
|
|
&& CONSP (XCDR (prop)))
|
|
: (CONSP (XCAR (prop))
|
|
&& (NILP (XCDR (XCAR (prop)))
|
|
|| STRINGP (XCDR (XCAR (prop)))
|
|
|| VECTORP (XCDR (XCAR (prop)))
|
|
|| INTEGERP (XCDR (XCAR (prop)))
|
|
|| CONSP (XCDR (XCAR (prop))))))
|
|
&& COMPOSITION_LENGTH (prop) == end - start);
|
|
}
|
|
|
|
/* Macros for lispy glyph-string. This is completely different from
|
|
struct glyph_string. */
|
|
|
|
#define LGSTRING_HEADER(lgs) AREF (lgs, 0)
|
|
#define LGSTRING_SET_HEADER(lgs, header) ASET (lgs, 0, header)
|
|
|
|
#define LGSTRING_FONT(lgs) AREF (LGSTRING_HEADER (lgs), 0)
|
|
#define LGSTRING_CHAR(lgs, i) AREF (LGSTRING_HEADER (lgs), (i) + 1)
|
|
#define LGSTRING_CHAR_LEN(lgs) (ASIZE (LGSTRING_HEADER (lgs)) - 1)
|
|
|
|
#define LGSTRING_SET_FONT(lgs, val) ASET (LGSTRING_HEADER (lgs), 0, (val))
|
|
#define LGSTRING_SET_CHAR(lgs, i, c) ASET (LGSTRING_HEADER (lgs), (i) + 1, (c))
|
|
|
|
#define LGSTRING_ID(lgs) AREF (lgs, 1)
|
|
#define LGSTRING_SET_ID(lgs, id) ASET (lgs, 1, id)
|
|
|
|
#define LGSTRING_GLYPH_LEN(lgs) (ASIZE ((lgs)) - 2)
|
|
#define LGSTRING_GLYPH(lgs, idx) AREF ((lgs), (idx) + 2)
|
|
#define LGSTRING_SET_GLYPH(lgs, idx, val) ASET ((lgs), (idx) + 2, (val))
|
|
INLINE Lisp_Object *
|
|
lgstring_glyph_addr (Lisp_Object lgs, ptrdiff_t idx)
|
|
{
|
|
return aref_addr (lgs, idx + 2);
|
|
}
|
|
|
|
/* Vector size of Lispy glyph. */
|
|
enum lglyph_indices
|
|
{
|
|
LGLYPH_IX_FROM, LGLYPH_IX_TO, LGLYPH_IX_CHAR, LGLYPH_IX_CODE,
|
|
LGLYPH_IX_WIDTH, LGLYPH_IX_LBEARING, LGLYPH_IX_RBEARING,
|
|
LGLYPH_IX_ASCENT, LGLYPH_IX_DESCENT, LGLYPH_IX_ADJUSTMENT,
|
|
/* Not an index. */
|
|
LGLYPH_SIZE
|
|
};
|
|
|
|
#define LGLYPH_NEW() Fmake_vector (make_number (LGLYPH_SIZE), Qnil)
|
|
#define LGLYPH_FROM(g) XINT (AREF ((g), LGLYPH_IX_FROM))
|
|
#define LGLYPH_TO(g) XINT (AREF ((g), LGLYPH_IX_TO))
|
|
#define LGLYPH_CHAR(g) XINT (AREF ((g), LGLYPH_IX_CHAR))
|
|
#define LGLYPH_CODE(g) \
|
|
(NILP (AREF ((g), LGLYPH_IX_CODE)) \
|
|
? FONT_INVALID_CODE \
|
|
: cons_to_unsigned (AREF (g, LGLYPH_IX_CODE), TYPE_MAXIMUM (unsigned)))
|
|
#define LGLYPH_WIDTH(g) XINT (AREF ((g), LGLYPH_IX_WIDTH))
|
|
#define LGLYPH_LBEARING(g) XINT (AREF ((g), LGLYPH_IX_LBEARING))
|
|
#define LGLYPH_RBEARING(g) XINT (AREF ((g), LGLYPH_IX_RBEARING))
|
|
#define LGLYPH_ASCENT(g) XINT (AREF ((g), LGLYPH_IX_ASCENT))
|
|
#define LGLYPH_DESCENT(g) XINT (AREF ((g), LGLYPH_IX_DESCENT))
|
|
#define LGLYPH_ADJUSTMENT(g) AREF ((g), LGLYPH_IX_ADJUSTMENT)
|
|
#define LGLYPH_SET_FROM(g, val) ASET ((g), LGLYPH_IX_FROM, make_number (val))
|
|
#define LGLYPH_SET_TO(g, val) ASET ((g), LGLYPH_IX_TO, make_number (val))
|
|
#define LGLYPH_SET_CHAR(g, val) ASET ((g), LGLYPH_IX_CHAR, make_number (val))
|
|
/* Callers must assure that VAL is not negative! */
|
|
#define LGLYPH_SET_CODE(g, val) \
|
|
ASET (g, LGLYPH_IX_CODE, \
|
|
val == FONT_INVALID_CODE ? Qnil : INTEGER_TO_CONS (val))
|
|
|
|
#define LGLYPH_SET_WIDTH(g, val) ASET ((g), LGLYPH_IX_WIDTH, make_number (val))
|
|
#define LGLYPH_SET_LBEARING(g, val) ASET ((g), LGLYPH_IX_LBEARING, make_number (val))
|
|
#define LGLYPH_SET_RBEARING(g, val) ASET ((g), LGLYPH_IX_RBEARING, make_number (val))
|
|
#define LGLYPH_SET_ASCENT(g, val) ASET ((g), LGLYPH_IX_ASCENT, make_number (val))
|
|
#define LGLYPH_SET_DESCENT(g, val) ASET ((g), LGLYPH_IX_DESCENT, make_number (val))
|
|
#define LGLYPH_SET_ADJUSTMENT(g, val) ASET ((g), LGLYPH_IX_ADJUSTMENT, (val))
|
|
|
|
#define LGLYPH_XOFF(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \
|
|
? XINT (AREF (LGLYPH_ADJUSTMENT (g), 0)) : 0)
|
|
#define LGLYPH_YOFF(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \
|
|
? XINT (AREF (LGLYPH_ADJUSTMENT (g), 1)) : 0)
|
|
#define LGLYPH_WADJUST(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \
|
|
? XINT (AREF (LGLYPH_ADJUSTMENT (g), 2)) : 0)
|
|
|
|
extern Lisp_Object composition_gstring_put_cache (Lisp_Object, ptrdiff_t);
|
|
extern Lisp_Object composition_gstring_from_id (ptrdiff_t);
|
|
extern bool composition_gstring_p (Lisp_Object);
|
|
extern int composition_gstring_width (Lisp_Object, ptrdiff_t, ptrdiff_t,
|
|
struct font_metrics *);
|
|
|
|
extern void composition_compute_stop_pos (struct composition_it *,
|
|
ptrdiff_t, ptrdiff_t, ptrdiff_t,
|
|
Lisp_Object);
|
|
extern bool composition_reseat_it (struct composition_it *, ptrdiff_t,
|
|
ptrdiff_t, ptrdiff_t, struct window *,
|
|
struct face *, Lisp_Object);
|
|
extern int composition_update_it (struct composition_it *,
|
|
ptrdiff_t, ptrdiff_t, Lisp_Object);
|
|
|
|
extern ptrdiff_t composition_adjust_point (ptrdiff_t, ptrdiff_t);
|
|
|
|
INLINE_HEADER_END
|
|
|
|
#endif /* not EMACS_COMPOSITE_H */
|