Mercurial > emacs
view src/syssignal.h @ 82990:2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
lib-src/emacsclient.c (copy_from_to, pty_conversation): Re-added SIGIO
hack. (Sigh.)
lisp/frame.el (make-frame-on-tty): Use make-terminal-frame, not
make-frame.
src/dispnew.c (line_hash_code, line_draw_cost): Updated to use
the new display_method parameters.
(Fredraw_frame): fflush the tty only if f is a termcap frame.
(direct_output_for_insert): Updated to use the new display_method
parameters. fflush the tty only if f is a termcap frame.
(direct_output_forward_char, update_frame_1, scrolling): Ditto.
(update_frame_line, Fding, bitch_at_user): Ditto.
(Fsend_string_to_terminal): Fail if current frame is not on a tty.
(init_display): Frame size change is safe here.
src/frame.c (Vterminal_frame): Restored previously deleted variable.
(syms_of_frame): Initialize it.
(make_terminal_frame): Copy the frame's display_method from tty_display_info.
(Fmake_terminal_frame): Enable simultaneous X and tty frames (buggy).
(Fredirect_frame_focus): Don't call frame_rehighlight_hook if frame
is on a termcap device.
src/frame.h (struct frame): Renamed display to display_method.
(Vterminal_frame): Re-added declaration.
src/keyboard.c (flow_control): Moved to struct tty_display_info.
(read_avail_input): Check ttys even if there is a read_socket_hook.
(Fset_input_mode): Call reset_sys_modes/init_sys_modes and set
flow_control or meta_key only when the frame is a termcap frame.
(Fcurrent_input_mode): Handle flow_control and meta_key right on
non-termcap frames.
src/scroll.c (calculate_scrolling, calculate_direct_scrolling): Update
to use the new display_method parameters.
(scrolling_1, scroll_cost): Ditto.
src/sysdep.c (init_sys_modes, reset_sys_modes): Always set the
terminal parameters if tty_out->input is not stdin. Updated to the
new location of flow_control.
(hft_init): Moved HFT init code to term_init, as it needs the frame.
src/term.c (tty_display_method_template): New variable.
(update_begin): Added rif hack.
(set_terminal_window, ins_del_lines, term_init): Updated to use the
new display_method parameters.
(insert_glyphs, ins_del_lines): Only call insert_glyphs_hook if the
current frame is not on a tty.
(calculate_costs): Don't calculate costs if not on a tty.
(term_dummy_init): Fixed tty->output initialization. Preallocate Wcm
and display_method.
(term_init): Allocate & initialize display_method. Blindly fixed
WINDOWSNT-specific parts. Added HFT-specific initialization
exception from hft_init.
(delete_tty): Only delete termcap frames. Free() the display_method.
src/termchar.h (struct tty_display_info): Moved high-level terminal
characteristics to struct display_method. Added flow_control and
display_method members.
src/termhooks.h (struct display_method): New struct (renamed from
struct device). Added accessor macros.
src/window.c (init_window_once): Initialize Vterminal_frame.
src/xdisp.c (init_iterator, expose_frame): Added rif hack.
(try_window_id): Updated to use the new display_method parameters.
src/xfaces.c (realize_basic_faces): Don't call
x_update_menu_appearance if the frame is a tty frame.
src/xfns.c (Fx_create_frame): Added rif hack. Initialize
display_method.
(x_create_tip_frame): Initialize display_method.
src/xterm.c (x_display_method): New variable.
(x_flush, x_frame_of_widget, XTmouse_position): Ignore non-X frames.
(x_window_to_scroll_bar, x_window_to_menu_bar): Ditto.
(xim_destroy_callback, xim_instantiate_callback): Ditto.
(frame_highlight, frame_unhighlight): Added rif hack.
(x_initialize): Don't initialize rif. Do initialize x_display_method.
src/xterm.h (x_display_method): New declaration.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-30
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 02 Jan 2004 01:15:26 +0000 |
parents | 695cf19ef79e |
children | c208f88ccc56 039bd6989d29 375f2633d815 |
line wrap: on
line source
/* syssignal.h - System-dependent definitions for signals. Copyright (C) 1993, 1999 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef POSIX_SIGNALS /* Don't #include <signal.h>. That header should always be #included before "config.h", because some configuration files (like s/hpux.h) indicate that SIGIO doesn't work by #undef-ing SIGIO. If this file #includes <signal.h>, then that will re-#define SIGIO and confuse things. */ #define SIGMASKTYPE sigset_t #define SIGEMPTYMASK (empty_mask) #define SIGFULLMASK (full_mask) extern sigset_t empty_mask, full_mask; extern void init_signals P_ ((void)); /* POSIX pretty much destroys any possibility of writing sigmask as a macro in standard C. We always define our own version because the predefined macro in Glibc 2.1 is only provided for compatility for old programs that use int as signal mask type. */ #undef sigmask #ifdef __GNUC__ #define sigmask(SIG) \ ({ \ sigset_t _mask; \ sigemptyset (&_mask); \ sigaddset (&_mask, SIG); \ _mask; \ }) #else /* ! defined (__GNUC__) */ extern sigset_t sys_sigmask (); #define sigmask(SIG) (sys_sigmask (SIG)) #endif /* ! defined (__GNUC__) */ #undef sigpause #define sigpause(MASK) sigsuspend (&(MASK)) #define sigblock(SIG) sys_sigblock (SIG) #define sigunblock(SIG) sys_sigunblock (SIG) #ifndef sigsetmask #define sigsetmask(SIG) sys_sigsetmask (SIG) #endif #define sighold(SIG) ONLY_USED_IN_BSD_4_1 #define sigrelse(SIG) ONLY_USED_IN_BSD_4_1 #undef signal #define signal(SIG,ACT) sys_signal(SIG,ACT) /* Whether this is what all systems want or not, this is what appears to be assumed in the source, for example data.c:arith_error. */ typedef RETSIGTYPE (*signal_handler_t) (/*int*/); signal_handler_t sys_signal P_ ((int signal_number, signal_handler_t action)); sigset_t sys_sigblock P_ ((sigset_t new_mask)); sigset_t sys_sigunblock P_ ((sigset_t new_mask)); sigset_t sys_sigsetmask P_ ((sigset_t new_mask)); #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG) #else /* ! defined (POSIX_SIGNALS) */ #ifdef USG5_4 extern SIGMASKTYPE sigprocmask_set; #ifndef sigblock #define sigblock(sig) \ (sigprocmask_set = SIGEMPTYMASK | (sig), \ sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL)) #endif #ifndef sigunblock #define sigunblock(sig) \ (sigprocmask_set = SIGFULLMASK & ~(sig), \ sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL)) #endif #else #ifdef USG #ifndef sigunblock #define sigunblock(sig) #endif #else #ifndef sigunblock #define sigunblock(SIG) \ { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); } #endif #endif /* ! defined (USG) */ #endif /* ! defined (USG5_4) */ #endif /* ! defined (POSIX_SIGNALS) */ #ifndef SIGMASKTYPE #define SIGMASKTYPE int #endif #ifndef SIGEMPTYMASK #define SIGEMPTYMASK (0) #endif #ifndef SIGFULLMASK #define SIGFULLMASK (0xffffffff) #endif #ifndef sigmask #define sigmask(no) (1L << ((no) - 1)) #endif #ifndef sigunblock #define sigunblock(SIG) \ { SIGMASKTYPE omask = sigblock (SIGFULLMASK); sigsetmask (omask & ~SIG); } #endif #ifndef BSD4_1 #define sigfree() sigsetmask (SIGEMPTYMASK) #endif /* not BSD4_1 */ #if defined (SIGINFO) && defined (BROKEN_SIGINFO) #undef SIGINFO #endif #if defined (SIGIO) && defined (BROKEN_SIGIO) #undef SIGIO #endif #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL) #undef SIGPOLL #endif #if defined (SIGTSTP) && defined (BROKEN_SIGTSTP) #undef SIGTSTP #endif #if defined (SIGURG) && defined (BROKEN_SIGURG) #undef SIGURG #endif #if defined (SIGAIO) && defined (BROKEN_SIGAIO) #undef SIGAIO #endif #if defined (SIGPTY) && defined (BROKEN_SIGPTY) #undef SIGPTY #endif #if NSIG < NSIG_MINIMUM # ifdef NSIG # undef NSIG # endif # define NSIG NSIG_MINIMUM #endif #ifdef BSD4_1 #define SIGIO SIGTINT /* sigfree is in sysdep.c */ #endif /* BSD4_1 */ /* On bsd, [man says] kill does not accept a negative number to kill a pgrp. Must do that using the killpg call. */ #ifdef BSD_SYSTEM #define EMACS_KILLPG(gid, signo) (killpg ( (gid), (signo))) #else #ifdef WINDOWSNT #define EMACS_KILLPG(gid, signo) (kill (gid, signo)) #else #define EMACS_KILLPG(gid, signo) (kill (-(gid), (signo))) #endif #endif /* Define SIGCHLD as an alias for SIGCLD. There are many conditionals testing SIGCHLD. */ #ifndef VMS #ifdef SIGCLD #ifndef SIGCHLD #define SIGCHLD SIGCLD #endif /* SIGCHLD */ #endif /* ! defined (SIGCLD) */ #endif /* VMS */ #ifndef HAVE_STRSIGNAL /* strsignal is in sysdep.c */ char *strsignal (); #endif /* arch-tag: 4580e86a-340d-4574-9e11-a742b6e1a152 (do not change this comment) */