Mercurial > emacs
annotate src/s/sol2-4.h @ 51209:880539128b51
Make (many) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(window_box_width): Adapt to per-window fringes and scroll bars,
and new fringe vs. display margin position. Note that returned
value is no longer guaranteed to be a whole multiple of the frame
column width, since per-window fringes may now be any width.
(window_box_left_offset): New function like window_box_left, but
value is relative to left border of window (rather than frame).
(window_box_right_offset): New function like window_box_right,
but value is relative to left border of window.
(window_box_left): Adapt to per-window fringes and scroll bars,
and new fringe vs. display margin position. Simplify by using
WINDOW_LEFT_EDGE_X and window_box_left_offset.
(window_box): Allow null args for unnecessary return values;
change/simplify relevant callers.
(x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars,
and new fringe vs. display margin position. Use
window_box_left_offset and window_box_right_offset
(get_glyph_string_clip_rect): Adapt to per-window fringes and
scroll bars, and new fringe vs. display margin position. Use
WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH.
(draw_fringe_bitmap): Rework to handle per-window fringes and new
fringe vs. display margin position.
(hscroll_window_tree): Use window_box_width instead of window_box.
(redisplay_window): Adapt to per-window scroll bars.
(draw_glyphs): Rework to handle per-window fringes and scroll
bars, and new fringe vs. display margin position. Use
WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left.
(x_clear_end_of_line): Adapt to per-window fringes and scroll
bars, and new fringe vs. display margin position. Fix bug which
increased total width of full_width rows by width of scroll bars
although window's total width already includes that.
(x_fix_overlapping_area): Simplify using window_box_left_offset.
(expose_area): Simplify using window_box_left_offset.
(x_draw_vertical_border): Handle per-window scroll bar settings,
mixing windows with left, right and no scroll bars.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 22:08:54 +0000 |
parents | bdfd64faa90a |
children | 695cf19ef79e |
rev | line source |
---|---|
8451 | 1 /* Handle Solaris 2.4. */ |
2 | |
8475
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
3 #include "sol2-3.h" |
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
4 |
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
5 #define SOLARIS2_4 |
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
6 |
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
7 /* Get rid of -traditional and let const really do its thing. */ |
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
8 |
8451 | 9 #ifdef __GNUC__ |
8475
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
10 #undef C_SWITCH_SYSTEM |
77d5e055dce1
(PTY_TTY_NAME_SPRINTF): New definition.
Richard M. Stallman <rms@gnu.org>
parents:
8451
diff
changeset
|
11 #undef const |
8451 | 12 #endif /* __GNUC__ */ |
12038
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
13 |
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
14 #undef LD_SWITCH_SYSTEM |
18763
8f719bb518cc
(XPointer): Define XPointer.
Richard M. Stallman <rms@gnu.org>
parents:
15456
diff
changeset
|
15 |
23139
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
16 /* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet. |
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
17 Instead, dynamically check whether USE_MOTIF expands to something. */ |
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
18 #define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; } |
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
19 |
12038
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
20 #ifndef __GNUC__ |
23139
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
21 #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \ |
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
22 `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'` |
12038
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
23 #else /* GCC */ |
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
24 /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX |
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
25 has anything in it. It can be empty. |
18763
8f719bb518cc
(XPointer): Define XPointer.
Richard M. Stallman <rms@gnu.org>
parents:
15456
diff
changeset
|
26 This works ok in temacs. */ |
8f719bb518cc
(XPointer): Define XPointer.
Richard M. Stallman <rms@gnu.org>
parents:
15456
diff
changeset
|
27 #define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \ |
23139
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
28 `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \ |
bdfd64faa90a
(NOT_USING_MOTIF): New macro.
Paul Eggert <eggert@twinsun.com>
parents:
18763
diff
changeset
|
29 `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'` |
12038
20f5e203dfe6
(LD_SWITCH_SYSTEM): Copied back from s/sol2-3.h;
Karl Heuer <kwzh@gnu.org>
parents:
11965
diff
changeset
|
30 #endif /* GCC */ |
15118
77feea2e700b
(C_SWITCH_X_SYSTEM): Definition moved from sol2.h.
Richard M. Stallman <rms@gnu.org>
parents:
14494
diff
changeset
|
31 |
77feea2e700b
(C_SWITCH_X_SYSTEM): Definition moved from sol2.h.
Richard M. Stallman <rms@gnu.org>
parents:
14494
diff
changeset
|
32 /* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files |
77feea2e700b
(C_SWITCH_X_SYSTEM): Definition moved from sol2.h.
Richard M. Stallman <rms@gnu.org>
parents:
14494
diff
changeset
|
33 are in this directory on Solaris 2.4. */ |
77feea2e700b
(C_SWITCH_X_SYSTEM): Definition moved from sol2.h.
Richard M. Stallman <rms@gnu.org>
parents:
14494
diff
changeset
|
34 #define C_SWITCH_X_SYSTEM -I/usr/dt/include |
77feea2e700b
(C_SWITCH_X_SYSTEM): Definition moved from sol2.h.
Richard M. Stallman <rms@gnu.org>
parents:
14494
diff
changeset
|
35 |