}
DEFUN ("valid-console-type-p", Fvalid_console_type_p, 1, 1, 0, /*
-Given a CONSOLE-TYPE, return t if it is valid.
+Return t if CONSOLE-TYPE is a valid console type.
Valid types are 'x, 'tty, and 'stream.
*/
(console_type))
Given a console, device, frame, or window, return the associated console.
Return nil otherwise.
*/
- (obj))
+ (object))
{
- return CDFW_CONSOLE (obj);
+ return CDFW_CONSOLE (object);
}
\f
Vwindow_system = Qx;
else
#endif
+#ifdef HAVE_GTK
+ if (CONSOLE_GTK_P (XCONSOLE (console)))
+ Vwindow_system = Qgtk;
+ else
+#endif
#ifdef HAVE_MS_WINDOWS
if (CONSOLE_MSWINDOWS_P (XCONSOLE (console)))
Vwindow_system = Qmswindows;
}
DEFUN ("console-type", Fconsole_type, 0, 1, 0, /*
-Return the type of the specified console (e.g. `x' or `tty').
+Return the console type (e.g. `x' or `tty') of CONSOLE.
Value is `tty' for a tty console (a character-only terminal),
`x' for a console that is an X display,
`mswindows' for a console that is a Windows NT/95/97 connection,
}
DEFUN ("console-name", Fconsole_name, 0, 1, 0, /*
-Return the name of the specified console.
+Return the name of CONSOLE.
*/
(console))
{
DEFUN ("console-device-list", Fconsole_device_list, 0, 1, 0, /*
Return a list of all devices on CONSOLE.
-If CONSOLE is nil, the selected console will be used.
+If CONSOLE is nil, the selected console is used.
*/
(console))
{
}
DEFUN ("console-on-window-system-p", Fconsole_on_window_system_p, 0, 1, 0, /*
-Return non-nil if this console is on a window system.
+Return t if CONSOLE is on a window system.
+If CONSOLE is nil, the selected console is used.
This generally means that there is support for the mouse, the menubar,
the toolbar, glyphs, etc.
*/
stuff_buffered_input (Lisp_Object stuffstring)
{
/* stuff_char works only in BSD, versions 4.2 and up. */
-#if defined (BSD)
+#if defined (BSD) && defined(HAVE_TTY)
if (!CONSOLEP (Vcontrolling_terminal) ||
!CONSOLE_LIVE_P (XCONSOLE (Vcontrolling_terminal)))
return;
stuff_char (XCONSOLE (Vcontrolling_terminal), *kbd_fetch_ptr++);
}
# endif
-#endif /* BSD */
+#endif /* BSD && HAVE_TTY */
}
DEFUN ("suspend-console", Fsuspend_console, 0, 1, "", /*
TTY_FLAGS (con).flow_control = !NILP (flow);
TTY_FLAGS (con).meta_key = meta_key;
init_one_console (con);
+ MARK_FRAME_CHANGED (XFRAME (CONSOLE_SELECTED_FRAME (con)));
}
#endif
void
syms_of_console (void)
{
+ INIT_LRECORD_IMPLEMENTATION (console);
+
DEFSUBR (Fvalid_console_type_p);
DEFSUBR (Fconsole_type_list);
DEFSUBR (Fcdfw_console);
console_type_create (void)
{
the_console_type_entry_dynarr = Dynarr_new (console_type_entry);
- dumpstruct(&the_console_type_entry_dynarr, &cted_description);
+ dump_add_root_struct_ptr (&the_console_type_entry_dynarr, &cted_description);
Vconsole_type_list = Qnil;
staticpro (&Vconsole_type_list);
}
/* The docstrings for DEFVAR_* are recorded externally by make-docfile. */
-
-/* Declaring this stuff as const produces 'Cannot reinitialize' messages
- from SunPro C's fix-and-continue feature (a way neato feature that
- makes debugging unbelievably more bearable) */
#define DEFVAR_CONSOLE_LOCAL_1(lname, field_name, forward_type, magicfun) do { \
- static CONST_IF_NOT_DEBUG struct symbol_value_forward I_hate_C \
- = { { { symbol_value_forward_lheader_initializer, \
- (struct lcrecord_header *) &(console_local_flags.field_name), 69 }, \
- forward_type }, magicfun }; \
+ static const struct symbol_value_forward I_hate_C = \
+ { /* struct symbol_value_forward */ \
+ { /* struct symbol_value_magic */ \
+ { /* struct lcrecord_header */ \
+ { /* struct lrecord_header */ \
+ lrecord_type_symbol_value_forward, /* lrecord_type_index */ \
+ 1, /* mark bit */ \
+ 1, /* c_readonly bit */ \
+ 1 /* lisp_readonly bit */ \
+ }, \
+ 0, /* next */ \
+ 0, /* uid */ \
+ 0 /* free */ \
+ }, \
+ &(console_local_flags.field_name), \
+ forward_type \
+ }, \
+ magicfun \
+ }; \
+ \
{ \
int offset = ((char *)symbol_value_forward_forward (&I_hate_C) \
- (char *)&console_local_flags); \
syms = XCONSOLE (Vconsole_local_symbols);
console_defaults_saved_slots = &defs->CONSOLE_SLOTS_FIRST_NAME;
console_local_symbols_saved_slots = &syms->CONSOLE_SLOTS_FIRST_NAME;
- dumpstruct (&console_defaults_saved_slots, &console_slots_description);
- dumpstruct (&console_local_symbols_saved_slots, &console_slots_description);
+ dump_add_root_struct_ptr (&console_defaults_saved_slots, &console_slots_description);
+ dump_add_root_struct_ptr (&console_local_symbols_saved_slots, &console_slots_description);
DEFVAR_CONSOLE_DEFAULTS ("default-function-key-map", function_key_map /*
Default value of `function-key-map' for consoles that don't override it.
keymaps have no binding for the current key sequence but
`function-key-map' binds a suffix of the sequence to a vector or string,
`read-key-sequence' replaces the matching suffix with its binding, and
-continues with the new sequence.
+continues with the new sequence. See `key-binding'.
The events that come from bindings in `function-key-map' are not
themselves looked up in `function-key-map'.
*/ );
#endif
- /* While this should be CONST it can't be because some things
+ /* While this should be const it can't be because some things
(i.e. edebug) do manipulate it. */
DEFVAR_CONSOLE_LOCAL ("defining-kbd-macro", defining_kbd_macro /*
-Non-nil while a console macro is being defined. Don't set this!
+Non-nil while a keyboard macro is being defined. Don't set this!
*/ );
DEFVAR_CONSOLE_LOCAL ("last-kbd-macro", last_kbd_macro /*
-Last kbd macro defined, as a vector of events; nil if none defined.
+Last keyboard macro defined, as a vector of events; nil if none defined.
*/ );
DEFVAR_CONSOLE_LOCAL ("prefix-arg", prefix_arg /*
if ((XINT (console_local_flags.slot) != -2 && \
XINT (console_local_flags.slot) != -3) \
!= !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))) \
- abort ()
+ ABORT ()
#include "conslots.h"
#undef MARKED_SLOT
}
projects / chise / xemacs-chise.git.1 / blobdiff