diff options
| author | Eli Zaretskii | 1999-12-15 13:14:38 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 1999-12-15 13:14:38 +0000 |
| commit | f9d2fdc464f130fbde700cecc00c031ef7e8e4f2 (patch) | |
| tree | 2102159b730a603bb26d4e7d5162211d958058d7 /src/dispextern.h | |
| parent | e19539f184768f9411860daf9ef9d983e48e2650 (diff) | |
| download | emacs-f9d2fdc464f130fbde700cecc00c031ef7e8e4f2.tar.gz emacs-f9d2fdc464f130fbde700cecc00c031ef7e8e4f2.zip | |
Changes for separate unspecified foreground and background colors
on character terminals:
* dispextern.h (FACE_TTY_DEFAULT_FG_COLOR)
(FACE_TTY_DEFAULT_BG_COLOR): New macros.
* xfaces.c (Qunspecified_fg, Qunspecified_bg): New variables.
(syms_of_xfaces): Initialize and staticpro them.
(tty_defined_color): If the color name is unspecified-fg or
unspecified-bg, return FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, respectively, as the pixel value.
(tty_color_name): If the color pixel value is either
FACE_TTY_DEFAULT_FG_COLOR or FACE_TTY_DEFAULT_BG_COLOR, return
Qunspecified_fg or Qunspecified_bg, respectively.
(Finternal_set_lisp_face_attribute): Allow values Qunspecified_fg
and Qunspecified_bg for foreground and background colors.
(realize_default_face): If the foreground and background colors
are not specified, default to Qunspecified_fg and Qunspecified_bg.
(realize_tty_face): By default, set the face colors to
FACE_TTY_DEFAULT_FG_COLOR and FACE_TTY_DEFAULT_BG_COLOR.
[MSDOS]: Handle FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR when face colors are not defined.
Reverse the colors if the default colors were reversed.
* dispnew.c (init_display): Initialize the frame pixels of the
initial frame to FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR.
* term.c (turn_on_face): If the default fore- and background
colors are reversed, enter inverse video mode. Don't send color
escape sequences for unspecified foreground and background colors.
(turn_off_face): Handle unspecified-fg and unspecified-bg colors.
* dosfns.c (unspecified_colors): New variable.
(msdos_stdcolor_idx): Handle unspecified-fg and unspecified-bg
color names, return FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, respectively.
(msdos_stdcolor_name): Handle FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, return Qunspecified_fg and
Qunspecified_bg, respectively.
* msdos.c (IT_set_face): Support FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR as pixel values.
* faces.el (face-read-integer, read-face-attribute)
(color-defined-p, color-values): Allow color values unspecified-fg
and unspecified-bg, handle them as unspecified.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index edd9a7c97be..eadf745d400 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -1268,6 +1268,14 @@ struct face | |||
| 1268 | 1268 | ||
| 1269 | #define FACE_TTY_DEFAULT_COLOR ((unsigned long) -1) | 1269 | #define FACE_TTY_DEFAULT_COLOR ((unsigned long) -1) |
| 1270 | 1270 | ||
| 1271 | /* Color index indicating that face uses an unknown foreground color. */ | ||
| 1272 | |||
| 1273 | #define FACE_TTY_DEFAULT_FG_COLOR ((unsigned long) -2) | ||
| 1274 | |||
| 1275 | /* Color index indicating that face uses an unsigned background color. */ | ||
| 1276 | |||
| 1277 | #define FACE_TTY_DEFAULT_BG_COLOR ((unsigned long) -3) | ||
| 1278 | |||
| 1271 | /* Non-zero if FACE was realized for unibyte use. */ | 1279 | /* Non-zero if FACE was realized for unibyte use. */ |
| 1272 | 1280 | ||
| 1273 | #define FACE_UNIBYTE_P(FACE) ((FACE)->charset < 0) | 1281 | #define FACE_UNIBYTE_P(FACE) ((FACE)->charset < 0) |