9 |
2) Allow fringe and scroll bar parameters to be set per-buffer and |
2) Allow fringe and scroll bar parameters to be set per-buffer and |
10 |
per-window (like display margins). Such settings are now stored |
per-window (like display margins). Such settings are now stored |
11 |
in window configurations, preserved when frames are resized, and |
in window configurations, preserved when frames are resized, and |
12 |
copied when windows are split vertically or horisontally. |
copied when windows are split vertically or horizontally. |
13 |
Several bugs related to display margins have been fixed. |
Several bugs related to display margins have been fixed. |
14 |
|
|
15 |
3) Consistently use FRAME_FONT and FRAME_FONTSET macros. |
3) Consistently use FRAME_FONT and FRAME_FONTSET macros. |
16 |
|
|
17 |
4) Use FRAME_COLUMN_WIDTH (f) consistently throughout the code |
4) Use FRAME_COLUMN_WIDTH (f) consistently throughout the code |
18 |
rather than FRAME_WIDTH (FRAME_FONT (f)). |
rather than FRAME_WIDTH (FRAME_FONT (f)). |
19 |
|
|
179 |
that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and |
that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and |
180 |
FRAME_SCROLL_BAR_WIDTH. |
FRAME_SCROLL_BAR_WIDTH. |
181 |
(WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH) |
(WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH) |
182 |
(WINDOW_SCROLL_BAR_AREA_X): New macros. |
(WINDOW_SCROLL_BAR_AREA_X): New macros. |
183 |
(WINDOW_HEADER_LINE_HEIGHT): Renamed from |
(WINDOW_HEADER_LINE_HEIGHT): Renamed from |
184 |
WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h. |
WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h. |
185 |
(WINDOW_BOX_HEIGHT_NO_MODE_LINE): Renamed from |
(WINDOW_BOX_HEIGHT_NO_MODE_LINE): Renamed from |
196 |
(window_from_coordinates): Update prototype. |
(window_from_coordinates): Update prototype. |
197 |
(Fset_window_buffer): Update EXFUN. |
(Fset_window_buffer): Update EXFUN. |
198 |
(set_window_buffer): Update prototype. |
(set_window_buffer): Update prototype. |
199 |
|
|
200 |
* dispextern.h (struct glyph_matrix): Rename members window_left_x |
* dispextern.h (struct glyph_matrix): Rename members window_left_x |
201 |
to window_left_col, window_top_y to window_top_line. All uses |
to window_left_col, window_top_y to window_top_line. All uses |
202 |
changed. |
changed. |
203 |
(FRAME_INTERNAL_BORDER_WIDTH_SAFE): Remove macro; can now safely |
(FRAME_INTERNAL_BORDER_WIDTH_SAFE): Remove macro; can now safely |
204 |
use FRAME_INTERNAL_BORDER_WIDTH macro instead as |
use FRAME_INTERNAL_BORDER_WIDTH macro instead as |
212 |
(FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y) |
(FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y) |
213 |
(WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH) |
(WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH) |
214 |
(WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, WINDOW_WANTS_MODELINE_P): |
(WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, WINDOW_WANTS_MODELINE_P): |
215 |
Move to window.h and renamed [see window.h changes]. |
Move to window.h and renamed [see window.h changes]. |
216 |
(WINDOW_AREA_TO_FRAME_PIXEL_X, WINDOW_AREA_PIXEL_WIDTH) |
(WINDOW_AREA_TO_FRAME_PIXEL_X, WINDOW_AREA_PIXEL_WIDTH) |
217 |
(WINDOW_DISPLAY_TEXT_AREA_PIXEL_WIDTH): Remove macros. |
(WINDOW_DISPLAY_TEXT_AREA_PIXEL_WIDTH): Remove macros. |
218 |
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Use |
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): |
219 |
WINDOW_TOTAL_LINES. |
Use WINDOW_TOTAL_LINES. |
220 |
(frame_update_line_height): Remove prototype. |
(frame_update_line_height): Remove prototype. |
221 |
|
|
222 |
* buffer.h (struct buffer): Rename members measured in columns: |
* buffer.h (struct buffer): Rename members measured in columns: |
239 |
(mode_line_string): No need to adjust width for mode lines, as it |
(mode_line_string): No need to adjust width for mode lines, as it |
240 |
is already adjusted by the caller. |
is already adjusted by the caller. |
241 |
(marginal_area_string): Handle fringes inside/outside margins. |
(marginal_area_string): Handle fringes inside/outside margins. |
242 |
|
|
243 |
* frame.c: Make (many) trivial substitutions for renamed and |
* frame.c: Make (many) trivial substitutions for renamed and |
244 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
245 |
(make_frame): Initialize left_fringe_width, right_fringe_width, |
(make_frame): Initialize left_fringe_width, right_fringe_width, |
250 |
|
|
251 |
* gtkutil.c: Make (many) trivial substitutions for renamed and |
* gtkutil.c: Make (many) trivial substitutions for renamed and |
252 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
253 |
|
|
254 |
* indent.c: Make (few) trivial substitutions for renamed and |
* indent.c: Make (few) trivial substitutions for renamed and |
255 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
256 |
|
|
286 |
right_fringe_width, fringes_outside_margins, scroll_bar_width, |
right_fringe_width, fringes_outside_margins, scroll_bar_width, |
287 |
and vertical_scroll_bar_type. |
and vertical_scroll_bar_type. |
288 |
(coordinates_in_window): Adapted to new fringe/margin positions |
(coordinates_in_window): Adapted to new fringe/margin positions |
289 |
and per-window fringes and scroll-bars. |
and per-window fringes and scroll-bars. |
290 |
Fix bug related to incorrectly adjusting coordinates by |
Fix bug related to incorrectly adjusting coordinates by |
291 |
frame's internal_border_width (the effect normally negible since |
frame's internal_border_width (the effect normally negible since |
292 |
the internal_border_width is typically 0 or 1 pixel, but very |
the internal_border_width is typically 0 or 1 pixel, but very |
293 |
noticeable for an internal_border_width of e.g. 25 pixels). |
noticeable for an internal_border_width of e.g. 25 pixels). |
294 |
Upon successful return (other than ON_NOTHING), the coordinates |
Upon successful return (other than ON_NOTHING), the coordinates |
308 |
Fset_window_scroll_bars to setup per-window elements. |
Fset_window_scroll_bars to setup per-window elements. |
309 |
Add new arg KEEP_MARGINS_P. Non-nil means to keep window's |
Add new arg KEEP_MARGINS_P. Non-nil means to keep window's |
310 |
existing display margin, fringe widths, and scroll bar settings |
existing display margin, fringe widths, and scroll bar settings |
311 |
(e.g. after splitting a window or resizing the frame). All |
(e.g. after splitting a window or resizing the frame). |
312 |
callers changed. |
All callers changed. |
313 |
(Fset_window_buffer): New arg KEEP_MARGINS. All callers changed. |
(Fset_window_buffer): New arg KEEP_MARGINS. All callers changed. |
314 |
(Fsplit_window): Duplicate original window's display margin, |
(Fsplit_window): Duplicate original window's display margin, |
315 |
fringe, and scroll-bar settings; then call Fset_window_buffer with |
fringe, and scroll-bar settings; then call Fset_window_buffer with |
320 |
narrow. This fixes a bug which could cause emacs to trap if the |
narrow. This fixes a bug which could cause emacs to trap if the |
321 |
width of the split window was less than the width of the display |
width of the split window was less than the width of the display |
322 |
margins. |
margins. |
323 |
(window_box_text_cols): Renamed from window_internal_width. All |
(window_box_text_cols): Renamed from window_internal_width. |
324 |
uses changed. Adapt to per-window fringes and scroll bars. |
All uses changed. Adapt to per-window fringes and scroll bars. |
325 |
Fix bug that caused vertical separator to be subtracted also on |
Fix bug that caused vertical separator to be subtracted also on |
326 |
window frames. Fix another bug that did not reduce the returned |
window frames. Fix another bug that did not reduce the returned |
327 |
value by the columns used for display margins. |
value by the columns used for display margins. |
378 |
(window_box): Allow null args for unnecessary return values; |
(window_box): Allow null args for unnecessary return values; |
379 |
change/simplify relevant callers. |
change/simplify relevant callers. |
380 |
(x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars, |
(x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars, |
381 |
and new fringe vs. display margin position. Use |
and new fringe vs. display margin position. |
382 |
window_box_left_offset and window_box_right_offset |
Use window_box_left_offset and window_box_right_offset |
383 |
(get_glyph_string_clip_rect): Adapt to per-window fringes and |
(get_glyph_string_clip_rect): Adapt to per-window fringes and |
384 |
scroll bars, and new fringe vs. display margin position. Use |
scroll bars, and new fringe vs. display margin position. |
385 |
WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH. |
Use WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH. |
386 |
(draw_fringe_bitmap): Rework to handle per-window fringes and new |
(draw_fringe_bitmap): Rework to handle per-window fringes and new |
387 |
fringe vs. display margin position. |
fringe vs. display margin position. |
388 |
(hscroll_window_tree): Use window_box_width instead of window_box. |
(hscroll_window_tree): Use window_box_width instead of window_box. |
389 |
(redisplay_window): Adapt to per-window scroll bars. |
(redisplay_window): Adapt to per-window scroll bars. |
390 |
(draw_glyphs): Rework to handle per-window fringes and scroll |
(draw_glyphs): Rework to handle per-window fringes and scroll |
391 |
bars, and new fringe vs. display margin position. Use |
bars, and new fringe vs. display margin position. |
392 |
WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left. |
Use WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left. |
393 |
(x_clear_end_of_line): Adapt to per-window fringes and scroll |
(x_clear_end_of_line): Adapt to per-window fringes and scroll |
394 |
bars, and new fringe vs. display margin position. Fix bug which |
bars, and new fringe vs. display margin position. Fix bug which |
395 |
increased total width of full_width rows by width of scroll bars |
increased total width of full_width rows by width of scroll bars |
426 |
(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) |
(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) |
427 |
(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h |
(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h |
428 |
and renamed [see frame.h changes]. |
and renamed [see frame.h changes]. |
429 |
|
|
430 |
* xterm.c: Make (several) trivial substitutions for renamed and |
* xterm.c: Make (several) trivial substitutions for renamed and |
431 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
432 |
(x_draw_glyph_string_box): Adapt to per-window fringes and |
(x_draw_glyph_string_box): Adapt to per-window fringes and |
460 |
(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) |
(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) |
461 |
(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h |
(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h |
462 |
and renamed [see frame.h changes]. |
and renamed [see frame.h changes]. |
463 |
|
|
464 |
* w32term.c: Make (several) trivial substitutions for renamed and |
* w32term.c: Make (several) trivial substitutions for renamed and |
465 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
466 |
(x_draw_glyph_string_box): Adapt to per-window fringes and |
(x_draw_glyph_string_box): Adapt to per-window fringes and |
501 |
(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) |
(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) |
502 |
(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h |
(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h |
503 |
and renamed [see frame.h changes]. |
and renamed [see frame.h changes]. |
504 |
|
|
505 |
* macterm.c: Make (several) trivial substitutions for renamed and |
* macterm.c: Make (several) trivial substitutions for renamed and |
506 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
507 |
(x_draw_glyph_string_box): Adapt to per-window fringes and |
(x_draw_glyph_string_box): Adapt to per-window fringes and |
519 |
|
|
520 |
* macfns.c: Make (several) trivial substitutions for renamed and |
* macfns.c: Make (several) trivial substitutions for renamed and |
521 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
522 |
(x_real_positions): Set f->x_pixels_diff and f->y_pixels_diff to 0. |
(x_real_positions): Set f->x_pixels_diff and f->y_pixels_diff to 0. |
523 |
|
|
524 |
* macmenu.c: Make (few) trivial substitutions for renamed and |
* macmenu.c: Make (few) trivial substitutions for renamed and |
525 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
533 |
* msdos.c: Make (several) trivial substitutions for renamed and |
* msdos.c: Make (several) trivial substitutions for renamed and |
534 |
new macros in dispextern.h, frame.h and window.h. |
new macros in dispextern.h, frame.h and window.h. |
535 |
(IT_note_mouse_highlight): Use updated window coordinates returned |
(IT_note_mouse_highlight): Use updated window coordinates returned |
536 |
by window_from_coordinates, rather than adjusting them locally. |
by window_from_coordinates, rather than adjusting them locally. |
537 |
(internal_terminal_init): No need to initialize line_height here; |
(internal_terminal_init): No need to initialize line_height here; |
538 |
it now defaults to 1. |
it now defaults to 1. |
539 |
|
|
540 |
|
2003-05-24 Stefan Monnier <monnier@cs.yale.edu> |
541 |
|
|
542 |
|
* keyboard.c (read_key_sequence): Adjust fkey and keytran when |
543 |
|
dropping `down' events. |
544 |
|
|
545 |
2003-05-24 Andreas Schwab <schwab@suse.de> |
2003-05-24 Andreas Schwab <schwab@suse.de> |
546 |
|
|
547 |
* coding.c (find_safe_codings): Fix last change. |
* coding.c (find_safe_codings): Fix last change. |
552 |
|
|
553 |
2003-05-23 Stefan Monnier <monnier@cs.yale.edu> |
2003-05-23 Stefan Monnier <monnier@cs.yale.edu> |
554 |
|
|
555 |
|
* xdisp.c (display_mode_element): Increase max depth. |
556 |
|
Simplify the error handling code. Use a different error string |
557 |
|
for the case where we hit the depth limit. |
558 |
|
|
559 |
* lisp.h (Vfundamental_mode_abbrev_table): Don't declare. |
* lisp.h (Vfundamental_mode_abbrev_table): Don't declare. |
560 |
|
|
561 |
* buffer.c (reset_buffer_local_variables): Remove redundant setting. |
* buffer.c (reset_buffer_local_variables): Remove redundant setting. |