annotate lispintro/aclocal.m4 @ 83004:7900111db01c

Converted display hooks to be display-local. Plus many bugfixes. lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs. (init_signal): Pass SIGINT and SIGQUIT to the emacs process. lisp/faces.el (face-valid-attribute-values): Use the window-system function, not the variable. (read-face-attribute, face-spec-set-match-display, frame-set-background-mode) (face-set-after-frame-default): Ditto. lisp/frame.el (make-frame-on-tty): Added interactive declaration (suggested by Robert J. Chassell). Use tty-create-frame-with-faces, not make-terminal-frame. src/termhooks.h (struct display_method): Renamed to display for brevity. (struct display): Added all display hook variables as members of this structure. Added next_display, reference_count, type and display_info components. (FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK) (FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST) (FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display. (FRAME_DISPLAY): New macro. (create_display, delete_display): New prototypes. src/frame.h (struct frame): Added `display' member, removed display_method. (FRAME_LIVE_P): Look at f->display, not f->output_data. src/termchar.h (struct tty_display_info): Removed display_method component. (FRAME_TTY): Use the display structure, not output_data. src/term.c (display_list): New variable. (cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook) (clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook) (ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook) (update_begin_hook, update_end_hook, set_terminal_window_hook) (insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook) (frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook) (frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook) (redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display. (tty_display_method_template): Removed. (syms_of_term): Don't initialize tty_display_method_template. (ring_bell, set_terminal_modes, reset_terminal_modes, update_begin) (update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end) (clear_frame, clear_end_of_line, write_glyphs, insert_glyphs) (delete_glyphs, ins_del_lines): Access display hooks through the frame pointer. (Ftty_display_color_p): Use the frame given as a parameter, or else return nil. (Ftty_display_color_cells): Ditto. (get_named_tty): Renamed to get_named_tty_display, changed return type to struct display. (term_dummy_init): Renamed to initial_term_init. Create and return an initial display. (term_init): Initialize a new struct display and return a pointer to it instead of tty_display_info. Removed frame initialization kludge. (Fdelete_tty): Updated for struct display. (delete_tty): The parameter type is now struct display, not tty_display_info. Delete the display, too. (create_tty_output): New function for creating tty_output structures. (delete_tty_output): New function for deleting tty_output structures. (create_display): New function for creating and registering display structures. (delete_display): New function for deleting and unregistering display structures. src/dispextern.h: Updated prototypes. src/dispnew.c: Include frame.h before termhooks.h. (init_display): Updated term_init call to new signature. src/emacs.c: Include frame.h (for termhooks.h). src/keymap.c: Ditto. src/lread.c: Ditto. src/xsmfns.c: Ditto. src/process.c: Include frame.h before termhooks.h. src/frame.c (Fwindow_system): New function. (syms_of_frame): Initialize it. (make_terminal_frame): Open the terminal device before creating the new frame. Disable scrollbars here, term_init cannot do that anymore. (Fdelete_frame): Use the new delete_frame_hook, don't do display-specific frame deletion here. Ditto for delete_display_hook. (Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame) (Fredirect_frame_focus): Access display hooks through the frame pointer. src/keyboard.c: Include frame.h before termhooks.h. (start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook. (kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer. (read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error. src/sysdep.c (discard_tty_input): Ignore read_socket_hook. (stuff_char): Don't do anything if the current frame is not on a termcap display. (request_sigio, unrequest_sigio): Ignore read_socket_hook. (init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X. src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal) (set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer. (echo_area_display): Don't be afraid of termcap frames during an X+tty combo session. src/xfaces.c: Include termhooks.h. (Ftty_supports_face_attributes_p): Use the given frame, not selected_frame. src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer. (Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure. src/xmenu.c: Include termhooks.h after frame.h. src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection) (Fx_disown_selection_internal, Fx_get_cut_buffer_internal) (Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything if the selected frame is not an X frame. src/xterm.c (x_display_method): Removed. (x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects. (x_term_init): Set up a new struct display object, too. (x_delete_display): Delete the struct display corresponding to the X display. (x_initialize): Moved hook initialization to x_create_frame_display. src/xterm.h (x_display_method): Removed. (struct x_display_info): Added frame_display component. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 05 Jan 2004 05:54:35 +0000
parents a8ee89e61d20
children 3861ff8f4bf1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
41418
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1 dnl aclocal.m4 generated automatically by aclocal 1.4-p4
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
3 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
4 dnl This file is free software; the Free Software Foundation
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
5 dnl gives unlimited permission to copy and/or distribute it,
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
6 dnl with or without modifications, as long as this notice is preserved.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
7
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
8 dnl This program is distributed in the hope that it will be useful,
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9 dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
10 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
11 dnl PARTICULAR PURPOSE.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
12
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
13 # Do all the work for Automake. This macro actually does too much --
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
14 # some checks are only needed if your package does certain things.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
15 # But this isn't really a big deal.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
16
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
17 # serial 1
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
18
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
19 dnl Usage:
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
20 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
21
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
22 AC_DEFUN(AM_INIT_AUTOMAKE,
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
23 [AC_REQUIRE([AC_PROG_INSTALL])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
24 PACKAGE=[$1]
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25 AC_SUBST(PACKAGE)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
26 VERSION=[$2]
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
27 AC_SUBST(VERSION)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
28 dnl test to see if srcdir already configured
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
29 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
30 AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
31 fi
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
32 ifelse([$3],,
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
33 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
34 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
35 AC_REQUIRE([AM_SANITY_CHECK])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
36 AC_REQUIRE([AC_ARG_PROGRAM])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
37 dnl FIXME This is truly gross.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
38 missing_dir=`cd $ac_aux_dir && pwd`
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
39 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
40 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
41 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
42 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
43 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
44 AC_REQUIRE([AC_PROG_MAKE_SET])])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
45
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
46 #
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
47 # Check to make sure that the build environment is sane.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
48 #
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
49
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
50 AC_DEFUN(AM_SANITY_CHECK,
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
51 [AC_MSG_CHECKING([whether build environment is sane])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
52 # Just in case
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
53 sleep 1
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
54 echo timestamp > conftestfile
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
55 # Do `set' in a subshell so we don't clobber the current shell's
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
56 # arguments. Must try -L first in case configure is actually a
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
57 # symlink; some systems play weird games with the mod time of symlinks
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
58 # (eg FreeBSD returns the mod time of the symlink's containing
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
59 # directory).
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
60 if (
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
61 set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
62 if test "[$]*" = "X"; then
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
63 # -L didn't work.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
64 set X `ls -t $srcdir/configure conftestfile`
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
65 fi
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
66 if test "[$]*" != "X $srcdir/configure conftestfile" \
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
67 && test "[$]*" != "X conftestfile $srcdir/configure"; then
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
68
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
69 # If neither matched, then we have a broken ls. This can happen
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
70 # if, for instance, CONFIG_SHELL is bash and it inherits a
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
71 # broken ls alias from the environment. This has actually
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
72 # happened. Such a system could not be considered "sane".
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
73 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
74 alias in your environment])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
75 fi
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
76
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
77 test "[$]2" = conftestfile
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
78 )
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
79 then
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
80 # Ok.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
81 :
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
82 else
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
83 AC_MSG_ERROR([newly created file is older than distributed files!
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
84 Check your system clock])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
85 fi
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
86 rm -f conftest*
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
87 AC_MSG_RESULT(yes)])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
88
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
89 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
90 dnl The program must properly implement --version.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
91 AC_DEFUN(AM_MISSING_PROG,
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
92 [AC_MSG_CHECKING(for working $2)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
93 # Run test in a subshell; some versions of sh will print an error if
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
94 # an executable is not found, even if stderr is redirected.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
95 # Redirect stdin to placate older versions of autoconf. Sigh.
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
96 if ($2 --version) < /dev/null > /dev/null 2>&1; then
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
97 $1=$2
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
98 AC_MSG_RESULT(found)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
99 else
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
100 $1="$3/missing $2"
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
101 AC_MSG_RESULT(missing)
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
102 fi
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
103 AC_SUBST($1)])
a8ee89e61d20 *** empty log message ***
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
104