diff options
| author | Andrew Innes | 2001-01-02 22:50:34 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-01-02 22:50:34 +0000 |
| commit | 4ec0d3c13babca2f0e8cce7aaa706926b1b5e1f4 (patch) | |
| tree | c8728111380a414c74484019d32712f1e6d66027 | |
| parent | c513fb07a3d517e3b64ba6ddbb0c875420e81a9e (diff) | |
| download | emacs-4ec0d3c13babca2f0e8cce7aaa706926b1b5e1f4.tar.gz emacs-4ec0d3c13babca2f0e8cce7aaa706926b1b5e1f4.zip | |
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
use output_w32_console method.
(Qw32_console): New Lisp_Object.
(Fframep): Return it.
(syms_of_frame): Init it.
(Fframe_parameters): Report w32console as font for w32_console
frames.
| -rw-r--r-- | src/frame.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index f07254dcfed..ad71eb76f38 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -62,6 +62,7 @@ Lisp_Object Qtool_bar_lines; | |||
| 62 | Lisp_Object Qwidth; | 62 | Lisp_Object Qwidth; |
| 63 | Lisp_Object Qx; | 63 | Lisp_Object Qx; |
| 64 | Lisp_Object Qw32; | 64 | Lisp_Object Qw32; |
| 65 | Lisp_Object Qw32_console; | ||
| 65 | Lisp_Object Qpc; | 66 | Lisp_Object Qpc; |
| 66 | Lisp_Object Qmac; | 67 | Lisp_Object Qmac; |
| 67 | Lisp_Object Qvisible; | 68 | Lisp_Object Qvisible; |
| @@ -166,6 +167,8 @@ See also `frame-live-p'.") | |||
| 166 | return Qx; | 167 | return Qx; |
| 167 | case output_w32: | 168 | case output_w32: |
| 168 | return Qw32; | 169 | return Qw32; |
| 170 | case output_w32_console: | ||
| 171 | return Qw32_console; | ||
| 169 | case output_msdos_raw: | 172 | case output_msdos_raw: |
| 170 | return Qpc; | 173 | return Qpc; |
| 171 | case output_mac: | 174 | case output_mac: |
| @@ -483,11 +486,16 @@ make_terminal_frame () | |||
| 483 | else | 486 | else |
| 484 | f->output_method = output_termcap; | 487 | f->output_method = output_termcap; |
| 485 | #else | 488 | #else |
| 489 | #ifdef WINDOWSNT | ||
| 490 | f->output_method = output_w32_console; | ||
| 491 | f->output_data.x = &tty_display; | ||
| 492 | #else | ||
| 486 | #ifdef macintosh | 493 | #ifdef macintosh |
| 487 | make_mac_terminal_frame (f); | 494 | make_mac_terminal_frame (f); |
| 488 | #else | 495 | #else |
| 489 | f->output_data.x = &tty_display; | 496 | f->output_data.x = &tty_display; |
| 490 | #endif /* macintosh */ | 497 | #endif /* macintosh */ |
| 498 | #endif /* WINDOWSNT */ | ||
| 491 | #endif /* MSDOS */ | 499 | #endif /* MSDOS */ |
| 492 | 500 | ||
| 493 | if (!noninteractive) | 501 | if (!noninteractive) |
| @@ -1993,7 +2001,9 @@ If FRAME is omitted, return information on the currently selected frame.") | |||
| 1993 | store_in_alist (&alist, intern ("font"), | 2001 | store_in_alist (&alist, intern ("font"), |
| 1994 | build_string (FRAME_MSDOS_P (f) | 2002 | build_string (FRAME_MSDOS_P (f) |
| 1995 | ? "ms-dos" | 2003 | ? "ms-dos" |
| 1996 | : FRAME_W32_P (f) ? "w32term" : "tty")); | 2004 | : FRAME_W32_P (f) ? "w32term" |
| 2005 | : FRAME_W32_CONSOLE_P (f) ? "w32console" | ||
| 2006 | :"tty")); | ||
| 1997 | } | 2007 | } |
| 1998 | store_in_alist (&alist, Qname, f->name); | 2008 | store_in_alist (&alist, Qname, f->name); |
| 1999 | height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); | 2009 | height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); |
| @@ -2417,6 +2427,8 @@ syms_of_frame () | |||
| 2417 | staticpro (&Qx); | 2427 | staticpro (&Qx); |
| 2418 | Qw32 = intern ("w32"); | 2428 | Qw32 = intern ("w32"); |
| 2419 | staticpro (&Qw32); | 2429 | staticpro (&Qw32); |
| 2430 | Qw32_console = intern ("w32-console"); | ||
| 2431 | staticpro (&Qw32_console); | ||
| 2420 | Qpc = intern ("pc"); | 2432 | Qpc = intern ("pc"); |
| 2421 | staticpro (&Qpc); | 2433 | staticpro (&Qpc); |
| 2422 | Qmac = intern ("mac"); | 2434 | Qmac = intern ("mac"); |