Mercurial > emacs
view src/syswait.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 | a8fa7c632ee4 375f2633d815 |
line wrap: on
line source
/* Define wait system call interface for Emacs. Copyright (C) 1993, 1994, 1995, 2000 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. */ /* Define the structure that the wait system call stores. On many systems, there is a structure defined for this. But on vanilla-ish USG systems there is not. */ #ifndef EMACS_SYSWAIT_H #define EMACS_SYSWAIT_H #ifndef VMS /* This is now really the approach recommended by Autoconf. If this doesn't cause trouble anywhere, remove the original code, which is #if'd out below. */ #if 1 #include <sys/types.h> #ifdef HAVE_SYS_WAIT_H /* We have sys/wait.h with POSIXoid definitions. */ #include <sys/wait.h> #endif /* !HAVE_SYS_WAIT_H */ #ifndef WCOREDUMP /* not POSIX */ #define WCOREDUMP(status) ((status) & 0x80) #endif #ifndef WEXITSTATUS #define WEXITSTATUS(status) (((status) & 0xff00) >> 8) #endif #ifndef WIFEXITED #define WIFEXITED(status) (WTERMSIG(status) == 0) #endif #ifndef WIFSTOPPED #define WIFSTOPPED(status) (((status) & 0xff) == 0x7f) #endif #ifndef WIFSIGNALED #define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status)) #endif #ifndef WSTOPSIG #define WSTOPSIG(status) WEXITSTATUS(status) #endif #ifndef WTERMSIG #define WTERMSIG(status) ((status) & 0x7f) #endif #undef WAITTYPE #define WAITTYPE int #undef WRETCODE #define WRETCODE(status) WEXITSTATUS (status) #else /* 0 */ #ifndef WAITTYPE #ifdef WAIT_USE_INT /* Some systems have union wait in their header, but we should use int regardless of that. */ #include <sys/wait.h> #define WAITTYPE int #define WRETCODE(w) WEXITSTATUS (w) #else /* not WAIT_USE_INT */ #if (!defined (BSD_SYSTEM) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER)) #define WAITTYPE int #define WIFSTOPPED(w) ((w&0377) == 0177) #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0) #define WIFEXITED(w) ((w&0377) == 0) #define WRETCODE(w) (w >> 8) #define WSTOPSIG(w) (w >> 8) #define WTERMSIG(w) (w & 0177) #ifndef WCOREDUMP #define WCOREDUMP(w) ((w&0200) != 0) #endif #else #ifdef BSD4_1 #include <wait.h> #else #include <sys/wait.h> #endif /* not BSD 4.1 */ #define WAITTYPE union wait #define WRETCODE(w) w.w_retcode #undef WCOREDUMP /* Later BSDs define this name differently. */ #define WCOREDUMP(w) w.w_coredump #if defined (HPUX) || defined (convex) /* HPUX version 7 has broken definitions of these. */ /* pvogel@convex.com says the convex does too. */ #undef WTERMSIG #undef WSTOPSIG #undef WIFSTOPPED #undef WIFSIGNALED #undef WIFEXITED #endif /* HPUX | convex */ #ifndef WTERMSIG #define WTERMSIG(w) w.w_termsig #endif #ifndef WSTOPSIG #define WSTOPSIG(w) w.w_stopsig #endif #ifndef WIFSTOPPED #define WIFSTOPPED(w) (WTERMSIG (w) == 0177) #endif #ifndef WIFSIGNALED #define WIFSIGNALED(w) (WTERMSIG (w) != 0177 && (WSTOPSIG (w)) == 0) #endif #ifndef WIFEXITED #define WIFEXITED(w) (WTERMSIG (w) == 0) #endif #endif /* BSD_SYSTEM || UNIPLUS || STRIDE || HPUX */ #endif /* not WAIT_USE_INT */ #endif /* no WAITTYPE */ #endif /* 0 */ #else /* VMS */ #define WAITTYPE int #define WIFSTOPPED(w) 0 #define WIFSIGNALED(w) 0 #define WIFEXITED(w) ((w) != -1) #define WRETCODE(w) (w) #define WSTOPSIG(w) (w) #define WCOREDUMP(w) 0 #define WTERMSIG(w) (w) #include <ssdef.h> #include <iodef.h> #include <clidef.h> #include "vmsproc.h" #endif /* VMS */ #endif /* EMACS_SYSWAIT_H */ /* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899 (do not change this comment) */