emacs: src/sysdep.c comparison

comparison src/sysdep.c @ 83065:a871be7b26a5

Implemented suspending of emacsclient frames. lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument. (unquote_argument, handle_sigcont, handle_sigtstp): New functions. (out, in): New global variables for communicating with the Emacs process. (init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU. (main): Changed out and in to global variables. Prepend `-eval' or '-file' to each argument. Use fsync to force sending the strings to Emacs. Removed obsolete -bad-version code. Support the -suspend command. Cleaned up newline handling. lisp/frame.el (suspend-frame): New function. Substitute key definition of suspend-emacs with suspend-frame. lisp/server.el (server-log): Cosmetic change in log format. (server-handle-delete-tty, server-handle-delete-frame): Added logging. (server-handle-suspend-tty, server-quote-arg): New functions. (server-start): Install server-handle-suspend-tty. (server-process-filter): Reorganized source code for clarity. Implemented -resume, -suspend and -ignore commands. lisp/term/x-win.el (x-initialize-window-system): Don't change the binding of C-z. src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with their macro expansion. src/dispnew.c: Ditto. src/frame.c: Ditto. src/keyboard.c: Ditto. src/sysdep.c: Ditto. src/keyboard.c (tty_read_avail_input): Don't read if the terminal is suspended. src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto. src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto. src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks. (syms_of_term): Defvar them. (term_init): Don't allow opening a new frame on a suspended tty device. (Fsuspend_tty, Fresume_tty): New functions. (syms_of_term): Defsubr them. src/termchar.c (struct tty_display_info): Update documentation of input and output. (TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105

author	Karoly Lorentey <lorentey@elte.hu>
date	Sat, 28 Feb 2004 01:23:39 +0000
parents	03a73693678e
children	b44978264e1d

comparison

equal deleted inserted replaced

-:e7e9448cb3a0
+:a871be7b26a5
 if (noninteractive)
 return;
 #ifdef VMS
 end_kbd_input ();
-SYS$QIOW (0, fileno (TTY_INPUT (CURTTY())), IO$_READVBLK|IO$M_PURGE, input_iosb, 0, 0,
+SYS$QIOW (0, fileno (CURTTY()->input), IO$_READVBLK|IO$M_PURGE, input_iosb, 0, 0,
 	    &buf.main, 0, 0, terminator_mask, 0, 0);
 queue_kbd_input ();
 #else /* not VMS */
 #ifdef APOLLO
 {
 struct tty_display_info *tty;
 for (tty = tty_list; tty; tty = tty->next)
 {
 int zero = 0;
-ioctl (fileno (TTY_INPUT (tty)), TIOCFLUSH, &zero);
+if (tty->input)
+ioctl (fileno (tty->input), TIOCFLUSH, &zero);
 }
 }
 #else /* not Apollo */
 #ifdef MSDOS    /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
 while (dos_keyread () != -1)
 #else /* not MSDOS */
 {
 struct tty_display_info *tty;
 for (tty = tty_list; tty; tty = tty->next)
 {
-EMACS_GET_TTY (fileno (TTY_INPUT (tty)), &buf);
+if (tty->input)         /* Is the device suspended? */
-EMACS_SET_TTY (fileno (TTY_INPUT (tty)), &buf, 0);
+{
+EMACS_GET_TTY (fileno (tty->input), &buf);
+EMACS_SET_TTY (fileno (tty->input), &buf, 0);
+}
 }
 }
 #endif /* not MSDOS */
 #endif /* not Apollo */
 #endif /* not VMS */
 if (! FRAME_TERMCAP_P (SELECTED_FRAME ()))
 return;
 /* Should perhaps error if in batch mode */
 #ifdef TIOCSTI
-ioctl (fileno (TTY_INPUT (CURTTY())), TIOCSTI, &c);
+ioctl (fileno (CURTTY()->input), TIOCSTI, &c);
 #else /* no TIOCSTI */
 error ("Cannot stuff terminal input characters in this version of Unix");
 #endif /* no TIOCSTI */
 }
 if (read_socket_hook)
 return;
 /* XXX CURTTY() is bogus here. */
-ioctl (fileno (TTY_INPUT (CURTTY ())), FIOASYNC, &on);
+ioctl (fileno (CURTTY ()->input), FIOASYNC, &on);
 interrupts_deferred = 0;
 }
 void
 unrequest_sigio ()
 if (read_socket_hook)
 return;
 /* XXX CURTTY() is bogus here. */
-ioctl (fileno (TTY_INPUT (CURTTY ())), FIOASYNC, &off);
+ioctl (fileno (CURTTY ()->input), FIOASYNC, &off);
 interrupts_deferred = 1;
 }
 #else /* not FASYNC, not STRIDE */
 Vtty_erase_char = Qnil;
 if (noninteractive)
 return;
+if (!tty_out->output)
+return;                     /* The tty is suspended. */
 #ifdef VMS
 if (!input_ef)
 input_ef = get_kbd_event_flag ();
 /* LIB$GET_EF (&input_ef); */
 SYS$CLREF (input_ef);
 #if 0
 /* read_socket_hook is not global anymore.  I think doing this
 unconditionally will not cause any problems. */
 if (! read_socket_hook && EQ (Vinitial_window_system, Qnil))
 #endif
-narrow_foreground_group (fileno (TTY_INPUT (tty_out)));
+narrow_foreground_group (fileno (tty_out->input));
 #endif
 if (! tty_out->old_tty)
 tty_out->old_tty = (struct emacs_tty *) xmalloc (sizeof (struct emacs_tty));
-EMACS_GET_TTY (fileno (TTY_INPUT (tty_out)), tty_out->old_tty);
+EMACS_GET_TTY (fileno (tty_out->input), tty_out->old_tty);
 tty = *tty_out->old_tty;
 #if defined (HAVE_TERMIO) || defined (HAVE_TERMIOS)
 XSETINT (Vtty_erase_char, tty.main.c_cc[VERASE]);
 if (!tty_out->term_initted)
 internal_terminal_init ();
 dos_ttraw ();
 #endif
-EMACS_SET_TTY (fileno (TTY_INPUT (tty_out)), &tty, 0);
+EMACS_SET_TTY (fileno (tty_out->input), &tty, 0);
 /* This code added to insure that, if flow-control is not to be used,
 we have an unlocked terminal at the start. */
 #ifdef TCXONC
-if (!tty_out->flow_control) ioctl (fileno (TTY_INPUT (tty_out)), TCXONC, 1);
+if (!tty_out->flow_control) ioctl (fileno (tty_out->input), TCXONC, 1);
 #endif
 #ifndef APOLLO
 #ifdef TIOCSTART
-if (!tty_out->flow_control) ioctl (fileno (TTY_INPUT (tty_out)), TIOCSTART, 0);
+if (!tty_out->flow_control) ioctl (fileno (tty_out->input), TIOCSTART, 0);
 #endif
 #endif
 #if defined (HAVE_TERMIOS) || defined (HPUX9)
 #ifdef TCOON
-if (!tty_out->flow_control) tcflow (fileno (TTY_INPUT (tty_out)), TCOON);
+if (!tty_out->flow_control) tcflow (fileno (tty_out->input), TCOON);
 #endif
 #endif
 #ifdef AIXHFT
 hft_init (tty_out);
 #endif
 #endif /* AIXHFT */
 #ifdef VMS
 /*  Appears to do nothing when in PASTHRU mode.
-SYS$QIOW (0, fileno (TTY_INPUT (tty_out)), IO$_SETMODE|IO$M_OUTBAND, 0, 0, 0,
+SYS$QIOW (0, fileno (tty_out->input), IO$_SETMODE|IO$M_OUTBAND, 0, 0, 0,
 		interrupt_signal, oob_chars, 0, 0, 0, 0);
 */
 queue_kbd_input (0);
 #endif /* VMS */
 #ifdef F_SETFL
 #ifndef F_SETOWN_BUG
 #ifdef F_GETOWN		/* F_SETFL does not imply existence of F_GETOWN */
 if (interrupt_input)
 {
-old_fcntl_owner[fileno (TTY_INPUT (tty_out))] =
+old_fcntl_owner[fileno (tty_out->input)] =
-fcntl (fileno (TTY_INPUT (tty_out)), F_GETOWN, 0);
+fcntl (fileno (tty_out->input), F_GETOWN, 0);
-fcntl (fileno (TTY_INPUT (tty_out)), F_SETOWN, getpid ());
+fcntl (fileno (tty_out->input), F_SETOWN, getpid ());
-init_sigio (fileno (TTY_INPUT (tty_out)));
+init_sigio (fileno (tty_out->input));
 }
 #endif /* F_GETOWN */
 #endif /* F_SETOWN_BUG */
 #endif /* F_SETFL */
 #ifdef BSD4_1
 if (interrupt_input)
-init_sigio (fileno (TTY_INPUT (tty_out)));
+init_sigio (fileno (tty_out->input));
 #endif
 #ifdef VMS  /* VMS sometimes has this symbol but lacks setvbuf.  */
 #undef _IOFBF
 #endif
 #ifdef _IOFBF
 /* This symbol is defined on recent USG systems.
 Someone says without this call USG won't really buffer the file
 even with a call to setbuf. */
-setvbuf (TTY_OUTPUT (tty_out), (char *) _sobuf, _IOFBF, sizeof _sobuf);
+setvbuf (tty_out->output, (char *) _sobuf, _IOFBF, sizeof _sobuf);
 #else
-setbuf (TTY_OUTPUT (tty_out), (char *) _sobuf);
+setbuf (tty_out->output, (char *) _sobuf);
 #endif
 tty_set_terminal_modes (tty_out->display);
 if (!tty_out->term_initted)
 return;
 }
 if (!tty_out->term_initted)
 return;
+if (!tty_out->output)
+return;                     /* The tty is suspended. */
 /* Go to and clear the last line of the terminal. */
 cmgoto (tty_out, FrameRows (tty_out) - 1, 0);
 /* Code adapted from tty_clear_end_of_line. */
 if (tty_out->TS_clr_line)
 {
 emacs_tputs (tty_out, tty_out->TS_clr_line, 1, cmputc);
 }
 else
 {			/* have to do it the hard way */
 int i;
 turn_off_insert (tty_out);
 for (i = curX (tty_out); i < FrameCols (tty_out) - 1; i++)
-	{
+{
-	  fputc (' ', TTY_OUTPUT (tty_out));
+fputc (' ', tty_out->output);
-	}
+}
 }
 cmgoto (tty_out, FrameRows (tty_out) - 1, 0);
 fflush (tty_out->output);
 #if defined (IBMR2AIX) && defined (AIXHFT)
 {
 write (1, "\033[20h", 5);
 }
 #endif
 tty_reset_terminal_modes (tty_out->display);
-fflush (TTY_OUTPUT (tty_out));
+fflush (tty_out->output);
 #ifdef BSD_SYSTEM
 #ifndef BSD4_1
 /* Avoid possible loss of output when changing terminal modes.  */
-fsync (fileno (TTY_OUTPUT (tty_out)));
+fsync (fileno (tty_out->output));
 #endif
 #endif
 #ifdef F_SETFL
 #ifndef F_SETOWN_BUG
 #ifdef F_SETOWN		/* F_SETFL does not imply existence of F_SETOWN */
 if (interrupt_input)
 {
-reset_sigio (fileno (TTY_INPUT (tty_out)));
+reset_sigio (fileno (tty_out->input));
-fcntl (fileno (TTY_INPUT (tty_out)), F_SETOWN,
+fcntl (fileno (tty_out->input), F_SETOWN,
-old_fcntl_owner[fileno (TTY_INPUT (tty_out))]);
+old_fcntl_owner[fileno (tty_out->input)]);
 }
 #endif /* F_SETOWN */
 #endif /* F_SETOWN_BUG */
 #ifdef O_NDELAY
-fcntl (fileno (TTY_INPUT (tty_out)), F_SETFL,
+fcntl (fileno (tty_out->input), F_SETFL,
-fcntl (fileno (TTY_INPUT (tty_out)), F_GETFL, 0) & ~O_NDELAY);
+fcntl (fileno (tty_out->input), F_GETFL, 0) & ~O_NDELAY);
 #endif
 #endif /* F_SETFL */
 #ifdef BSD4_1
 if (interrupt_input)
-reset_sigio (fileno (TTY_INPUT (tty_out)));
+reset_sigio (fileno (tty_out->input));
 #endif /* BSD4_1 */
 if (tty_out->old_tty)
-while (EMACS_SET_TTY (fileno (TTY_INPUT (tty_out)),
+while (EMACS_SET_TTY (fileno (tty_out->input),
 tty_out->old_tty, 0) < 0 && errno == EINTR)
 ;
 #ifdef MSDOS	/* Demacs 1.1.2 91/10/20 Manabu Higashida */
 dos_ttcooked ();
 #ifdef AIXHFT
 hft_reset ();
 #endif
 #ifdef BSD_PGRPS
-widen_foreground_group (fileno (TTY_INPUT (tty_out)));
+widen_foreground_group (fileno (tty_out->input));
 #endif
 }
 #ifdef HAVE_PTYS
 void
 init_vms_input ()
 {
 int status;
-if (fileno (TTY_INPUT (CURTTY())) == 0)
+if (fileno (CURTTY ()->input)) == 0)
 {
-status = SYS$ASSIGN (&input_dsc, &fileno (TTY_INPUT (CURTTY())), 0, 0);
+status = SYS$ASSIGN (&input_dsc, &fileno (CURTTY ()->input)), 0, 0);
 if (! (status & 1))
 	LIB$STOP (status);
 }
 }
 /* Deassigning the input channel is done before exiting.  */
 void
 stop_vms_input ()
 {
-return SYS$DASSGN (fileno (TTY_INPUT (CURTTY())));
+return SYS$DASSGN (fileno (CURTTY ()->input)));
 }
 short input_buffer;
 /* Request reading one character into the keyboard buffer.
 int status;
 extern kbd_input_ast ();
 waiting_for_ast = 0;
 stop_input = 0;
-status = SYS$QIO (0, fileno (TTY_INPUT (CURTTY())), IO$_READVBLK,
+status = SYS$QIO (0, fileno (CURTTY()->input), IO$_READVBLK,
 		    &input_iosb, kbd_input_ast, 1,
 		    &input_buffer, 1, 0, terminator_mask, 0, 0);
 }
 int input_count;
 fflush (stdout);
 sleep (1);
 #endif
 if (LIB$AST_IN_PROG ())  /* Don't wait if suspending from kbd_buffer_store_event! */
 {
-SYS$CANCEL (fileno (TTY_INPUT (CURTTY())));
+SYS$CANCEL (fileno (CURTTY()->input));
 return;
 }
 SYS$SETAST (0);
 /* Clear a flag, and tell ast routine above to set it.  */
 SYS$CLREF (input_ef);
 waiting_for_ast = 1;
 stop_input = 1;
-SYS$CANCEL (fileno (TTY_INPUT (CURTTY())));
+SYS$CANCEL (fileno (CURTTY()->input));
 SYS$SETAST (1);
 SYS$WAITFR (input_ef);
 waiting_for_ast = 0;
 }

Mercurial > emacs

comparison src/sysdep.c @ 83065:a871be7b26a5