Mercurial > emacs
annotate src/puresize.h @ 51195:3cbf29813eea
(struct frame): Rename members height to text_lines,
width to text_cols, window_height to total_lines, window_width to
total_cols, new_height to new_text_lines, new_width to
new_text_cols. All uses changed.
(struct frame): New members which consolidate common members of
x_output, w32_output, and mac_output structures: left_pos,
top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
win_gravity, size_hint_flags, border_width, internal_border_width,
line_height, fringe_cols, left_fringe_width, right_fringe_width,
want_fullscreen. All uses changed.
(struct frame): New member column_width contaning the canonical
column width, analogue to line_height. All uses changed.
(struct frame): Rename members scroll_bar_pixel_width to
config_scroll_bar_width, and scroll_bar_cols to
config_scroll_bar_cols. All uses changed.
(struct frame): New member scroll_bar_actual_width which
consolidates and renames the vertical_scroll_bar_extra member of
x_output, w32_output, and mac_output structures. All uses changed.
(FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_height.
(FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_width.
(FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed.
Also change code which referred to f->height.
(FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed.
Also change code which referred to f->width.
(FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
to update new_text_lines and new_text_cols members directly.
(FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from
FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
(FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from
FRAME_SCROLL_BAR_COLS. All uses changed.
(FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and
FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
(FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
(FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH.
(SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH.
(FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG.
(WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
(WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
(FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally
return line_height member (it now has proper value also for
non-window frames).
(FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally
return new column_width member (rather than the default font width).
(FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
(FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved
from x/w32/macterm.h files. Unconditionally return corresponding
member of frame structure (they now have proper values also for
non-window frames).
(FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH.
Calculate return value from left and right widths.
(FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
internal_border_width member (has proper value for non-window frame).
(FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X.
(FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y.
(FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X.
(FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y.
(FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from
CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
(FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from
CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
(FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from
PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
(FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from
PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 21:58:07 +0000 |
parents | 23a1cea22d13 |
children | 256d7b81b774 d7ddb3e565de |
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 |
46842
db5ca410c826
(BASE_PURESIZE): Increase to 910000.
Ken Raeburn <raeburn@raeburn.org>
parents:
44630
diff
changeset
|
45 #define BASE_PURESIZE (910000 + 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 */ |