1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-10 23:31:19 -07:00

(COMPOSITION_DECODE_RULE): New arg xoff and yoff.

(struct composition): New member lbearing and rbearing.
This commit is contained in:
Kenichi Handa 2004-01-23 08:48:19 +00:00
parent 993651d1a0
commit 28d0edc75d

View file

@ -127,13 +127,19 @@ extern Lisp_Object composition_temp;
->contents[(n) * 2 - 1])
/* Decode encoded composition rule RULE_CODE into GREF (global
reference point code) and NREF (new reference point code). Don't
check RULE_CODE, always set GREF and NREF to valid values. */
#define COMPOSITION_DECODE_RULE(rule_code, gref, nref) \
do { \
gref = (rule_code) / 12; \
if (gref > 12) gref = 11; \
nref = (rule_code) % 12; \
reference point code), NREF (new reference point code), XOFF
(horizontal offset) YOFF (vertical offset). Don't check RULE_CODE,
always set GREF and NREF to valid values. By side effect,
RULE_CODE is modified. */
#define COMPOSITION_DECODE_RULE(rule_code, gref, nref, xoff, yoff) \
do { \
xoff = (rule_code) >> 16; \
yoff = ((rule_code) >> 8) & 0xFF; \
rule_code &= 0xFF; \
gref = (rule_code) / 12; \
if (gref > 12) gref = 11; \
nref = (rule_code) % 12; \
} while (0)
/* Return encoded composition rule for the pair of global reference
@ -160,6 +166,8 @@ struct composition {
/* 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. */