diff options
| author | Andrew Innes | 2001-01-02 22:51:58 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-01-02 22:51:58 +0000 |
| commit | 959e5b0e3703f52a98df414f15cc0dc4f69fdaeb (patch) | |
| tree | 4a65e8da169fac90499e54a0ab5bda367be62315 /src | |
| parent | 4ec0d3c13babca2f0e8cce7aaa706926b1b5e1f4 (diff) | |
| download | emacs-959e5b0e3703f52a98df414f15cc0dc4f69fdaeb.tar.gz emacs-959e5b0e3703f52a98df414f15cc0dc4f69fdaeb.zip | |
(realize_default_face): Set face foreground and
background to unspecified for w32_console frames.
(realize_face): Realize face cache for w32_console frames.
(realize_tty_face): Accept w32_console frames.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 646db381e99..c510885254b 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -6198,7 +6198,9 @@ realize_default_face (f) | |||
| 6198 | LFACE_FOREGROUND (lface) = XCDR (color); | 6198 | LFACE_FOREGROUND (lface) = XCDR (color); |
| 6199 | else if (FRAME_WINDOW_P (f)) | 6199 | else if (FRAME_WINDOW_P (f)) |
| 6200 | return 0; | 6200 | return 0; |
| 6201 | else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) | 6201 | else if (FRAME_TERMCAP_P (f) |
| 6202 | || FRAME_MSDOS_P (f) | ||
| 6203 | || FRAME_W32_CONSOLE_P (f)) | ||
| 6202 | LFACE_FOREGROUND (lface) = build_string (unspecified_fg); | 6204 | LFACE_FOREGROUND (lface) = build_string (unspecified_fg); |
| 6203 | else | 6205 | else |
| 6204 | abort (); | 6206 | abort (); |
| @@ -6213,7 +6215,9 @@ realize_default_face (f) | |||
| 6213 | LFACE_BACKGROUND (lface) = XCDR (color); | 6215 | LFACE_BACKGROUND (lface) = XCDR (color); |
| 6214 | else if (FRAME_WINDOW_P (f)) | 6216 | else if (FRAME_WINDOW_P (f)) |
| 6215 | return 0; | 6217 | return 0; |
| 6216 | else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) | 6218 | else if (FRAME_TERMCAP_P (f) |
| 6219 | || FRAME_MSDOS_P (f) | ||
| 6220 | || FRAME_W32_CONSOLE_P (f)) | ||
| 6217 | LFACE_BACKGROUND (lface) = build_string (unspecified_bg); | 6221 | LFACE_BACKGROUND (lface) = build_string (unspecified_bg); |
| 6218 | else | 6222 | else |
| 6219 | abort (); | 6223 | abort (); |
| @@ -6300,7 +6304,9 @@ realize_face (cache, attrs, c, base_face, former_face_id) | |||
| 6300 | 6304 | ||
| 6301 | if (FRAME_WINDOW_P (cache->f)) | 6305 | if (FRAME_WINDOW_P (cache->f)) |
| 6302 | face = realize_x_face (cache, attrs, c, base_face); | 6306 | face = realize_x_face (cache, attrs, c, base_face); |
| 6303 | else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) | 6307 | else if (FRAME_TERMCAP_P (cache->f) |
| 6308 | || FRAME_MSDOS_P (cache->f) | ||
| 6309 | || FRAME_W32_CONSOLE_P (cache->f)) | ||
| 6304 | face = realize_tty_face (cache, attrs, c); | 6310 | face = realize_tty_face (cache, attrs, c); |
| 6305 | else | 6311 | else |
| 6306 | abort (); | 6312 | abort (); |
| @@ -6652,11 +6658,14 @@ realize_tty_face (cache, attrs, c) | |||
| 6652 | struct frame *f = cache->f; | 6658 | struct frame *f = cache->f; |
| 6653 | 6659 | ||
| 6654 | /* Frame must be a termcap frame. */ | 6660 | /* Frame must be a termcap frame. */ |
| 6655 | xassert (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)); | 6661 | xassert (FRAME_TERMCAP_P (cache->f) |
| 6662 | || FRAME_MSDOS_P (cache->f) | ||
| 6663 | || FRAME_W32_CONSOLE_P (cache->f)); | ||
| 6656 | 6664 | ||
| 6657 | /* Allocate a new realized face. */ | 6665 | /* Allocate a new realized face. */ |
| 6658 | face = make_realized_face (attrs); | 6666 | face = make_realized_face (attrs); |
| 6659 | face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty"; | 6667 | face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" |
| 6668 | : FRAME_W32_CONSOLE_P (cache->f) ? "w32console" : "tty"; | ||
| 6660 | 6669 | ||
| 6661 | /* Map face attributes to TTY appearances. We map slant to | 6670 | /* Map face attributes to TTY appearances. We map slant to |
| 6662 | dimmed text because we want italic text to appear differently | 6671 | dimmed text because we want italic text to appear differently |