#include "faces.h"
#include "frame.h"
#include "lstream.h"
-#include "redisplay.h"
+#include "glyphs.h"
#include "sysdep.h"
#include "sysfile.h"
#ifdef FILE_CODING
#include "file-coding.h"
#endif
-#ifdef HAVE_GPM
-#include "gpmevent.h"
-#endif
DEFINE_CONSOLE_TYPE (tty);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (string);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (formatted_string);
+DECLARE_IMAGE_INSTANTIATOR_FORMAT (inherit);
Lisp_Object Qterminal_type;
Lisp_Object Qcontrolling_process;
tty_con->terminal_type = terminal_type;
tty_con->controlling_process = controlling_process;
-#ifdef HAVE_GPM
- connect_to_gpm (con);
-#endif
-
if (NILP (CONSOLE_NAME (con)))
CONSOLE_NAME (con) = Ffile_name_nondirectory (tty);
{
}
static void
-tty_mark_console (struct console *con, void (*markobj) (Lisp_Object))
+tty_mark_console (struct console *con)
{
struct tty_console *tty_con = CONSOLE_TTY_DATA (con);
- ((markobj) (tty_con->terminal_type));
- ((markobj) (tty_con->instream));
- ((markobj) (tty_con->outstream));
+ mark_object (tty_con->terminal_type);
+ mark_object (tty_con->instream);
+ mark_object (tty_con->outstream);
}
static int
return CONSOLE_TTY_DATA (decode_tty_console (console))->controlling_process;
}
-#ifdef MULE
+#ifdef FILE_CODING
\f
DEFUN ("console-tty-input-coding-system", Fconsole_tty_input_coding_system,
0, 1, 0, /*
set_encoding_stream_coding_system
(XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->outstream),
Fget_coding_system (NILP (codesys) ? Vterminal_coding_system : codesys));
+ /* Redraw tty */
+ face_property_was_changed (Vdefault_face, Qfont, Qtty);
return Qnil;
}
Fset_console_tty_output_coding_system (console, codesys);
return Qnil;
}
-#endif /* MULE */
+#endif /* FILE_CODING */
\f
Lisp_Object
DEFSUBR (Fconsole_tty_controlling_process);
defsymbol (&Qterminal_type, "terminal-type");
defsymbol (&Qcontrolling_process, "controlling-process");
-#ifdef MULE
+#ifdef FILE_CODING
DEFSUBR (Fconsole_tty_output_coding_system);
DEFSUBR (Fset_console_tty_output_coding_system);
DEFSUBR (Fconsole_tty_input_coding_system);
DEFSUBR (Fset_console_tty_input_coding_system);
DEFSUBR (Fset_console_tty_coding_system);
-#endif /* MULE */
+#endif /* FILE_CODING */
}
void
}
void
+reinit_console_type_create_tty (void)
+{
+ REINITIALIZE_CONSOLE_TYPE (tty);
+}
+
+void
+image_instantiator_format_create_glyphs_tty (void)
+{
+ IIFORMAT_VALID_CONSOLE (tty, nothing);
+ IIFORMAT_VALID_CONSOLE (tty, string);
+ IIFORMAT_VALID_CONSOLE (tty, formatted_string);
+ IIFORMAT_VALID_CONSOLE (tty, inherit);
+}
+
+void
vars_of_console_tty (void)
{
Fprovide (Qtty);