Mercurial > emacs
annotate src/puresize.h @ 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 | 695cf19ef79e |
children | 09d9fc390321 375f2633d815 |
rev | line source |
---|---|
355 | 1 /* How much read-only Lisp storage a dumped Emacs needs. |
43316
3b39ade5b472
(BASE_PURESIZE): Increase to 9/5.
Andreas Schwab <schwab@suse.de>
parents:
41241
diff
changeset
|
2 Copyright (C) 1993, 2002 Free Software Foundation, Inc. |
355 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
355 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
13778
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
13778
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
355 | 20 |
8933
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
21 /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for. |
355 | 22 |
23 At one point, this was defined in config.h, meaning that changing | |
24 PURESIZE would make Make recompile all of Emacs. But only a few | |
484 | 25 files actually use PURESIZE, so we split it out to its own .h file. |
26 | |
27 Make sure to include this file after config.h, since that tells us | |
28 whether we are running X windows, which tells us how much pure | |
29 storage to allocate. */ | |
355 | 30 |
8933
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
31 /* First define a measure of the amount of data we have. */ |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
32 |
9572 | 33 /* A system configuration file may set this to request a certain extra |
34 amount of storage. This is a lot more update-robust that defining | |
35 BASE_PURESIZE or even PURESIZE directly. */ | |
36 #ifndef SYSTEM_PURESIZE_EXTRA | |
37 #define SYSTEM_PURESIZE_EXTRA 0 | |
38 #endif | |
39 | |
12986
180f04639e71
(SITELOAD_PURESIZE_EXTRA): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
12612
diff
changeset
|
40 #ifndef SITELOAD_PURESIZE_EXTRA |
180f04639e71
(SITELOAD_PURESIZE_EXTRA): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
12612
diff
changeset
|
41 #define SITELOAD_PURESIZE_EXTRA 0 |
180f04639e71
(SITELOAD_PURESIZE_EXTRA): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
12612
diff
changeset
|
42 #endif |
180f04639e71
(SITELOAD_PURESIZE_EXTRA): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
12612
diff
changeset
|
43 |
8933
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
44 #ifndef BASE_PURESIZE |
52255
eb8d63124c39
(BASE_PURESIZE): Increase to 1100000.
Gerd Moellmann <gerd@gnu.org>
parents:
51678
diff
changeset
|
45 #define BASE_PURESIZE (1100000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) |
484 | 46 #endif |
8933
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
47 |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
48 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
49 #ifndef PURESIZE_RATIO |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
50 #if VALBITS + GCTYPEBITS + 1 > 32 |
43316
3b39ade5b472
(BASE_PURESIZE): Increase to 9/5.
Andreas Schwab <schwab@suse.de>
parents:
41241
diff
changeset
|
51 #define PURESIZE_RATIO 9/5 /* Don't surround with `()'. */ |
8933
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
52 #else |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
53 #define PURESIZE_RATIO 1 |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
54 #endif |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
55 #endif |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
56 |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
57 /* This is the actual size in bytes to allocate. */ |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
58 #ifndef PURESIZE |
f060ee7326c5
(PURESIZE_RATIO, BASE_PURESIZE): Defined.
Richard M. Stallman <rms@gnu.org>
parents:
8832
diff
changeset
|
59 #define PURESIZE (BASE_PURESIZE * PURESIZE_RATIO) |
484 | 60 #endif |
355 | 61 |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
62 /* Signal an error if OBJ is pure. */ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
63 #define CHECK_IMPURE(obj) \ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
64 { if (PURE_P (obj)) \ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
65 pure_write_error (); } |
21515 | 66 |
67 extern void pure_write_error P_ ((void)); | |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
68 |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
69 /* Define PURE_P. */ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
70 |
355 | 71 #ifdef VIRT_ADDR_VARIES |
72 /* For machines like APOLLO where text and data can go anywhere | |
73 in virtual memory. */ | |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
74 |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
75 extern EMACS_INT pure[]; |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
76 |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
77 #define PURE_P(obj) \ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
78 ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
79 && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) |
355 | 80 |
81 #else /* not VIRT_ADDR_VARIES */ | |
82 #ifdef PNTR_COMPARISON_TYPE | |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
83 /* When PNTR_COMPARISON_TYPE is not the default (unsigned int). */ |
355 | 84 |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
85 extern char my_edata[]; |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
86 |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
87 #define PURE_P(obj) \ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
88 ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) |
355 | 89 |
90 #else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */ | |
91 | |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
92 extern char my_edata[]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46842
diff
changeset
|
93 |
13778
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
94 #define PURE_P(obj) \ |
7b2f71009e4c
(PURE_P): New macro (three definitions).
Karl Heuer <kwzh@gnu.org>
parents:
12986
diff
changeset
|
95 (XPNTR (obj) < (unsigned int) my_edata) |
355 | 96 |
97 #endif /* PNTR_COMPARISON_TYPE */ | |
98 #endif /* VIRT_ADDRESS_VARIES */ | |
52401 | 99 |
100 /* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f | |
101 (do not change this comment) */ |