comparison src/dispextern.h @ 89697:e3cedd99e51a

(FACE_FOR_CHAR): New args POS and OBJECT.
author Kenichi Handa <handa@m17n.org>
date Tue, 13 Jan 2004 01:34:56 +0000
parents 2f877ed80fa6
children 68c22ea6027c
comparison
equal deleted inserted replaced
89696:087079a5791b 89697:e3cedd99e51a
1538 1538
1539 /* Return the id of the realized face on frame F that is like the face 1539 /* Return the id of the realized face on frame F that is like the face
1540 with id ID but is suitable for displaying character CHAR. 1540 with id ID but is suitable for displaying character CHAR.
1541 This macro is only meaningful for multibyte character CHAR. */ 1541 This macro is only meaningful for multibyte character CHAR. */
1542 1542
1543 #define FACE_FOR_CHAR(F, FACE, CHAR) \ 1543 #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \
1544 (ASCII_CHAR_P (CHAR) \ 1544 (ASCII_CHAR_P (CHAR) \
1545 ? (FACE)->ascii_face->id \ 1545 ? (FACE)->ascii_face->id \
1546 : face_for_char ((F), (FACE), (CHAR))) 1546 : face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT)))
1547 1547
1548 #else /* not HAVE_WINDOW_SYSTEM */ 1548 #else /* not HAVE_WINDOW_SYSTEM */
1549 1549
1550 #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1 1550 #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1
1551 #define FACE_FOR_CHAR(F, FACE, CHAR) ((FACE)->id) 1551 #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) ((FACE)->id)
1552 1552
1553 #endif /* not HAVE_WINDOW_SYSTEM */ 1553 #endif /* not HAVE_WINDOW_SYSTEM */
1554 1554
1555 /* Non-zero means face attributes have been changed since the last 1555 /* Non-zero means face attributes have been changed since the last
1556 redisplay. Used in redisplay_internal. */ 1556 redisplay. Used in redisplay_internal. */