extern int quit_char;
-#include "screen.h"
+#include "frame.h"
#include "window.h"
#include "termhooks.h"
#include "termchar.h"
setpgrp_of_tty (pid)
int pid;
{
- EMACS_SET_TTY_PGRP (input_fd, pid);
+ EMACS_SET_TTY_PGRP (input_fd, &pid);
}
/* Record a signal code and the handler for it. */
{
while (saved_handlers->code)
{
- saved_handlers->handler = signal (saved_handlers->code, SIG_IGN);
+ saved_handlers->handler
+ = (SIGTYPE (*) ()) signal (saved_handlers->code, SIG_IGN);
saved_handlers++;
}
}
request_sigio ()
{
#ifdef SIGWINCH
- {
- int dummy;
-
- EMACS_SIGUNBLOCKX (SIGWINCH, dummy);
- }
+ sigunblock (sigmask (SIGWINCH));
#endif
fcntl (0, F_SETFL, old_fcntl_flags | FASYNC);
unrequest_sigio ()
{
#ifdef SIGWINCH
- {
- int dummy;
-
- EMACS_SIGBLOCK (SIGWINCH, dummy);
- }
+ sigblock (sigmask (SIGWINCH));
#endif
fcntl (0, F_SETFL, old_fcntl_flags);
interrupts_deferred = 1;
EMACS_SET_TTY (input_fd, &tty, 0);
/* This code added to insure that, if flow-control is not to be used,
- we have an unlocked screen at the start. */
+ we have an unlocked terminal at the start. */
#ifdef TCXONC
if (!flow_control) ioctl (0, TCXONC, 1);
}
else
{
- screen_garbaged = 1;
-#ifdef MULTI_SCREEN
- if (SCREENP (Vterminal_screen))
- SCREEN_GARBAGED_P (XSCREEN (Vterminal_screen)) = 1;
+ frame_garbaged = 1;
+#ifdef MULTI_FRAME
+ if (FRAMEP (Vterminal_frame))
+ FRAME_GARBAGED_P (XFRAME (Vterminal_frame)) = 1;
#endif
}
Store number of lines into *heightp and width into *widthp.
If zero or a negative number is stored, the value is not valid. */
-get_screen_size (widthp, heightp)
+get_frame_size (widthp, heightp)
int *widthp, *heightp;
{
\f
/* Prepare the terminal for exiting Emacs; move the cursor to the
- bottom of the screen, turn off interrupt-driven I/O, etc. */
+ bottom of the frame, turn off interrupt-driven I/O, etc. */
reset_sys_modes ()
{
if (noninteractive)
return;
if (read_socket_hook || !EQ (Vwindow_system, Qnil))
return;
- cursor_to (SCREEN_HEIGHT (selected_screen) - 1, 0);
- clear_end_of_line (SCREEN_WIDTH (selected_screen));
+ cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0);
+ clear_end_of_line (FRAME_WIDTH (selected_frame));
/* clear_end_of_line may move the cursor */
- cursor_to (SCREEN_HEIGHT (selected_screen) - 1, 0);
+ cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0);
#ifdef IBMR2AIX
{
/* HFT devices normally use ^J as a LF/CR. We forced it to
{
register int c = -1;
int old_errno = errno;
- extern int *input_available_clear_word;
+ extern EMACS_TIME *input_available_clear_time;
if (waiting_for_ast)
SYS$SETEF (input_ef);
struct input_event e;
e.kind = ascii_keystroke;
XSET (buf[i].code, Lisp_Int, cbuf[i]);
- e.screen = selected_screen;
+ e.frame = selected_frame;
kbd_buffer_store_event (&e);
}
- if (input_available_clear_word)
- *input_available_clear_word = 0;
+ if (input_available_clear_time)
+ EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
errno = old_errno;
}
/* Scan the chars for C-g and store them in kbd_buffer. */
e.kind = ascii_keystroke;
- e.screen = selected_screen;
+ e.frame = selected_frame;
for (i = 0; i < nread; i++)
{
XSET (e.code, Lisp_Int, buf[i]);
sigemptyset (&new_action.sa_mask);
new_action.sa_handler = action;
new_action.sa_flags = NULL;
- new_action (signal_number, &new_action, &old_action);
+ sigaction (signal_number, &new_action, &old_action);
return (old_action.sa_handler);
#endif /* DGUX */
}
+#ifndef __GNUC__
+/* If we're compiling with GCC, we don't need this function, since it
+ can be written as a macro. */
+sigset_t
+sys_sigmask (int sig)
+{
+ sigset_t mask;
+ sigemptyset (&mask);
+ sigaddset (&mask, sig);
+ return mask;
+}
+#endif
+
int
sys_sigpause (sigset_t new_mask)
{
stat = sys$dassgn (chan);
if (!stat)
lib$signal (stat);
- strcpy (vms_file_written, to_esn); /* We will write this to the screen*/
+ strcpy (vms_file_written, to_esn); /* We will write this to the terminal*/
return 0;
}