comparison src/keyboard.c @ 53341:d4e6a050c9b1

Bugfix festival. lib-src/emacsclient.c (main_argc, main_argv): New variables. (main): Initialize them. (fail): Use them. (window_change, copy_from_to): Don't kill if emacs_pid is zero. (pty_conversation): Watch the command socket, too. Read emacs_pid here. Emacs and emacsclient could deadlock if Emacs tried to do a reset_sys_modes before sending its pid. lisp/server.el: Automatically delete the client frame when done editing. (server-frames): New variable. (server-process-filter, server-sentinel, server-buffer-done): Use it. (server-process-filter): Do a redisplay before evaluating other parameters. (Prevents "emacsclient -h -e '(delete-frame)'" from messing up the system. src/dispextern.h: Update prototypes. src/dispnew.c (window_change_signal): Do nothing if !term_initted. (init_display): Set the frame size from the tty data after term_init. src/emacs.c (main): Make sure things that init_sys_modes needs are initialized before init_display (which calls init_sys_modes now). (sort_args): Use xfree, not free. (shut_down_emacs) [!EMACS_HAVE_TTY_PGRP]: Use reset_all_sys_modes instead of reset_sys_modes. src/frame.c (make_terminal_frame): Sigh. Move terminal initialization back to the middle of frame setup. Handle errors by making sure that the delete_tty() called from term_init() will see and delete this frame. (Fdelete_frame): Kill the frame before calling delete_tty(). Fix condition for tty deletion. src/keyboard.c (Fset_input_mode): Use reset_sys_modes on the current terminal only. src/lisp.h: Remove duplicate prototypes. src/msdos.c (croak): use reset_all_sys_modes(). src/sysdeps.c (init_baud_rate): Added tty parameter, use it instead of CURTTY. (child_setup_tty): Reset sigio on stdin, not CURTTY(). (reset_sigio): Added fd parameter, put explicit fcntl there. (request_sigio, unrequest_sigio)[FASYNC]: Simply block/unblock the SIGIO signal, don't touch the file params. There are multiple ttys now, and we can't disable the SIGIO from emacsclient. (get_tty_size)[VMS]: Use tty_out instead of CURTTY(). (reset_sys_modes): Don't call cursor_to, clear_end_of_line; call cmgoto and tty_clear_end_of_line instead. The frame may already be dead. Updated reset_sigio call. src/term.c (clear_and_of_line): Separate tty-dependent stuff to tty_clear_end_of_line() for reset_sys_modes. (tty_clear_end_of_line): New function. (term_init): Added frame parameter, don't use selected_frame. Set the frame's output_data.tty value (in case there is an error later). Set the frame size in Wcm, not in the frame. Only free the termcap buffer if there is a termcap-related error. Call init_sys_modes last, not first. (deleting_tty): New variable. (delete_tty): Use it for handling recursive calls. Free deleted tty, except its Wcm (there is still a dangling reference somewhere). git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-19
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 29 Dec 2003 07:16:26 +0000
parents 09ea561dfa8c
children 56e4b7166995
comparison
equal deleted inserted replaced
53340:db645482d6bc 53341:d4e6a050c9b1
10431 stop_polling (); 10431 stop_polling ();
10432 #endif 10432 #endif
10433 10433
10434 #ifndef DOS_NT 10434 #ifndef DOS_NT
10435 /* this causes startup screen to be restored and messes with the mouse */ 10435 /* this causes startup screen to be restored and messes with the mouse */
10436 reset_all_sys_modes (); 10436 reset_sys_modes (CURTTY ());
10437 #endif 10437 #endif
10438 10438
10439 #ifdef SIGIO 10439 #ifdef SIGIO
10440 /* Note SIGIO has been undef'd if FIONREAD is missing. */ 10440 /* Note SIGIO has been undef'd if FIONREAD is missing. */
10441 if (read_socket_hook) 10441 if (read_socket_hook)
10459 interrupt_input = 1; 10459 interrupt_input = 1;
10460 #endif 10460 #endif
10461 10461
10462 flow_control = !NILP (flow); 10462 flow_control = !NILP (flow);
10463 if (NILP (meta)) 10463 if (NILP (meta))
10464 FRAME_TTY (SELECTED_FRAME ())->meta_key = 0; 10464 CURTTY ()->meta_key = 0;
10465 else if (EQ (meta, Qt)) 10465 else if (EQ (meta, Qt))
10466 FRAME_TTY (SELECTED_FRAME ())->meta_key = 1; 10466 CURTTY ()->meta_key = 1;
10467 else 10467 else
10468 FRAME_TTY (SELECTED_FRAME ())->meta_key = 2; 10468 CURTTY ()->meta_key = 2;
10469 if (!NILP (quit)) 10469 if (!NILP (quit))
10470 /* Don't let this value be out of range. */ 10470 /* Don't let this value be out of range. */
10471 quit_char = XINT (quit) & (FRAME_TTY (SELECTED_FRAME ())->meta_key ? 0377 : 0177); 10471 quit_char = XINT (quit) & (CURTTY ()->meta_key ? 0377 : 0177);
10472 10472
10473 #ifndef DOS_NT 10473 #ifndef DOS_NT
10474 init_all_sys_modes (); 10474 init_sys_modes (CURTTY ());
10475 #endif 10475 #endif
10476 10476
10477 #ifdef POLL_FOR_INPUT 10477 #ifdef POLL_FOR_INPUT
10478 poll_suppress_count = 1; 10478 poll_suppress_count = 1;
10479 start_polling (); 10479 start_polling ();