X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6924dda6ad76a7259ddd6e8f194c836a0318a534..ffe8b3f4e8cf60dd97c3e5ec5f12183ad9006c02:/src/window.c diff --git a/src/window.c b/src/window.c index a510db6fab..9f0bbaff09 100644 --- a/src/window.c +++ b/src/window.c @@ -1,6 +1,6 @@ /* Window creation, deletion and examination for GNU Emacs. Does not include redisplay. - Copyright (C) 1985,86,87,93,94,95,96,97,1998,2000, 2001 + Copyright (C) 1985,86,87,93,94,95,96,97,1998,2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -44,35 +44,17 @@ Boston, MA 02111-1307, USA. */ #ifdef MSDOS #include "msdos.h" #endif -#ifdef macintosh +#ifdef MAC_OS #include "macterm.h" #endif -#ifndef max -#define max(a, b) ((a) < (b) ? (b) : (a)) -#endif - -/* Values returned from coordinates_in_window. */ - -enum window_part -{ - ON_NOTHING, - ON_TEXT, - ON_MODE_LINE, - ON_VERTICAL_BORDER, - ON_HEADER_LINE, - ON_LEFT_FRINGE, - ON_RIGHT_FRINGE -}; - Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; -Lisp_Object Qwindow_size_fixed, Qleft_fringe, Qright_fringe; -extern Lisp_Object Qheight, Qwidth; +Lisp_Object Qwindow_size_fixed; +extern Lisp_Object Qleft_margin, Qright_margin; static int displayed_window_lines P_ ((struct window *)); static struct window *decode_window P_ ((Lisp_Object)); -static Lisp_Object select_window_1 P_ ((Lisp_Object, int)); static int count_windows P_ ((struct window *)); static int get_leaf_windows P_ ((struct window *, struct window **, int)); static void window_scroll P_ ((Lisp_Object, int, int, int)); @@ -83,7 +65,7 @@ static int window_min_size P_ ((struct window *, int, int, int *)); static void size_window P_ ((Lisp_Object, int, int, int)); static int freeze_window_start P_ ((struct window *, void *)); static int window_fixed_size_p P_ ((struct window *, int, int)); -static void enlarge_window P_ ((Lisp_Object, int, int)); +static void enlarge_window P_ ((Lisp_Object, int, int, int)); static Lisp_Object window_list P_ ((void)); static int add_window_to_list P_ ((struct window *, void *)); static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object, @@ -124,6 +106,11 @@ Lisp_Object Vwindow_list; Lisp_Object minibuf_window; +/* Non-nil means it is the window whose mode line should be + shown as the selected window when the minibuffer is selected. */ + +Lisp_Object minibuf_selected_window; + /* Non-nil means it is the window for C-M-v to scroll when the mini-buffer is selected. */ @@ -137,10 +124,15 @@ Lisp_Object Vother_window_scroll_buffer; Lisp_Object Vtemp_buffer_show_function; +/* Non-zero means to use mode-line-inactive face in all windows but the + selected-window and the minibuffer-scroll-window when the + minibuffer is active. */ +int mode_line_in_non_selected_windows; + /* If a window gets smaller than either of these, it is removed. */ -int window_min_height; -int window_min_width; +EMACS_INT window_min_height; +EMACS_INT window_min_width; /* Nonzero implies Fdisplay_buffer should create windows. */ @@ -193,11 +185,11 @@ Lisp_Object Qtemp_buffer_show_hook; /* Fdisplay_buffer always splits the largest window if that window is more than this high. */ -int split_height_threshold; +EMACS_INT split_height_threshold; /* Number of lines of continuity in scrolling by screenfuls. */ -int next_screen_context_lines; +EMACS_INT next_screen_context_lines; /* Incremented for each window created. */ @@ -222,7 +214,7 @@ Lisp_Object Vscroll_preserve_screen_position; static int inhibit_frame_unsplittable; #endif /* 0 */ -extern int scroll_margin; +extern EMACS_INT scroll_margin; extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; @@ -250,13 +242,13 @@ make_window () p = allocate_window (); XSETFASTINT (p->sequence_number, ++sequence_number); - XSETFASTINT (p->left, 0); - XSETFASTINT (p->top, 0); - XSETFASTINT (p->height, 0); - XSETFASTINT (p->width, 0); + XSETFASTINT (p->left_col, 0); + XSETFASTINT (p->top_line, 0); + XSETFASTINT (p->total_lines, 0); + XSETFASTINT (p->total_cols, 0); XSETFASTINT (p->hscroll, 0); XSETFASTINT (p->min_hscroll, 0); - p->orig_top = p->orig_height = Qnil; + p->orig_top_line = p->orig_total_lines = Qnil; p->start = Fmake_marker (); p->pointm = Fmake_marker (); XSETFASTINT (p->use_time, 0); @@ -269,6 +261,7 @@ make_window () bzero (&p->phys_cursor, sizeof (p->phys_cursor)); p->desired_matrix = p->current_matrix = 0; p->phys_cursor_type = -1; + p->phys_cursor_width = -1; p->must_be_updated_p = 0; XSETFASTINT (p->window_end_vpos, 0); XSETFASTINT (p->window_end_pos, 0); @@ -277,6 +270,16 @@ make_window () XSETWINDOW (val, p); XSETFASTINT (p->last_point, 0); p->frozen_window_start_p = 0; + p->height_fixed_p = 0; + p->last_cursor_off_p = p->cursor_off_p = 0; + p->left_margin_cols = Qnil; + p->right_margin_cols = Qnil; + p->left_fringe_width = Qnil; + p->right_fringe_width = Qnil; + p->fringes_outside_margins = Qnil; + p->scroll_bar_width = Qnil; + p->vertical_scroll_bar_type = Qt; + p->overlay_arrow_bitmap = 0; Vwindow_list = Qnil; return val; @@ -298,12 +301,13 @@ used by that frame. */) { if (NILP (frame)) frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); return FRAME_MINIBUF_WINDOW (XFRAME (frame)); } DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0, - doc: /* Returns non-nil if WINDOW is a minibuffer window. */) + doc: /* Returns non-nil if WINDOW is a minibuffer window. +WINDOW defaults to the selected window. */) (window) Lisp_Object window; { @@ -335,7 +339,7 @@ POS defaults to point in WINDOW; WINDOW defaults to the selected window. */) if (!NILP (pos)) { - CHECK_NUMBER_COERCE_MARKER (pos, 0); + CHECK_NUMBER_COERCE_MARKER (pos); posint = XINT (pos); } else if (w == XWINDOW (selected_window)) @@ -386,7 +390,18 @@ decode_window (window) if (NILP (window)) return XWINDOW (selected_window); - CHECK_LIVE_WINDOW (window, 0); + CHECK_LIVE_WINDOW (window); + return XWINDOW (window); +} + +static struct window * +decode_any_window (window) + register Lisp_Object window; +{ + if (NILP (window)) + return XWINDOW (selected_window); + + CHECK_WINDOW (window); return XWINDOW (window); } @@ -403,7 +418,7 @@ DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0, (window) Lisp_Object window; { - return decode_window (window)->height; + return decode_any_window (window)->total_lines; } DEFUN ("window-width", Fwindow_width, Swindow_width, 0, 1, 0, @@ -414,7 +429,7 @@ use (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))). */) (window) Lisp_Object window; { - return make_number (window_internal_width (decode_window (window))); + return make_number (window_box_text_cols (decode_any_window (window))); } DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, @@ -427,20 +442,23 @@ DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0, doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL. -NCOL should be zero or positive. */) +NCOL should be zero or positive. + +Note that if `automatic-hscrolling' is non-nil, you cannot scroll the +window so that the location of point becomes invisible. */) (window, ncol) Lisp_Object window, ncol; { struct window *w = decode_window (window); int hscroll; - CHECK_NUMBER (ncol, 1); + CHECK_NUMBER (ncol); hscroll = max (0, XINT (ncol)); - + /* Prevent redisplay shortcuts when changing the hscroll. */ if (XINT (w->hscroll) != hscroll) XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; - + w->hscroll = make_number (hscroll); return ncol; } @@ -476,33 +494,107 @@ Afterwards the end-trigger value is reset to nil. */) DEFUN ("window-edges", Fwindow_edges, Swindow_edges, 0, 1, 0, doc: /* Return a list of the edge coordinates of WINDOW. \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. -RIGHT is one more than the rightmost column used by WINDOW, -and BOTTOM is one more than the bottommost row used by WINDOW - and its mode-line. */) +RIGHT is one more than the rightmost column occupied by WINDOW, +and BOTTOM is one more than the bottommost row occupied by WINDOW. +The edges include the space used by the window's scroll bar, +display margins, fringes, header line, and mode line, if it has them. +To get the edges of the actual text area, use `window-inside-edges'. */) (window) Lisp_Object window; { - register struct window *w = decode_window (window); + register struct window *w = decode_any_window (window); + + return Fcons (make_number (WINDOW_LEFT_EDGE_COL (w)), + Fcons (make_number (WINDOW_TOP_EDGE_LINE (w)), + Fcons (make_number (WINDOW_RIGHT_EDGE_COL (w)), + Fcons (make_number (WINDOW_BOTTOM_EDGE_LINE (w)), + Qnil)))); +} + +DEFUN ("window-pixel-edges", Fwindow_pixel_edges, Swindow_pixel_edges, 0, 1, 0, + doc: /* Return a list of the edge pixel coordinates of WINDOW. +\(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. +RIGHT is one more than the rightmost x position occupied by WINDOW, +and BOTTOM is one more than the bottommost y position occupied by WINDOW. +The pixel edges include the space used by the window's scroll bar, +display margins, fringes, header line, and mode line, if it has them. +To get the edges of the actual text area, use `window-inside-pixel-edges'. */) + (window) + Lisp_Object window; +{ + register struct window *w = decode_any_window (window); + + return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)), + Fcons (make_number (WINDOW_TOP_EDGE_Y (w)), + Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)), + Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)), + Qnil)))); +} - return Fcons (w->left, Fcons (w->top, - Fcons (make_number (WINDOW_RIGHT_EDGE (w)), - Fcons (make_number (XFASTINT (w->top) - + XFASTINT (w->height)), - Qnil)))); +DEFUN ("window-inside-edges", Fwindow_inside_edges, Swindow_inside_edges, 0, 1, 0, + doc: /* Return a list of the edge coordinates of WINDOW. +\(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. +RIGHT is one more than the rightmost column used by text in WINDOW, +and BOTTOM is one more than the bottommost row used by text in WINDOW. +The inside edges do not include the space used by the window's scroll bar, +display margins, fringes, header line, and/or mode line. */) + (window) + Lisp_Object window; +{ + register struct window *w = decode_any_window (window); + + return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w) + + WINDOW_LEFT_MARGIN_COLS (w) + + WINDOW_LEFT_FRINGE_COLS (w)), + make_number (WINDOW_TOP_EDGE_LINE (w) + + WINDOW_HEADER_LINE_LINES (w)), + make_number (WINDOW_RIGHT_EDGE_COL (w) + - WINDOW_RIGHT_MARGIN_COLS (w) + - WINDOW_RIGHT_FRINGE_COLS (w)), + make_number (WINDOW_BOTTOM_EDGE_LINE (w) + - WINDOW_MODE_LINE_LINES (w))); +} + +DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0, + doc: /* Return a list of the edge coordinates of WINDOW. +\(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. +RIGHT is one more than the rightmost x position used by text in WINDOW, +and BOTTOM is one more than the bottommost y position used by text in WINDOW. +The inside edges do not include the space used by the window's scroll bar, +display margins, fringes, header line, and/or mode line. */) + (window) + Lisp_Object window; +{ + register struct window *w = decode_any_window (window); + + return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w) + + WINDOW_LEFT_MARGIN_WIDTH (w) + + WINDOW_LEFT_FRINGE_WIDTH (w)), + make_number (WINDOW_TOP_EDGE_Y (w) + + WINDOW_HEADER_LINE_HEIGHT (w)), + make_number (WINDOW_RIGHT_EDGE_X (w) + - WINDOW_RIGHT_MARGIN_WIDTH (w) + - WINDOW_RIGHT_FRINGE_WIDTH (w)), + make_number (WINDOW_BOTTOM_EDGE_Y (w) + - WINDOW_MODE_LINE_HEIGHT (w))); } /* Test if the character at column *X, row *Y is within window W. - If it is not, return 0; + If it is not, return ON_NOTHING; if it is in the window's text area, set *x and *y to its location relative to the upper left corner of the window, and - return 1; - if it is on the window's modeline, return 2; + return ON_TEXT; + if it is on the window's modeline, return ON_MODE_LINE; if it is on the border between the window and its right sibling, - return 3. - if it is on the window's top line, return 4; - if it is in the bitmap area to the left/right of the window, - return 5 or 6, and convert *X and *Y to window-relative corrdinates. + return ON_VERTICAL_BORDER. + if it is on the window's top line, return ON_HEADER_LINE; + if it is in left or right fringe of the window, + return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y + to window-relative coordinates; + if it is in the marginal area to the left/right of the window, + return ON_LEFT_MARGIN or ON_RIGHT_MARGIN, and convert *X and *Y + to window-relative coordinates. X and Y are frame relative pixel coordinates. */ @@ -511,41 +603,41 @@ coordinates_in_window (w, x, y) register struct window *w; register int *x, *y; { - /* Let's make this a global enum later, instead of using numbers - everywhere. */ struct frame *f = XFRAME (WINDOW_FRAME (w)); int left_x, right_x, top_y, bottom_y; - int flags_area_width = FRAME_LEFT_FLAGS_AREA_WIDTH (f); enum window_part part; - int ux = CANON_X_UNIT (f), uy = CANON_Y_UNIT (f); - int x0 = XFASTINT (w->left) * ux; - int x1 = x0 + XFASTINT (w->width) * ux; + int ux = FRAME_COLUMN_WIDTH (f); + int x0 = WINDOW_LEFT_EDGE_X (w); + int x1 = WINDOW_RIGHT_EDGE_X (w); /* The width of the area where the vertical line can be dragged. (Between mode lines for instance. */ int grabbable_width = ux; + int lmargin_width, rmargin_width, text_left, text_right; if (*x < x0 || *x >= x1) return ON_NOTHING; - + /* In what's below, we subtract 1 when computing right_x because we want the rightmost pixel, which is given by left_pixel+width-1. */ if (w->pseudo_window_p) { left_x = 0; - right_x = XFASTINT (w->width) * CANON_X_UNIT (f) - 1; - top_y = WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w); - bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w); + right_x = WINDOW_TOTAL_WIDTH (w) - 1; + top_y = WINDOW_TOP_EDGE_Y (w); + bottom_y = WINDOW_BOTTOM_EDGE_Y (w); } else { - left_x = (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w) - - FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)); - right_x = WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X (w) - 1; - top_y = (WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w) - - FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)); - bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w); + left_x = WINDOW_BOX_LEFT_EDGE_X (w); + right_x = WINDOW_BOX_RIGHT_EDGE_X (w) - 1; + top_y = WINDOW_TOP_EDGE_Y (w); + bottom_y = WINDOW_BOTTOM_EDGE_Y (w); } + /* Outside any interesting row? */ + if (*y < top_y || *y >= bottom_y) + return ON_NOTHING; + /* On the mode line or header line? If it's near the start of the mode or header line of window that's has a horizontal sibling, say it's on the vertical line. That's to be able @@ -553,108 +645,117 @@ coordinates_in_window (w, x, y) scroll bars. */ if (WINDOW_WANTS_MODELINE_P (w) - && *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w) - && *y < bottom_y) + && *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w)) { + part = ON_MODE_LINE; + + header_vertical_border_check: /* We're somewhere on the mode line. We consider the place between mode lines of horizontally adjacent mode lines as the vertical border. If scroll bars on the left, return the right window. */ - part = ON_MODE_LINE; - - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) + if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) + || WINDOW_RIGHTMOST_P (w)) { - if (abs (*x - x0) < grabbable_width) - part = ON_VERTICAL_BORDER; + if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width) + return ON_VERTICAL_BORDER; } - else if (!WINDOW_RIGHTMOST_P (w) && abs (*x - x1) < grabbable_width) - part = ON_VERTICAL_BORDER; - } - else if (WINDOW_WANTS_HEADER_LINE_P (w) - && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w) - && *y >= top_y) - { - part = ON_HEADER_LINE; - - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) + else { - if (abs (*x - x0) < grabbable_width) - part = ON_VERTICAL_BORDER; + if (abs (*x - x1) < grabbable_width) + return ON_VERTICAL_BORDER; } - else if (!WINDOW_RIGHTMOST_P (w) && abs (*x - x1) < grabbable_width) - part = ON_VERTICAL_BORDER; + + /* Convert X and Y to window relative coordinates. + Mode line starts at left edge of window. */ + *x -= x0; + *y -= top_y; + return part; } - /* Outside anything interesting? */ - else if (*y < top_y - || *y >= bottom_y - || *x < (left_x - - flags_area_width - - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * ux) - || *x > (right_x - + flags_area_width - + FRAME_RIGHT_SCROLL_BAR_WIDTH (f) * ux)) + + if (WINDOW_WANTS_HEADER_LINE_P (w) + && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w)) { - part = ON_NOTHING; + part = ON_HEADER_LINE; + goto header_vertical_border_check; } - else if (FRAME_WINDOW_P (f)) + + /* Outside any interesting column? */ + if (*x < left_x || *x > right_x) + return ON_NOTHING; + + lmargin_width = window_box_width (w, LEFT_MARGIN_AREA); + rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA); + + text_left = window_box_left (w, TEXT_AREA); + text_right = text_left + window_box_width (w, TEXT_AREA); + + if (FRAME_WINDOW_P (f)) { if (!w->pseudo_window_p - && !FRAME_HAS_VERTICAL_SCROLL_BARS (f) + && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) && !WINDOW_RIGHTMOST_P (w) - && (abs (*x - right_x - flags_area_width) < grabbable_width)) - { - part = ON_VERTICAL_BORDER; - } - else if (*x < left_x || *x > right_x) - { - /* Other lines than the mode line don't include flags areas and - scroll bars on the left. */ - - /* Convert X and Y to window-relative pixel coordinates. */ - *x -= left_x; - *y -= top_y; - part = *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE; - } - else - { - *x -= left_x; - *y -= top_y; - part = ON_TEXT; - } + && (abs (*x - right_x) < grabbable_width)) + return ON_VERTICAL_BORDER; } else { /* Need to say "*x > right_x" rather than >=, since on character terminals, the vertical line's x coordinate is right_x. */ - if (*x < left_x || *x > right_x) - { - /* Other lines than the mode line don't include flags areas and - scroll bars on the left. */ - - /* Convert X and Y to window-relative pixel coordinates. */ - *x -= left_x; - *y -= top_y; - part = *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE; - } - /* Here, too, "*x > right_x" is because of character terminals. */ - else if (!w->pseudo_window_p - && !WINDOW_RIGHTMOST_P (w) - && *x > right_x - ux) + if (!w->pseudo_window_p + && !WINDOW_RIGHTMOST_P (w) + && *x > right_x - ux) { /* On the border on the right side of the window? Assume that this area begins at RIGHT_X minus a canonical char width. */ - part = ON_VERTICAL_BORDER; + return ON_VERTICAL_BORDER; } - else + } + + if (*x < text_left) + { + if (lmargin_width > 0 + && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) + ? (*x >= left_x + WINDOW_LEFT_FRINGE_WIDTH (w)) + : (*x < left_x + lmargin_width))) { - /* Convert X and Y to window-relative pixel coordinates. */ *x -= left_x; + if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)) + *x -= WINDOW_LEFT_FRINGE_WIDTH (w); *y -= top_y; - part = ON_TEXT; + return ON_LEFT_MARGIN; } + + /* Convert X and Y to window-relative pixel coordinates. */ + *x -= left_x; + *y -= top_y; + return ON_LEFT_FRINGE; } - return part; + if (*x >= text_right) + { + if (rmargin_width > 0 + && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) + ? (*x < right_x - WINDOW_RIGHT_FRINGE_WIDTH (w)) + : (*x >= right_x - rmargin_width))) + { + *x -= right_x; + if (!WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)) + *x -= WINDOW_RIGHT_FRINGE_WIDTH (w); + *y -= top_y; + return ON_RIGHT_MARGIN; + } + + /* Convert X and Y to window-relative pixel coordinates. */ + *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w); + *y -= top_y; + return ON_RIGHT_FRINGE; + } + + /* Everything special ruled out - must be on text area */ + *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w); + *y -= top_y; + return ON_TEXT; } @@ -669,11 +770,12 @@ If COORDINATES are in the text portion of WINDOW, the coordinates relative to the window are returned. If they are in the mode line of WINDOW, `mode-line' is returned. If they are in the top mode line of WINDOW, `header-line' is returned. -If they are in the fringe to the left of the window, - `left-fringe' is returned, if they are in the area on the right of - the window, `right-fringe' is returned. +If they are in the left fringe of WINDOW, `left-fringe' is returned. +If they are in the right fringe of WINDOW, `right-fringe' is returned. If they are on the border between WINDOW and its right sibling, - `vertical-line' is returned. */) + `vertical-line' is returned. +If they are in the windows's left or right marginal areas, `left-margin'\n\ + or `right-margin' is returned. */) (coordinates, window) register Lisp_Object coordinates, window; { @@ -682,16 +784,16 @@ If they are on the border between WINDOW and its right sibling, int x, y; Lisp_Object lx, ly; - CHECK_LIVE_WINDOW (window, 0); + CHECK_WINDOW (window); w = XWINDOW (window); f = XFRAME (w->frame); - CHECK_CONS (coordinates, 1); + CHECK_CONS (coordinates); lx = Fcar (coordinates); ly = Fcdr (coordinates); - CHECK_NUMBER_OR_FLOAT (lx, 1); - CHECK_NUMBER_OR_FLOAT (ly, 1); - x = PIXEL_X_FROM_CANON_X (f, lx); - y = PIXEL_Y_FROM_CANON_Y (f, ly); + CHECK_NUMBER_OR_FLOAT (lx); + CHECK_NUMBER_OR_FLOAT (ly); + x = FRAME_PIXEL_X_FROM_CANON_X (f, lx); + y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly); switch (coordinates_in_window (w, &x, &y)) { @@ -701,8 +803,8 @@ If they are on the border between WINDOW and its right sibling, case ON_TEXT: /* X and Y are now window relative pixel coordinates. Convert them to canonical char units before returning them. */ - return Fcons (CANON_X_FROM_PIXEL_X (f, x), - CANON_Y_FROM_PIXEL_Y (f, y)); + return Fcons (FRAME_CANON_X_FROM_PIXEL_X (f, x), + FRAME_CANON_Y_FROM_PIXEL_Y (f, y)); case ON_MODE_LINE: return Qmode_line; @@ -715,10 +817,16 @@ If they are on the border between WINDOW and its right sibling, case ON_LEFT_FRINGE: return Qleft_fringe; - + case ON_RIGHT_FRINGE: return Qright_fringe; + case ON_LEFT_MARGIN: + return Qleft_margin; + + case ON_RIGHT_MARGIN: + return Qright_margin; + default: abort (); } @@ -737,7 +845,8 @@ If they are on the border between WINDOW and its right sibling, struct check_window_data { Lisp_Object *window; - int *x, *y, *part; + int *x, *y; + enum window_part *part; }; static int @@ -752,20 +861,23 @@ check_window_containing (w, user_data) found = coordinates_in_window (w, cw->x, cw->y); if (found != ON_NOTHING) { - *cw->part = found - 1; + *cw->part = found; XSETWINDOW (*cw->window, w); continue_p = 0; } - + return continue_p; } /* Find the window containing frame-relative pixel position X/Y and - return it as a Lisp_Object. If X, Y is on the window's modeline, - set *PART to 1; if it is on the separating line between the window - and its right sibling, set it to 2; otherwise set it to 0. If - there is no window under X, Y return nil and leave *PART + return it as a Lisp_Object. + + If X, Y is on one of the window's special `window_part' elements, + set *PART to the id of that element, and return X and Y converted + to window relative coordinates in WX and WY. + + If there is no window under X, Y return nil and leave *PART unmodified. TOOL_BAR_P non-zero means detect tool-bar windows. This function was previously implemented with a loop cycling over @@ -778,32 +890,40 @@ check_window_containing (w, user_data) case. */ Lisp_Object -window_from_coordinates (f, x, y, part, tool_bar_p) +window_from_coordinates (f, x, y, part, wx, wy, tool_bar_p) struct frame *f; int x, y; - int *part; + enum window_part *part; + int *wx, *wy; int tool_bar_p; { Lisp_Object window; struct check_window_data cw; + enum window_part dummy; + + if (part == 0) + part = &dummy; window = Qnil; cw.window = &window, cw.x = &x, cw.y = &y; cw.part = part; foreach_window (f, check_window_containing, &cw); - + /* If not found above, see if it's in the tool bar window, if a tool bar exists. */ if (NILP (window) && tool_bar_p && WINDOWP (f->tool_bar_window) - && XINT (XWINDOW (f->tool_bar_window)->height) > 0 + && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)) > 0 && (coordinates_in_window (XWINDOW (f->tool_bar_window), &x, &y) != ON_NOTHING)) { - *part = 0; + *part = ON_TEXT; window = f->tool_bar_window; } + if (wx) *wx = x; + if (wy) *wy = y; + return window; } @@ -815,22 +935,21 @@ column 0. */) (x, y, frame) Lisp_Object x, y, frame; { - int part; struct frame *f; if (NILP (frame)) frame = selected_frame; - CHECK_LIVE_FRAME (frame, 2); + CHECK_LIVE_FRAME (frame); f = XFRAME (frame); /* Check that arguments are integers or floats. */ - CHECK_NUMBER_OR_FLOAT (x, 0); - CHECK_NUMBER_OR_FLOAT (y, 1); + CHECK_NUMBER_OR_FLOAT (x); + CHECK_NUMBER_OR_FLOAT (y); - return window_from_coordinates (f, - PIXEL_X_FROM_CANON_X (f, x), - PIXEL_Y_FROM_CANON_Y (f, y), - &part, 0); + return window_from_coordinates (f, + FRAME_PIXEL_X_FROM_CANON_X (f, x), + FRAME_PIXEL_Y_FROM_CANON_Y (f, y), + 0, 0, 0, 0); } DEFUN ("window-point", Fwindow_point, Swindow_point, 0, 1, 0, @@ -889,7 +1008,7 @@ if it isn't already recorded. */) Lisp_Object buf; buf = w->buffer; - CHECK_BUFFER (buf, 0); + CHECK_BUFFER (buf); #if 0 /* This change broke some things. We should make it later. */ /* If we don't know the end position, return nil. @@ -909,7 +1028,7 @@ if it isn't already recorded. */) struct buffer *old_buffer = NULL, *b = XBUFFER (buf); /* In case W->start is out of the range, use something - reasonable. This situation occured when loading a file with + reasonable. This situation occurred when loading a file with `-l' containing a call to `rmail' with subsequent other commands. At the end, W->start happened to be BEG, while rmail had already narrowed the buffer. */ @@ -927,13 +1046,13 @@ if it isn't already recorded. */) old_buffer = current_buffer; set_buffer_internal (b); } - + start_display (&it, w, startp); move_it_vertically (&it, window_box_height (w)); if (it.current_y < it.last_visible_y) move_it_past_eol (&it); value = make_number (IT_CHARPOS (it)); - + if (old_buffer) set_buffer_internal (old_buffer); } @@ -950,7 +1069,7 @@ DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, { register struct window *w = decode_window (window); - CHECK_NUMBER_COERCE_MARKER (pos, 1); + CHECK_NUMBER_COERCE_MARKER (pos); if (w == XWINDOW (selected_window) && XBUFFER (w->buffer) == current_buffer) Fgoto_char (pos); @@ -961,7 +1080,7 @@ DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, the new value of point. */ if (!EQ (window, selected_window)) ++windows_or_buffers_changed; - + return pos; } @@ -974,7 +1093,7 @@ from overriding motion of point in order to display at this exact start. */) { register struct window *w = decode_window (window); - CHECK_NUMBER_COERCE_MARKER (pos, 1); + CHECK_NUMBER_COERCE_MARKER (pos); set_marker_restricted (w->start, pos, w->buffer); /* this is not right, but much easier than doing what is right. */ w->start_at_line_beg = Qnil; @@ -1011,10 +1130,7 @@ non-nil means yes. */) { register struct window *w = decode_window (window); - if (NILP (arg)) - w->dedicated = Qnil; - else - w->dedicated = Qt; + w->dedicated = arg; return w->dedicated; } @@ -1044,7 +1160,7 @@ window_display_table (w) else if (BUFFERP (w->buffer)) { struct buffer *b = XBUFFER (w->buffer); - + if (DISP_TABLE_P (b->display_table)) dp = XCHAR_TABLE (b->display_table); else if (DISP_TABLE_P (Vstandard_display_table)) @@ -1110,7 +1226,7 @@ unshow_buffer (w) clip_to_bounds (BUF_BEGV_BYTE (b), marker_byte_position (w->pointm), BUF_ZV_BYTE (b))); - + if (WINDOWP (b->last_selected_window) && w == XWINDOW (b->last_selected_window)) b->last_selected_window = Qnil; @@ -1130,23 +1246,24 @@ replace_window (old, replacement) if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; - p->left = o->left; - p->top = o->top; - p->width = o->width; - p->height = o->height; + p->left_col = o->left_col; + p->top_line = o->top_line; + p->total_cols = o->total_cols; + p->total_lines = o->total_lines; p->desired_matrix = p->current_matrix = 0; p->vscroll = 0; bzero (&p->cursor, sizeof (p->cursor)); bzero (&p->last_cursor, sizeof (p->last_cursor)); bzero (&p->phys_cursor, sizeof (p->phys_cursor)); p->phys_cursor_type = -1; + p->phys_cursor_width = -1; p->must_be_updated_p = 0; p->pseudo_window_p = 0; XSETFASTINT (p->window_end_vpos, 0); XSETFASTINT (p->window_end_pos, 0); p->window_end_valid = Qnil; p->frozen_window_start_p = 0; - p->orig_top = p->orig_height = Qnil; + p->orig_top_line = p->orig_total_lines = Qnil; p->next = tem = o->next; if (!NILP (tem)) @@ -1199,7 +1316,7 @@ delete_window (window) if (NILP (window)) window = selected_window; else - CHECK_WINDOW (window, 0); + CHECK_WINDOW (window); p = XWINDOW (window); /* It's okay to delete an already-deleted window. */ @@ -1220,34 +1337,49 @@ delete_window (window) /* Are we trying to delete any frame's selected window? */ { - Lisp_Object pwindow; + Lisp_Object swindow, pwindow; /* See if the frame's selected window is either WINDOW or any subwindow of it, by finding all that window's parents and comparing each one with WINDOW. */ - pwindow = FRAME_SELECTED_WINDOW (f); + swindow = FRAME_SELECTED_WINDOW (f); - while (!NILP (pwindow)) + while (1) { - if (EQ (window, pwindow)) + pwindow = swindow; + while (!NILP (pwindow)) + { + if (EQ (window, pwindow)) + break; + pwindow = XWINDOW (pwindow)->parent; + } + + /* If the window being deleted is not a parent of SWINDOW, + then SWINDOW is ok as the new selected window. */ + if (!EQ (window, pwindow)) break; - pwindow = XWINDOW (pwindow)->parent; + /* Otherwise, try another window for SWINDOW. */ + swindow = Fnext_window (swindow, Qlambda, Qnil);; + + /* If we get back to the frame's selected window, + it means there was no acceptable alternative, + so we cannot delete. */ + if (EQ (swindow, FRAME_SELECTED_WINDOW (f))) + error ("Cannot delete window"); } - if (EQ (window, pwindow)) + /* If we need to change SWINDOW, do it. */ + if (! EQ (swindow, FRAME_SELECTED_WINDOW (f))) { - Lisp_Object alternative; - alternative = Fnext_window (window, Qlambda, Qnil); - /* If we're about to delete the selected window on the selected frame, then we should use Fselect_window to select the new window. On the other hand, if we're about to delete the selected window on any other frame, we shouldn't do anything but set the frame's selected_window slot. */ - if (EQ (window, selected_window)) - Fselect_window (alternative); + if (EQ (FRAME_SELECTED_WINDOW (f), selected_window)) + Fselect_window (swindow, Qnil); else - FRAME_SELECTED_WINDOW (f) = alternative; + FRAME_SELECTED_WINDOW (f) = swindow; } } @@ -1257,8 +1389,8 @@ delete_window (window) if (!NILP (tem)) { unshow_buffer (p); - unchain_marker (p->pointm); - unchain_marker (p->start); + unchain_marker (XMARKER (p->pointm)); + unchain_marker (XMARKER (p->start)); } /* Free window glyph matrices. It is sure that they are allocated @@ -1290,18 +1422,18 @@ delete_window (window) set_window_{height,width} will re-position the sibling's children. */ sib = p->next; - XWINDOW (sib)->top = p->top; - XWINDOW (sib)->left = p->left; + XWINDOW (sib)->top_line = p->top_line; + XWINDOW (sib)->left_col = p->left_col; } /* Stretch that sibling. */ if (!NILP (par->vchild)) set_window_height (sib, - XFASTINT (XWINDOW (sib)->height) + XFASTINT (p->height), + XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines), 1); if (!NILP (par->hchild)) set_window_width (sib, - XFASTINT (XWINDOW (sib)->width) + XFASTINT (p->width), + XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols), 1); /* If parent now has only one child, @@ -1376,7 +1508,7 @@ window_list () Vwindow_list = Fnconc (2, args); } } - + return Vwindow_list; } @@ -1452,15 +1584,15 @@ decode_next_window_args (window, minibuf, all_frames) if (NILP (*window)) *window = selected_window; else - CHECK_LIVE_WINDOW (*window, 0); - + CHECK_LIVE_WINDOW (*window); + /* MINIBUF nil may or may not include minibuffers. Decide if it does. */ if (NILP (*minibuf)) *minibuf = minibuf_level ? minibuf_window : Qlambda; else if (!EQ (*minibuf, Qt)) *minibuf = Qlambda; - + /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' => count none of them, or a specific minibuffer window (the active one) to count. */ @@ -1478,7 +1610,7 @@ decode_next_window_args (window, minibuf, all_frames) ; else if (!EQ (*all_frames, Qt)) *all_frames = Qnil; - + /* Now *ALL_FRAMES is t meaning search all frames, nil meaning search just current frame, `visible' meaning search just visible frames, 0 meaning search visible and iconified frames, or a @@ -1498,17 +1630,17 @@ next_window (window, minibuf, all_frames, next_p) int next_p; { decode_next_window_args (&window, &minibuf, &all_frames); - + /* If ALL_FRAMES is a frame, and WINDOW isn't on that frame, just return the first window on the frame. */ if (FRAMEP (all_frames) && !EQ (all_frames, XWINDOW (window)->frame)) return Fframe_first_window (all_frames); - + if (next_p) { Lisp_Object list; - + /* Find WINDOW in the list of all windows. */ list = Fmemq (window, window_list ()); @@ -1532,7 +1664,7 @@ next_window (window, minibuf, all_frames, next_p) else { Lisp_Object candidate, list; - + /* Scan through the list of windows for candidates. If there are candidate windows in front of WINDOW, the last one of these is the one we want. If there are candidates following WINDOW @@ -1636,15 +1768,15 @@ argument ALL_FRAMES is non-nil, cycle through all frames. */) Lisp_Object window; int i; - CHECK_NUMBER (arg, 0); + CHECK_NUMBER (arg); window = selected_window; - + for (i = XINT (arg); i > 0; --i) window = Fnext_window (window, Qnil, all_frames); for (; i < 0; ++i) window = Fprevious_window (window, Qnil, all_frames); - Fselect_window (window); + Fselect_window (window, Qnil); return Qnil; } @@ -1683,11 +1815,11 @@ window_list_1 (window, minibuf, all_frames) decode_next_window_args (&window, &minibuf, &all_frames); list = Qnil; - + for (tail = window_list (); CONSP (tail); tail = XCDR (tail)) if (candidate_window_p (XCAR (tail), window, minibuf, all_frames)) list = Fcons (XCAR (tail), list); - + return Fnreverse (list); } @@ -1710,6 +1842,7 @@ enum window_loop DELETE_BUFFER_WINDOWS, /* Arg is buffer */ GET_LARGEST_WINDOW, UNSHOW_BUFFER, /* Arg is buffer */ + REDISPLAY_BUFFER_WINDOWS, /* Arg is buffer */ CHECK_ALL_WINDOWS }; @@ -1722,7 +1855,7 @@ window_loop (type, obj, mini, frames) Lisp_Object window, windows, best_window, frame_arg; struct frame *f; struct gcpro gcpro1; - + /* If we're only looping through windows on a particular frame, frame points to that frame. If we're looping through windows on all frames, frame is 0. */ @@ -1732,7 +1865,7 @@ window_loop (type, obj, mini, frames) f = SELECTED_FRAME (); else f = NULL; - + if (f) frame_arg = Qlambda; else if (XFASTINT (frames) == 0) @@ -1761,10 +1894,10 @@ window_loop (type, obj, mini, frames) for (; CONSP (windows); windows = CDR (windows)) { struct window *w; - + window = XCAR (windows); w = XWINDOW (window); - + /* Note that we do not pay attention here to whether the frame is visible, since Fwindow_list skips non-visible frames if that is desired, under the control of frame_arg. */ @@ -1796,7 +1929,7 @@ window_loop (type, obj, mini, frames) if (!NILP (obj) && !WINDOW_FULL_WIDTH_P (w)) break; /* Ignore dedicated windows and minibuffers. */ - if (MINI_WINDOW_P (w) || !NILP (w->dedicated)) + if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) break; if (NILP (best_window) || (XFASTINT (XWINDOW (best_window)->use_time) @@ -1826,7 +1959,7 @@ window_loop (type, obj, mini, frames) && EQ (XWINDOW (XCAR (windows))->frame, XWINDOW (XCAR (XCDR (windows)))->frame)) windows = XCDR (windows); - + /* Now we can safely delete the frame. */ Fdelete_frame (w->frame, Qnil); } @@ -1837,7 +1970,7 @@ window_loop (type, obj, mini, frames) display there. */ Lisp_Object buffer; buffer = Fother_buffer (obj, Qnil, w->frame); - Fset_window_buffer (window, buffer); + Fset_window_buffer (window, buffer, Qnil); if (EQ (window, selected_window)) Fset_buffer (w->buffer); } @@ -1849,16 +1982,16 @@ window_loop (type, obj, mini, frames) case GET_LARGEST_WINDOW: { /* Ignore dedicated windows and minibuffers. */ - if (MINI_WINDOW_P (w) || !NILP (w->dedicated)) + if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) break; - + if (NILP (best_window)) best_window = window; else { struct window *b = XWINDOW (best_window); - if (XFASTINT (w->height) * XFASTINT (w->width) - > XFASTINT (b->height) * XFASTINT (b->width)) + if (XFASTINT (w->total_lines) * XFASTINT (w->total_cols) + > XFASTINT (b->total_lines) * XFASTINT (b->total_cols)) best_window = window; } } @@ -1869,10 +2002,10 @@ window_loop (type, obj, mini, frames) { Lisp_Object buffer; struct frame *f = XFRAME (w->frame); - + /* Find another buffer to show in this window. */ buffer = Fother_buffer (obj, Qnil, w->frame); - + /* If this window is dedicated, and in a frame of its own, kill the frame. */ if (EQ (window, FRAME_ROOT_WINDOW (f)) @@ -1885,21 +2018,40 @@ window_loop (type, obj, mini, frames) && EQ (XWINDOW (XCAR (windows))->frame, XWINDOW (XCAR (XCDR (windows)))->frame)) windows = XCDR (windows); - + /* Now we can safely delete the frame. */ Fdelete_frame (w->frame, Qnil); } + else if (!NILP (w->dedicated) && !NILP (w->parent)) + { + Lisp_Object window; + XSETWINDOW (window, w); + /* If this window is dedicated and not the only window + in its frame, then kill it. */ + Fdelete_window (window); + } else { /* Otherwise show a different buffer in the window. */ w->dedicated = Qnil; - Fset_window_buffer (window, buffer); + Fset_window_buffer (window, buffer, Qnil); if (EQ (window, selected_window)) Fset_buffer (w->buffer); } } break; + case REDISPLAY_BUFFER_WINDOWS: + if (EQ (w->buffer, obj)) + { + mark_window_display_accurate (window, 0); + w->update_mode_line = Qt; + XBUFFER (obj)->prevent_redisplay_optimizations_p = 1; + ++update_mode_lines; + best_window = window; + } + break; + /* Check for a window that has a killed buffer. */ case CHECK_ALL_WINDOWS: if (! NILP (w->buffer) @@ -1926,6 +2078,7 @@ check_all_windows () DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0, doc: /* Return the window least recently selected or used for display. +Return a full-width window if possible. If optional argument FRAME is `visible', search all visible frames. If FRAME is 0, search all visible and iconified frames. If FRAME is t, search all frames. @@ -1994,11 +2147,11 @@ value is reasonable when this function is called. */) if (NILP (window)) window = selected_window; else - CHECK_LIVE_WINDOW (window, 0); + CHECK_LIVE_WINDOW (window); w = XWINDOW (window); startpos = marker_position (w->start); - top = XFASTINT (w->top) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); + top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); if (MINI_WINDOW_P (w) && top > 0) error ("Can't expand minibuffer to full frame"); @@ -2010,7 +2163,7 @@ value is reasonable when this function is called. */) on the frame. But don't try to do this if the window start is outside the visible portion (as might happen when the display is not current, due to typeahead). */ - new_top = XFASTINT (w->top) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); + new_top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); if (new_top != top && startpos >= BUF_BEGV (XBUFFER (w->buffer)) && startpos <= BUF_ZV (XBUFFER (w->buffer))) @@ -2060,10 +2213,10 @@ If FRAME is a frame, search only that frame. */) if (!NILP (buffer)) { buffer = Fget_buffer (buffer); - CHECK_BUFFER (buffer, 0); + CHECK_BUFFER (buffer); window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); } - + return Qnil; } @@ -2077,7 +2230,7 @@ DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows, if (!NILP (buffer)) { buffer = Fget_buffer (buffer); - CHECK_BUFFER (buffer, 0); + CHECK_BUFFER (buffer); window_loop (UNSHOW_BUFFER, buffer, 0, Qt); } return Qnil; @@ -2109,7 +2262,7 @@ replace_buffer_in_all_windows (buffer) might crash Emacs. */ #define MIN_SAFE_WINDOW_WIDTH (2) -#define MIN_SAFE_WINDOW_HEIGHT (2) +#define MIN_SAFE_WINDOW_HEIGHT (1) /* Make sure that window_min_height and window_min_width are not too small; if they are, set them to safe minima. */ @@ -2133,14 +2286,13 @@ check_frame_size (frame, rows, cols) int *rows, *cols; { /* For height, we have to see: - whether the frame has a minibuffer, - whether it wants a mode line, and - whether it has a menu bar. */ - int min_height = - (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1 - : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT - : 2 * MIN_SAFE_WINDOW_HEIGHT - 1); - + how many windows the frame has at minimum (one or two), + and whether it has a menu bar or other special stuff at the top. */ + int min_height + = ((FRAME_MINIBUF_ONLY_P (frame) || ! FRAME_HAS_MINIBUF_P (frame)) + ? MIN_SAFE_WINDOW_HEIGHT + : 2 * MIN_SAFE_WINDOW_HEIGHT); + if (FRAME_TOP_MARGIN (frame) > 0) min_height += FRAME_TOP_MARGIN (frame); @@ -2164,11 +2316,11 @@ window_fixed_size_p (w, width_p, check_siblings_p) { int fixed_p; struct window *c; - + if (!NILP (w->hchild)) { c = XWINDOW (w->hchild); - + if (width_p) { /* A horiz. combination is fixed-width if all of if its @@ -2189,7 +2341,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) else if (!NILP (w->vchild)) { c = XWINDOW (w->vchild); - + if (width_p) { /* A vert. combination is fixed-width if one of if its @@ -2215,7 +2367,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) { struct buffer *old = current_buffer; Lisp_Object val; - + current_buffer = XBUFFER (w->buffer); val = find_symbol_value (Qwindow_size_fixed); current_buffer = old; @@ -2224,7 +2376,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) if (!EQ (val, Qunbound)) { fixed_p = !NILP (val); - + if (fixed_p && ((EQ (val, Qheight) && width_p) || (EQ (val, Qwidth) && !width_p))) @@ -2237,7 +2389,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) { Lisp_Object child; - + for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev) if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) break; @@ -2256,7 +2408,7 @@ window_fixed_size_p (w, width_p, check_siblings_p) return fixed_p; } - + /* Return the minimum size of window W, not taking fixed-width windows into account. WIDTH_P non-zero means return the minimum width, @@ -2270,12 +2422,12 @@ window_min_size_1 (w, width_p) { struct window *c; int size; - + if (!NILP (w->hchild)) { c = XWINDOW (w->hchild); size = 0; - + if (width_p) { /* The min width of a horizontal combination is @@ -2302,7 +2454,7 @@ window_min_size_1 (w, width_p) { c = XWINDOW (w->vchild); size = 0; - + if (width_p) { /* The min width of a vertical combination is @@ -2361,24 +2513,176 @@ window_min_size (w, width_p, ignore_fixed_p, fixed) fixed_p = 0; else fixed_p = window_fixed_size_p (w, width_p, 1); - + if (fixed) *fixed = fixed_p; - + if (fixed_p) - size = width_p ? XFASTINT (w->width) : XFASTINT (w->height); + size = width_p ? XFASTINT (w->total_cols) : XFASTINT (w->total_lines); else size = window_min_size_1 (w, width_p); - + return size; } +/* Adjust the margins of window W if text area is too small. + Return 1 if window width is ok after adjustment; 0 if window + is still too narrow. */ + +static int +adjust_window_margins (w) + struct window *w; +{ + int box_cols = (WINDOW_TOTAL_COLS (w) + - WINDOW_FRINGE_COLS (w) + - WINDOW_SCROLL_BAR_COLS (w)); + int margin_cols = (WINDOW_LEFT_MARGIN_COLS (w) + + WINDOW_RIGHT_MARGIN_COLS (w)); + + if (box_cols - margin_cols >= MIN_SAFE_WINDOW_WIDTH) + return 1; + + if (margin_cols < 0 || box_cols < MIN_SAFE_WINDOW_WIDTH) + return 0; + + /* Window's text area is too narrow, but reducing the window + margins will fix that. */ + margin_cols = box_cols - MIN_SAFE_WINDOW_WIDTH; + if (WINDOW_RIGHT_MARGIN_COLS (w) > 0) + { + if (WINDOW_LEFT_MARGIN_COLS (w) > 0) + w->left_margin_cols = w->right_margin_cols + = make_number (margin_cols/2); + else + w->right_margin_cols = make_number (margin_cols); + } + else + w->left_margin_cols = make_number (margin_cols); + return 1; +} + +/* Calculate new sizes for windows in the list FORWARD when the window size + goes from TOTAL to SIZE. TOTAL must be greater than SIZE. + The number of windows in FORWARD is NCHILDREN, and the number that + can shrink is SHRINKABLE. + The minimum size a window can have is MIN_SIZE. + If we are shrinking fixed windows, RESIZE_FIXED_P is non-zero. + If we are shrinking columns, WIDTH_P is non-zero, otherwise we are + shrinking rows. + + This function returns an allocated array of new sizes that the caller + must free. The size -1 means the window is fixed and RESIZE_FIXED_P + is zero. Array index 0 refers to the first window in FORWARD, 1 to + the second, and so on. + + This function tries to keep windows at least at the minimum size + and resize other windows before it resizes any window to zero (i.e. + delete that window). + + Windows are resized proportional to their size, so bigger windows + shrink more than smaller windows. */ +static int * +shrink_windows (total, size, nchildren, shrinkable, + min_size, resize_fixed_p, forward, width_p) + int total, size, nchildren, shrinkable, min_size; + int resize_fixed_p, width_p; + Lisp_Object forward; +{ + int available_resize = 0; + int *new_sizes; + struct window *c; + Lisp_Object child; + int smallest = total; + int total_removed = 0; + int total_shrink = total - size; + int i; + + new_sizes = xmalloc (sizeof (*new_sizes) * nchildren); + + for (i = 0, child = forward; !NILP (child); child = c->next, ++i) + { + int child_size; + + c = XWINDOW (child); + child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines); + + if (! resize_fixed_p && window_fixed_size_p (c, width_p, 0)) + new_sizes[i] = -1; + else + { + new_sizes[i] = child_size; + if (child_size > min_size) + available_resize += child_size - min_size; + } + } + /* We might need to shrink some windows to zero. Find the smallest + windows and set them to 0 until we can fulfil the new size. */ + + while (shrinkable > 1 && size + available_resize < total) + { + for (i = 0; i < nchildren; ++i) + if (new_sizes[i] > 0 && smallest > new_sizes[i]) + smallest = new_sizes[i]; + + for (i = 0; i < nchildren; ++i) + if (new_sizes[i] == smallest) + { + /* Resize this window down to zero. */ + new_sizes[i] = 0; + if (smallest > min_size) + available_resize -= smallest - min_size; + available_resize += smallest; + --shrinkable; + total_removed += smallest; + + /* Out of for, just remove one window at the time and + check again if we have enough space. */ + break; + } + } + + /* Now, calculate the new sizes. Try to shrink each window + proportional to its size. */ + for (i = 0; i < nchildren; ++i) + { + if (new_sizes[i] > min_size) + { + int to_shrink = total_shrink*new_sizes[i]/total; + if (new_sizes[i] - to_shrink < min_size) + to_shrink = new_sizes[i] - min_size; + new_sizes[i] -= to_shrink; + total_removed += to_shrink; + } + } + + /* Any reminder due to rounding, we just subtract from windows + that are left and still can be shrunk. */ + while (total_shrink > total_removed) + { + for (i = 0; i < nchildren; ++i) + if (new_sizes[i] > min_size) + { + --new_sizes[i]; + ++total_removed; + + /* Out of for, just shrink one window at the time and + check again if we have enough space. */ + break; + } + } + + return new_sizes; +} + /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set WINDOW's width. Resize WINDOW's children, if any, so that they keep their proportionate size relative to WINDOW. Propagate WINDOW's top or left edge position to children. Delete windows - that become too small unless NODELETE_P is non-zero. */ + that become too small unless NODELETE_P is non-zero. + + If NODELETE_P is 2, that means we do delete windows that are + too small, even if they were too small before! */ static void size_window (window, size, width_p, nodelete_p) @@ -2388,36 +2692,46 @@ size_window (window, size, width_p, nodelete_p) struct window *w = XWINDOW (window); struct window *c; Lisp_Object child, *forward, *sideward; - int old_size, min_size; + int old_size, min_size, safe_min_size; + + /* We test nodelete_p != 2 and nodelete_p != 1 below, so it + seems like it's too soon to do this here. ++KFS. */ + if (nodelete_p == 2) + nodelete_p = 0; check_min_window_sizes (); size = max (0, size); - + /* If the window has been "too small" at one point, don't delete it for being "too small" in the future. Preserve it as long as that is at all possible. */ if (width_p) { - old_size = XINT (w->width); + old_size = WINDOW_TOTAL_COLS (w); min_size = window_min_width; + /* Ensure that there is room for the scroll bar and fringes! + We may reduce display margins though. */ + safe_min_size = (MIN_SAFE_WINDOW_WIDTH + + WINDOW_FRINGE_COLS (w) + + WINDOW_SCROLL_BAR_COLS (w)); } else { - old_size = XINT (w->height); + old_size = XINT (w->total_lines); min_size = window_min_height; + safe_min_size = MIN_SAFE_WINDOW_HEIGHT; } - - if (old_size < min_size) + + if (old_size < min_size && nodelete_p != 2) w->too_small_ok = Qt; /* Maybe delete WINDOW if it's too small. */ - if (!nodelete_p && !NILP (w->parent)) + if (nodelete_p != 1 && !NILP (w->parent)) { if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok)) min_size = width_p ? MIN_SAFE_WINDOW_WIDTH : MIN_SAFE_WINDOW_HEIGHT; - else - min_size = width_p ? window_min_width : window_min_height; - + if (min_size < safe_min_size) + min_size = safe_min_size; if (size < min_size) { delete_window (window); @@ -2435,14 +2749,15 @@ size_window (window, size, width_p, nodelete_p) { sideward = &w->vchild; forward = &w->hchild; - w->width = make_number (size); + w->total_cols = make_number (size); + adjust_window_margins (w); } else { sideward = &w->hchild; forward = &w->vchild; - w->height = make_number (size); - w->orig_height = Qnil; + w->total_lines = make_number (size); + w->orig_total_lines = Qnil; } if (!NILP (*sideward)) @@ -2451,9 +2766,9 @@ size_window (window, size, width_p, nodelete_p) { c = XWINDOW (child); if (width_p) - c->left = w->left; + c->left_col = w->left_col; else - c->top = w->top; + c->top_line = w->top_line; size_window (child, size, width_p, nodelete_p); } } @@ -2462,6 +2777,7 @@ size_window (window, size, width_p, nodelete_p) int fixed_size, each, extra, n; int resize_fixed_p, nfixed; int last_pos, first_pos, nchildren, total; + int *new_sizes = NULL; /* Determine the fixed-size portion of the this window, and the number of child windows. */ @@ -2469,11 +2785,11 @@ size_window (window, size, width_p, nodelete_p) for (child = *forward; !NILP (child); child = c->next, ++nchildren) { int child_size; - + c = XWINDOW (child); - child_size = width_p ? XINT (c->width) : XINT (c->height); + child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines); total += child_size; - + if (window_fixed_size_p (c, width_p, 0)) { fixed_size += child_size; @@ -2486,37 +2802,43 @@ size_window (window, size, width_p, nodelete_p) windows. */ resize_fixed_p = nfixed == nchildren || size < fixed_size; - /* Compute how many lines/columns to add to each child. The + /* Compute how many lines/columns to add/remove to each child. The value of extra takes care of rounding errors. */ n = resize_fixed_p ? nchildren : nchildren - nfixed; - each = (size - total) / n; - extra = (size - total) - n * each; + if (size < total && n > 1) + new_sizes = shrink_windows (total, size, nchildren, n, min_size, + resize_fixed_p, *forward, width_p); + else + { + each = (size - total) / n; + extra = (size - total) - n * each; + } /* Compute new children heights and edge positions. */ - first_pos = width_p ? XINT (w->left) : XINT (w->top); + first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line); last_pos = first_pos; - for (child = *forward; !NILP (child); child = c->next) + for (n = 0, child = *forward; !NILP (child); child = c->next, ++n) { int new_size, old_size; - + c = XWINDOW (child); - old_size = width_p ? XFASTINT (c->width) : XFASTINT (c->height); + old_size = width_p ? XFASTINT (c->total_cols) : XFASTINT (c->total_lines); new_size = old_size; /* The top or left edge position of this child equals the bottom or right edge of its predecessor. */ if (width_p) - c->left = make_number (last_pos); + c->left_col = make_number (last_pos); else - c->top = make_number (last_pos); + c->top_line = make_number (last_pos); /* If this child can be resized, do it. */ if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) { - new_size = old_size + each + extra; + new_size = new_sizes ? new_sizes[n] : old_size + each + extra; extra = 0; } - + /* Set new height. Note that size_window also propagates edge positions to children, so it's not a no-op if we didn't change the child's size. */ @@ -2524,20 +2846,22 @@ size_window (window, size, width_p, nodelete_p) /* Remember the bottom/right edge position of this child; it will be used to set the top/left edge of the next child. */ - last_pos += new_size; + last_pos += new_size; } + if (new_sizes) xfree (new_sizes); + /* We should have covered the parent exactly with child windows. */ xassert (size == last_pos - first_pos); - + /* Now delete any children that became too small. */ if (!nodelete_p) for (child = *forward; !NILP (child); child = c->next) { int child_size; c = XWINDOW (child); - child_size = width_p ? XINT (c->width) : XINT (c->height); - size_window (child, child_size, width_p, 0); + child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines); + size_window (child, child_size, width_p, 2); } } } @@ -2571,6 +2895,35 @@ set_window_width (window, width, nodelete) size_window (window, width, 1, nodelete); } +/* Change window heights in windows rooted in WINDOW by N lines. */ + +void +change_window_heights (window, n) + Lisp_Object window; + int n; +{ + struct window *w = XWINDOW (window); + + XSETFASTINT (w->top_line, XFASTINT (w->top_line) + n); + XSETFASTINT (w->total_lines, XFASTINT (w->total_lines) - n); + + if (INTEGERP (w->orig_top_line)) + XSETFASTINT (w->orig_top_line, XFASTINT (w->orig_top_line) + n); + if (INTEGERP (w->orig_total_lines)) + XSETFASTINT (w->orig_total_lines, XFASTINT (w->orig_total_lines) - n); + + /* Handle just the top child in a vertical split. */ + if (!NILP (w->vchild)) + change_window_heights (w->vchild, n); + + /* Adjust all children in a horizontal split. */ + for (window = w->hchild; !NILP (window); window = w->next) + { + w = XWINDOW (window); + change_window_heights (window, n); + } +} + int window_select_count; @@ -2582,19 +2935,23 @@ Fset_window_buffer_unwind (obuf) return Qnil; } +EXFUN (Fset_window_fringes, 4); +EXFUN (Fset_window_scroll_bars, 4); /* Make WINDOW display BUFFER as its contents. RUN_HOOKS_P non-zero means it's allowed to run hooks. See make_frame for a case where - it's not allowed. */ + it's not allowed. KEEP_MARGINS_P non-zero means that the current + margins, fringes, and scroll-bar settings of the window are not + reset from the buffer's local settings. */ void -set_window_buffer (window, buffer, run_hooks_p) +set_window_buffer (window, buffer, run_hooks_p, keep_margins_p) Lisp_Object window, buffer; - int run_hooks_p; + int run_hooks_p, keep_margins_p; { struct window *w = XWINDOW (window); struct buffer *b = XBUFFER (buffer); - int count = specpdl_ptr - specpdl; + int count = SPECPDL_INDEX (); w->buffer = buffer; @@ -2635,8 +2992,31 @@ set_window_buffer (window, buffer, run_hooks_p) Fset_buffer (buffer); } - /* Set left and right marginal area width from buffer. */ - Fset_window_margins (window, b->left_margin_width, b->right_margin_width); + if (!keep_margins_p) + { + /* Set left and right marginal area width etc. from buffer. */ + + /* This may call adjust_window_margins three times, so + temporarily disable window margins. */ + Lisp_Object save_left = w->left_margin_cols; + Lisp_Object save_right = w->right_margin_cols; + + w->left_margin_cols = w->right_margin_cols = Qnil; + + Fset_window_fringes (window, + b->left_fringe_width, b->right_fringe_width, + b->fringes_outside_margins); + + Fset_window_scroll_bars (window, + b->scroll_bar_width, + b->vertical_scroll_bar_type, Qnil); + + w->left_margin_cols = save_left; + w->right_margin_cols = save_right; + + Fset_window_margins (window, + b->left_margin_cols, b->right_margin_cols); + } if (run_hooks_p) { @@ -2653,18 +3033,22 @@ set_window_buffer (window, buffer, run_hooks_p) } -DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 2, 0, +DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, doc: /* Make WINDOW display BUFFER as its contents. -BUFFER can be a buffer or buffer name. */) - (window, buffer) - register Lisp_Object window, buffer; +BUFFER can be a buffer or buffer name. +Optional third arg KEEP_MARGINS non-nil means that WINDOW's current +display margins, fringe widths, and scroll bar settings are maintained; +the default is to reset these from BUFFER's local settings or the frame +defaults. */) + (window, buffer, keep_margins) + register Lisp_Object window, buffer, keep_margins; { register Lisp_Object tem; register struct window *w = decode_window (window); XSETWINDOW (window, w); buffer = Fget_buffer (buffer); - CHECK_BUFFER (buffer, 1); + CHECK_BUFFER (buffer); if (NILP (XBUFFER (buffer)->name)) error ("Attempt to display deleted buffer"); @@ -2677,39 +3061,35 @@ BUFFER can be a buffer or buffer name. */) { if (!NILP (w->dedicated) && !EQ (tem, buffer)) error ("Window is dedicated to `%s'", - XSTRING (XBUFFER (tem)->name)->data); + SDATA (XBUFFER (tem)->name)); unshow_buffer (w); } - set_window_buffer (window, buffer, 1); + set_window_buffer (window, buffer, 1, !NILP (keep_margins)); return Qnil; } -DEFUN ("select-window", Fselect_window, Sselect_window, 1, 1, 0, +/* Note that selected_window can be nil + when this is called from Fset_window_configuration. */ + +DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0, doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer. If WINDOW is not already selected, also make WINDOW's buffer current. +Also make WINDOW the frame's selected window. +Optional second arg NORECORD non-nil means +do not put this buffer at the front of the list of recently selected ones. + Note that the main editor command loop selects the buffer of the selected window before each command. */) - (window) - register Lisp_Object window; -{ - return select_window_1 (window, 1); -} - -/* Note that selected_window can be nil - when this is called from Fset_window_configuration. */ - -static Lisp_Object -select_window_1 (window, recordflag) - register Lisp_Object window; - int recordflag; + (window, norecord) + register Lisp_Object window, norecord; { register struct window *w; register struct window *ow; struct frame *sf; - CHECK_LIVE_WINDOW (window, 0); + CHECK_LIVE_WINDOW (window); w = XWINDOW (window); w->frozen_window_start_p = 0; @@ -2741,7 +3121,7 @@ select_window_1 (window, recordflag) else sf->selected_window = window; - if (recordflag) + if (NILP (norecord)) record_buffer (w->buffer); Fset_buffer (w->buffer); @@ -2765,6 +3145,13 @@ select_window_1 (window, recordflag) windows_or_buffers_changed++; return window; } + +static Lisp_Object +select_window_norecord (window) + Lisp_Object window; +{ + return Fselect_window (window, Qt); +} /* Deiconify the frame containing the window WINDOW, unless it is the selected frame; @@ -2782,17 +3169,24 @@ display_buffer_1 (window) { Lisp_Object frame = XWINDOW (window)->frame; FRAME_PTR f = XFRAME (frame); - + FRAME_SAMPLE_VISIBILITY (f); - - if (!EQ (frame, selected_frame)) + + if (EQ (frame, selected_frame)) + ; /* Assume the selected frame is already visible enough. */ + else if (minibuf_level > 0 + && MINI_WINDOW_P (XWINDOW (selected_window)) + && WINDOW_LIVE_P (minibuf_selected_window) + && EQ (frame, WINDOW_FRAME (XWINDOW (minibuf_selected_window)))) + ; /* Assume the frame from which we invoked the minibuffer is visible. */ + else { if (FRAME_ICONIFIED_P (f)) Fmake_frame_visible (frame); else if (FRAME_VISIBLE_P (f)) Fraise_frame (frame); } - + return window; } @@ -2806,7 +3200,7 @@ See `special-display-buffer-names', and `special-display-regexps'. */) { Lisp_Object tem; - CHECK_STRING (buffer_name, 1); + CHECK_STRING (buffer_name); tem = Fmember (buffer_name, Vspecial_display_buffer_names); if (!NILP (tem)) @@ -2828,7 +3222,7 @@ See `special-display-buffer-names', and `special-display-regexps'. */) return XCDR (car); } return Qnil; -} +} DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window. @@ -2838,7 +3232,7 @@ See `same-window-buffer-names' and `same-window-regexps'. */) { Lisp_Object tem; - CHECK_STRING (buffer_name, 1); + CHECK_STRING (buffer_name); tem = Fmember (buffer_name, Vsame_window_buffer_names); if (!NILP (tem)) @@ -2872,12 +3266,13 @@ unless the window is the selected window and the optional second argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg). If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER. Returns the window displaying BUFFER. -If `display-reuse-frames' is non-nil, and another frame is currently +If `display-buffer-reuse-frames' is non-nil, and another frame is currently displaying BUFFER, then simply raise that frame. -The variables `special-display-buffer-names', `special-display-regexps', -`same-window-buffer-names', and `same-window-regexps' customize how certain -buffer names are handled. +The variables `special-display-buffer-names', +`special-display-regexps', `same-window-buffer-names', and +`same-window-regexps' customize how certain buffer names are handled. +The latter two take effect only if NOT-THIS-WINDOW is t. If optional argument FRAME is `visible', search all visible frames. If FRAME is 0, search all visible and iconified frames. @@ -2899,7 +3294,7 @@ displayed. */) swp = Qnil; buffer = Fget_buffer (buffer); - CHECK_BUFFER (buffer, 0); + CHECK_BUFFER (buffer); if (!NILP (Vdisplay_buffer_function)) return call2 (Vdisplay_buffer_function, buffer, not_this_window); @@ -2920,7 +3315,7 @@ displayed. */) } } - /* If the user wants pop-up-frames or display-reuse-frames, then + /* If the user wants pop-up-frames or display-buffer-reuse-frames, look for a window showing BUFFER on any visible or iconified frame. Otherwise search only the current frame. */ if (! NILP (frame)) @@ -2931,7 +3326,7 @@ displayed. */) XSETFASTINT (tem, 0); else XSETFRAME (tem, last_nonminibuf_frame); - + window = Fget_buffer_window (buffer, tem); if (!NILP (window) && (NILP (not_this_window) || !EQ (window, selected_window))) @@ -2952,7 +3347,7 @@ displayed. */) if (pop_up_frames || last_nonminibuf_frame == 0) { window = Fframe_selected_window (call0 (Vpop_up_frame_function)); - Fset_window_buffer (window, buffer); + Fset_window_buffer (window, buffer, Qnil); return display_buffer_1 (window); } @@ -2968,7 +3363,7 @@ displayed. */) frames = Qnil; if (FRAME_MINIBUF_ONLY_P (f)) XSETFRAME (frames, last_nonminibuf_frame); - /* Don't try to create a window if would get an error */ + /* Don't try to create a window if we would get an error. */ if (split_height_threshold < window_min_height << 1) split_height_threshold = window_min_height << 1; @@ -3041,25 +3436,71 @@ displayed. */) if (!NILP (other) && !NILP (Veven_window_heights) /* Check that OTHER and WINDOW are vertically arrayed. */ - && !EQ (XWINDOW (other)->top, XWINDOW (window)->top) - && (XFASTINT (XWINDOW (other)->height) - > XFASTINT (XWINDOW (window)->height))) + && !EQ (XWINDOW (other)->top_line, XWINDOW (window)->top_line) + && (XFASTINT (XWINDOW (other)->total_lines) + > XFASTINT (XWINDOW (window)->total_lines))) { - int total = (XFASTINT (XWINDOW (other)->height) - + XFASTINT (XWINDOW (window)->height)); + int total = (XFASTINT (XWINDOW (other)->total_lines) + + XFASTINT (XWINDOW (window)->total_lines)); enlarge_window (upper, - total / 2 - XFASTINT (XWINDOW (upper)->height), - 0); + total / 2 - XFASTINT (XWINDOW (upper)->total_lines), + 0, 0); } } } else window = Fget_lru_window (Qnil); - Fset_window_buffer (window, buffer); + Fset_window_buffer (window, buffer, Qnil); return display_buffer_1 (window); } + +DEFUN ("force-window-update", Fforce_window_update, Sforce_window_update, + 0, 1, 0, + doc: /* Force redisplay of all windows. +If optional arg OBJECT is a window, force redisplay of that window only. +If OBJECT is a buffer or buffer name, force redisplay of all windows +displaying that buffer. */) + (object) + Lisp_Object object; +{ + if (NILP (object)) + { + windows_or_buffers_changed++; + update_mode_lines++; + return Qt; + } + + if (WINDOWP (object)) + { + struct window *w = XWINDOW (object); + mark_window_display_accurate (object, 0); + w->update_mode_line = Qt; + if (BUFFERP (w->buffer)) + XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; + ++update_mode_lines; + return Qt; + } + + if (STRINGP (object)) + object = Fget_buffer (object); + if (BUFFERP (object) && !NILP (XBUFFER (object)->name)) + { + /* Walk all windows looking for buffer, and force update + of each of those windows. */ + + object = window_loop (REDISPLAY_BUFFER_WINDOWS, object, 0, Qvisible); + return NILP (object) ? Qnil : Qt; + } + + /* If nothing suitable was found, just return. + We could signal an error, but this feature will typically be used + asynchronously in timers or process sentinels, so we don't. */ + return Qnil; +} + + void temp_output_buffer_show (buf) register Lisp_Object buf; @@ -3075,7 +3516,9 @@ temp_output_buffer_show (buf) BEGV = BEG; ZV = Z; SET_PT (BEG); +#if 0 /* rms: there should be no reason for this. */ XBUFFER (buf)->prevent_redisplay_optimizations_p = 1; +#endif set_buffer_internal (old); if (!EQ (Vtemp_buffer_show_function, Qnil)) @@ -3090,33 +3533,31 @@ temp_output_buffer_show (buf) w = XWINDOW (window); XSETFASTINT (w->hscroll, 0); XSETFASTINT (w->min_hscroll, 0); - set_marker_restricted_both (w->start, buf, 1, 1); - set_marker_restricted_both (w->pointm, buf, 1, 1); + set_marker_restricted_both (w->start, buf, BEG, BEG); + set_marker_restricted_both (w->pointm, buf, BEG, BEG); /* Run temp-buffer-show-hook, with the chosen window selected - and it sbuffer current. */ - if (!NILP (Vrun_hooks)) + and its buffer current. */ + + if (!NILP (Vrun_hooks) + && !NILP (Fboundp (Qtemp_buffer_show_hook)) + && !NILP (Fsymbol_value (Qtemp_buffer_show_hook))) { - Lisp_Object tem; - tem = Fboundp (Qtemp_buffer_show_hook); - if (!NILP (tem)) - { - tem = Fsymbol_value (Qtemp_buffer_show_hook); - if (!NILP (tem)) - { - int count = specpdl_ptr - specpdl; - Lisp_Object prev_window; - prev_window = selected_window; - - /* Select the window that was chosen, for running the hook. */ - record_unwind_protect (Fselect_window, prev_window); - select_window_1 (window, 0); - Fset_buffer (w->buffer); - call1 (Vrun_hooks, Qtemp_buffer_show_hook); - select_window_1 (prev_window, 0); - unbind_to (count, Qnil); - } - } + int count = SPECPDL_INDEX (); + Lisp_Object prev_window, prev_buffer; + prev_window = selected_window; + XSETBUFFER (prev_buffer, old); + + /* Select the window that was chosen, for running the hook. + Note: Both Fselect_window and select_window_norecord may + set-buffer to the buffer displayed in the window, + so we need to save the current buffer. --stef */ + record_unwind_protect (Fset_buffer, prev_buffer); + record_unwind_protect (select_window_norecord, prev_window); + Fselect_window (window, Qt); + Fset_buffer (w->buffer); + call1 (Vrun_hooks, Qtemp_buffer_show_hook); + unbind_to (count, Qnil); } } } @@ -3169,7 +3610,7 @@ SIZE includes that window's scroll bar, or the divider column to its right. */) if (NILP (window)) window = selected_window; else - CHECK_LIVE_WINDOW (window, 0); + CHECK_LIVE_WINDOW (window); o = XWINDOW (window); fo = XFRAME (WINDOW_FRAME (o)); @@ -3181,13 +3622,13 @@ SIZE includes that window's scroll bar, or the divider column to its right. */) the usable space in columns by two. We round up, since the left-hand window may include a dividing line, while the right-hand may not. */ - size_int = (XFASTINT (o->width) + 1) >> 1; + size_int = (XFASTINT (o->total_cols) + 1) >> 1; else - size_int = XFASTINT (o->height) >> 1; + size_int = XFASTINT (o->total_lines) >> 1; } else { - CHECK_NUMBER (size, 1); + CHECK_NUMBER (size); size_int = XINT (size); } @@ -3202,9 +3643,9 @@ SIZE includes that window's scroll bar, or the divider column to its right. */) { if (size_int < window_min_height) error ("Window height %d too small (after splitting)", size_int); - if (size_int + window_min_height > XFASTINT (o->height)) + if (size_int + window_min_height > XFASTINT (o->total_lines)) error ("Window height %d too small (after splitting)", - XFASTINT (o->height) - size_int); + XFASTINT (o->total_lines) - size_int); if (NILP (o->parent) || NILP (XWINDOW (o->parent)->vchild)) { @@ -3218,9 +3659,9 @@ SIZE includes that window's scroll bar, or the divider column to its right. */) if (size_int < window_min_width) error ("Window width %d too small (after splitting)", size_int); - if (size_int + window_min_width > XFASTINT (o->width)) + if (size_int + window_min_width > XFASTINT (o->total_cols)) error ("Window width %d too small (after splitting)", - XFASTINT (o->width) - size_int); + XFASTINT (o->total_cols) - size_int); if (NILP (o->parent) || NILP (XWINDOW (o->parent)->hchild)) { @@ -3250,40 +3691,58 @@ SIZE includes that window's scroll bar, or the divider column to its right. */) p->window_end_valid = Qnil; bzero (&p->last_cursor, sizeof p->last_cursor); + /* Duplicate special geometry settings. */ + + p->left_margin_cols = o->left_margin_cols; + p->right_margin_cols = o->right_margin_cols; + p->left_fringe_width = o->left_fringe_width; + p->right_fringe_width = o->right_fringe_width; + p->fringes_outside_margins = o->fringes_outside_margins; + p->scroll_bar_width = o->scroll_bar_width; + p->vertical_scroll_bar_type = o->vertical_scroll_bar_type; + /* Apportion the available frame space among the two new windows */ if (!NILP (horflag)) { - p->height = o->height; - p->top = o->top; - XSETFASTINT (p->width, XFASTINT (o->width) - size_int); - XSETFASTINT (o->width, size_int); - XSETFASTINT (p->left, XFASTINT (o->left) + size_int); + p->total_lines = o->total_lines; + p->top_line = o->top_line; + XSETFASTINT (p->total_cols, XFASTINT (o->total_cols) - size_int); + XSETFASTINT (o->total_cols, size_int); + XSETFASTINT (p->left_col, XFASTINT (o->left_col) + size_int); + adjust_window_margins (p); + adjust_window_margins (o); } else { - p->left = o->left; - p->width = o->width; - XSETFASTINT (p->height, XFASTINT (o->height) - size_int); - XSETFASTINT (o->height, size_int); - XSETFASTINT (p->top, XFASTINT (o->top) + size_int); + p->left_col = o->left_col; + p->total_cols = o->total_cols; + XSETFASTINT (p->total_lines, XFASTINT (o->total_lines) - size_int); + XSETFASTINT (o->total_lines, size_int); + XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int); } /* Adjust glyph matrices. */ adjust_glyphs (fo); - Fset_window_buffer (new, o->buffer); + + Fset_window_buffer (new, o->buffer, Qt); return new; } -DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 2, "p", +DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 3, "p", doc: /* Make current window ARG lines bigger. From program, optional second arg non-nil means grow sideways ARG columns. -Interactively, if an argument is not given, make the window one line bigger. */) - (arg, side) - register Lisp_Object arg, side; +Interactively, if an argument is not given, make the window one line bigger. + +Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size +of the siblings above or to the left of the selected window. Only +siblings to the right or below are changed. */) + (arg, side, preserve_before) + register Lisp_Object arg, side, preserve_before; { - CHECK_NUMBER (arg, 0); - enlarge_window (selected_window, XINT (arg), !NILP (side)); + CHECK_NUMBER (arg); + enlarge_window (selected_window, XINT (arg), !NILP (side), + !NILP (preserve_before)); if (! NILP (Vwindow_configuration_change_hook)) call1 (Vrun_hooks, Qwindow_configuration_change_hook); @@ -3291,15 +3750,20 @@ Interactively, if an argument is not given, make the window one line bigger. */ return Qnil; } -DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p", +DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 3, "p", doc: /* Make current window ARG lines smaller. From program, optional second arg non-nil means shrink sideways arg columns. -Interactively, if an argument is not given, make the window one line smaller. */) - (arg, side) - register Lisp_Object arg, side; +Interactively, if an argument is not given, make the window one line smaller. + +Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size +of the siblings above or to the left of the selected window. Only +siblings to the right or below are changed. */) + (arg, side, preserve_before) + register Lisp_Object arg, side, preserve_before; { - CHECK_NUMBER (arg, 0); - enlarge_window (selected_window, -XINT (arg), !NILP (side)); + CHECK_NUMBER (arg); + enlarge_window (selected_window, -XINT (arg), !NILP (side), + !NILP (preserve_before)); if (! NILP (Vwindow_configuration_change_hook)) call1 (Vrun_hooks, Qwindow_configuration_change_hook); @@ -3312,7 +3776,7 @@ window_height (window) Lisp_Object window; { register struct window *p = XWINDOW (window); - return XFASTINT (p->height); + return WINDOW_TOTAL_LINES (p); } int @@ -3320,26 +3784,29 @@ window_width (window) Lisp_Object window; { register struct window *p = XWINDOW (window); - return XFASTINT (p->width); + return WINDOW_TOTAL_COLS (p); } - + #define CURBEG(w) \ - *(widthflag ? &(XWINDOW (w)->left) : &(XWINDOW (w)->top)) + *(widthflag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line)) #define CURSIZE(w) \ - *(widthflag ? &(XWINDOW (w)->width) : &(XWINDOW (w)->height)) + *(widthflag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines)) -/* Enlarge selected_window by DELTA. WIDTHFLAG non-zero means +/* Enlarge WINDOW by DELTA. WIDTHFLAG non-zero means increase its width. Siblings of the selected window are resized to - fullfil the size request. If they become too small in the process, - they will be deleted. */ + fulfill the size request. If they become too small in the process, + they will be deleted. + + If PRESERVE_BEFORE is nonzero, that means don't alter + the siblings to the left or above WINDOW. */ static void -enlarge_window (window, delta, widthflag) +enlarge_window (window, delta, widthflag, preserve_before) Lisp_Object window; - int delta, widthflag; + int delta, widthflag, preserve_before; { Lisp_Object parent, next, prev; struct window *p; @@ -3363,19 +3830,19 @@ enlarge_window (window, delta, widthflag) { p = XWINDOW (window); parent = p->parent; - + if (NILP (parent)) { if (widthflag) error ("No other window to side of this one"); break; } - + if (widthflag ? !NILP (XWINDOW (parent)->hchild) : !NILP (XWINDOW (parent)->vchild)) break; - + window = parent; } @@ -3384,16 +3851,35 @@ enlarge_window (window, delta, widthflag) { register int maxdelta; - maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) - : !NILP (p->next) ? ((*sizefun) (p->next) - - window_min_size (XWINDOW (p->next), - widthflag, 0, 0)) - : !NILP (p->prev) ? ((*sizefun) (p->prev) - - window_min_size (XWINDOW (p->prev), - widthflag, 0, 0)) - /* This is a frame with only one window, a minibuffer-only - or a minibufferless frame. */ - : (delta = 0)); + /* Compute the maximum size increment this window can have. */ + + if (preserve_before) + { + if (!NILP (parent)) + { + maxdelta = (*sizefun) (parent) - XINT (*sizep); + /* Subtract size of siblings before, since we can't take that. */ + maxdelta -= XINT (CURBEG (window)) - XINT (CURBEG (parent)); + } + else + maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next) + - window_min_size (XWINDOW (p->next), + widthflag, 0, 0)) + : (delta = 0)); + } + else + maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) + /* This is a main window followed by a minibuffer. */ + : !NILP (p->next) ? ((*sizefun) (p->next) + - window_min_size (XWINDOW (p->next), + widthflag, 0, 0)) + /* This is a minibuffer following a main window. */ + : !NILP (p->prev) ? ((*sizefun) (p->prev) + - window_min_size (XWINDOW (p->prev), + widthflag, 0, 0)) + /* This is a frame with only one window, a minibuffer-only + or a minibufferless frame. */ + : (delta = 0)); if (delta > maxdelta) /* This case traps trying to make the minibuffer @@ -3411,16 +3897,17 @@ enlarge_window (window, delta, widthflag) if (delta == 0) return; - /* Find the total we can get from other siblings. */ + /* Find the total we can get from other siblings without deleting them. */ maximum = 0; for (next = p->next; ! NILP (next); next = XWINDOW (next)->next) maximum += (*sizefun) (next) - window_min_size (XWINDOW (next), widthflag, 0, 0); - for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) - maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), - widthflag, 0, 0); + if (! preserve_before) + for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) + maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), + widthflag, 0, 0); - /* If we can get it all from them, do so. */ + /* If we can get it all from them without deleting them, do so. */ if (delta <= maximum) { Lisp_Object first_unaffected; @@ -3433,7 +3920,8 @@ enlarge_window (window, delta, widthflag) /* Look at one sibling at a time, moving away from this window in both directions alternately, and take as much as we can get without deleting that sibling. */ - while (delta != 0 && (!NILP (next) || !NILP (prev))) + while (delta != 0 + && (!NILP (next) || (!preserve_before && !NILP (prev)))) { if (! NILP (next)) { @@ -3444,20 +3932,20 @@ enlarge_window (window, delta, widthflag) { if (this_one > delta) this_one = delta; - + (*setsizefun) (next, (*sizefun) (next) - this_one, 0); (*setsizefun) (window, XINT (*sizep) + this_one, 0); delta -= this_one; } - + next = XWINDOW (next)->next; } - + if (delta == 0) break; - - if (! NILP (prev)) + + if (!preserve_before && ! NILP (prev)) { int this_one = ((*sizefun) (prev) - window_min_size (XWINDOW (prev), @@ -3466,15 +3954,15 @@ enlarge_window (window, delta, widthflag) { if (this_one > delta) this_one = delta; - + first_affected = prev; - + (*setsizefun) (prev, (*sizefun) (prev) - this_one, 0); (*setsizefun) (window, XINT (*sizep) + this_one, 0); delta -= this_one; } - + prev = XWINDOW (prev)->prev; } } @@ -3499,11 +3987,36 @@ enlarge_window (window, delta, widthflag) register int delta1; register int opht = (*sizefun) (parent); - /* If trying to grow this window to or beyond size of the parent, - make delta1 so big that, on shrinking back down, - all the siblings end up with less than one line and are deleted. */ if (opht <= XINT (*sizep) + delta) - delta1 = opht * opht * 2; + { + /* If trying to grow this window to or beyond size of the parent, + just delete all the sibling windows. */ + Lisp_Object start, tem, next; + + start = XWINDOW (parent)->vchild; + if (NILP (start)) + start = XWINDOW (parent)->hchild; + + /* Delete any siblings that come after WINDOW. */ + tem = XWINDOW (window)->next; + while (! NILP (tem)) + { + next = XWINDOW (tem)->next; + delete_window (tem); + tem = next; + } + + /* Delete any siblings that come after WINDOW. + Note that if START is not WINDOW, then WINDOW still + Fhas siblings, so WINDOW has not yet replaced its parent. */ + tem = start; + while (! EQ (tem, window)) + { + next = XWINDOW (tem)->next; + delete_window (tem); + tem = next; + } + } else { /* Otherwise, make delta1 just right so that if we add @@ -3513,7 +4026,7 @@ enlarge_window (window, delta, widthflag) The function size_window will compute the new height h' of the window from delta1 as: - + e = delta1/n x = delta1 - delta1/n * n for the 1st resizable child h' = h + e + x @@ -3521,16 +4034,16 @@ enlarge_window (window, delta, widthflag) where n is the number of children that can be resized. We can ignore x by choosing a delta1 that is a multiple of n. We want the height of this window to come out as - + h' = h + delta So, delta1 must be - + h + e = h + delta delta1/n = delta delta1 = n * delta. - The number of children n rquals the number of resizable + The number of children n equals the number of resizable children of this window + 1 because we know window itself is resizable (otherwise we would have signalled an error. */ @@ -3546,19 +4059,20 @@ enlarge_window (window, delta, widthflag) ++n; delta1 = n * delta; - } - /* Add delta1 lines or columns to this window, and to the parent, - keeping things consistent while not affecting siblings. */ - XSETINT (CURSIZE (parent), opht + delta1); - (*setsizefun) (window, XINT (*sizep) + delta1, 0); - - /* Squeeze out delta1 lines or columns from our parent, - shriking this window and siblings proportionately. - This brings parent back to correct size. - Delta1 was calculated so this makes this window the desired size, - taking it all out of the siblings. */ - (*setsizefun) (parent, opht, 0); + /* Add delta1 lines or columns to this window, and to the parent, + keeping things consistent while not affecting siblings. */ + XSETINT (CURSIZE (parent), opht + delta1); + (*setsizefun) (window, XINT (*sizep) + delta1, 0); + + /* Squeeze out delta1 lines or columns from our parent, + shriking this window and siblings proportionately. + This brings parent back to correct size. + Delta1 was calculated so this makes this window the desired size, + taking it all out of the siblings. */ + (*setsizefun) (parent, opht, 0); + + } } XSETFASTINT (p->last_modified, 0); @@ -3586,7 +4100,7 @@ enum save_restore_action RESTORE_ORIG_SIZES }; -static int save_restore_orig_size P_ ((struct window *, +static int save_restore_orig_size P_ ((struct window *, enum save_restore_action)); /* Shrink windows rooted in window W to HEIGHT. Take the space needed @@ -3609,15 +4123,15 @@ shrink_window_lowest_first (w, height) windows_or_buffers_changed++; FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (w))) = 1; - old_height = XFASTINT (w->height); - XSETFASTINT (w->height, height); + old_height = XFASTINT (w->total_lines); + XSETFASTINT (w->total_lines, height); if (!NILP (w->hchild)) { for (child = w->hchild; !NILP (child); child = c->next) { c = XWINDOW (child); - c->top = w->top; + c->top_line = w->top_line; shrink_window_lowest_first (c, height); } } @@ -3628,7 +4142,7 @@ shrink_window_lowest_first (w, height) int last_top; last_child = Qnil; - + /* Find the last child. We are taking space from lowest windows first, so we iterate over children from the last child backwards. */ @@ -3639,25 +4153,25 @@ shrink_window_lowest_first (w, height) for (child = last_child; delta && !NILP (child); child = c->prev) { int this_one; - + c = XWINDOW (child); - this_one = XFASTINT (c->height) - MIN_SAFE_WINDOW_HEIGHT; + this_one = XFASTINT (c->total_lines) - MIN_SAFE_WINDOW_HEIGHT; if (this_one > delta) this_one = delta; - shrink_window_lowest_first (c, XFASTINT (c->height) - this_one); + shrink_window_lowest_first (c, XFASTINT (c->total_lines) - this_one); delta -= this_one; } /* Compute new positions. */ - last_top = XINT (w->top); + last_top = XINT (w->top_line); for (child = w->vchild; !NILP (child); child = c->next) { c = XWINDOW (child); - c->top = make_number (last_top); - shrink_window_lowest_first (c, XFASTINT (c->height)); - last_top += XFASTINT (c->height); + c->top_line = make_number (last_top); + shrink_window_lowest_first (c, XFASTINT (c->total_lines)); + last_top += XFASTINT (c->total_lines); } } } @@ -3666,15 +4180,15 @@ shrink_window_lowest_first (w, height) /* Save, restore, or check positions and sizes in the window tree rooted at W. ACTION says what to do. - If ACTION is CHECK_ORIG_SIZES, check if orig_top and orig_height - members are valid for all windows in the window tree. Value is - non-zero if they are valid. - + If ACTION is CHECK_ORIG_SIZES, check if orig_top_line and + orig_total_lines members are valid for all windows in the window + tree. Value is non-zero if they are valid. + If ACTION is SAVE_ORIG_SIZES, save members top and height in - orig_top and orig_height for all windows in the tree. + orig_top_line and orig_total_lines for all windows in the tree. - If ACTION is RESTORE_ORIG_SIZES, restore top and height from - values stored in orig_top and orig_height for all windows. */ + If ACTION is RESTORE_ORIG_SIZES, restore top and height from values + stored in orig_top_line and orig_total_lines for all windows. */ static int save_restore_orig_size (w, action) @@ -3695,26 +4209,26 @@ save_restore_orig_size (w, action) if (!save_restore_orig_size (XWINDOW (w->vchild), action)) success_p = 0; } - + switch (action) { case CHECK_ORIG_SIZES: - if (!INTEGERP (w->orig_top) || !INTEGERP (w->orig_height)) + if (!INTEGERP (w->orig_top_line) || !INTEGERP (w->orig_total_lines)) return 0; break; case SAVE_ORIG_SIZES: - w->orig_top = w->top; - w->orig_height = w->height; + w->orig_top_line = w->top_line; + w->orig_total_lines = w->total_lines; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); break; case RESTORE_ORIG_SIZES: - xassert (INTEGERP (w->orig_top) && INTEGERP (w->orig_height)); - w->top = w->orig_top; - w->height = w->orig_height; - w->orig_height = w->orig_top = Qnil; + xassert (INTEGERP (w->orig_top_line) && INTEGERP (w->orig_total_lines)); + w->top_line = w->orig_top_line; + w->total_lines = w->orig_total_lines; + w->orig_total_lines = w->orig_top_line = Qnil; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); break; @@ -3740,10 +4254,10 @@ grow_mini_window (w, delta) { struct frame *f = XFRAME (w->frame); struct window *root; - + xassert (MINI_WINDOW_P (w)); xassert (delta >= 0); - + /* Check values of window_min_width and window_min_height for validity. */ check_min_window_sizes (); @@ -3754,10 +4268,12 @@ grow_mini_window (w, delta) if (delta) { int min_height = window_min_size (root, 0, 0, 0); - if (XFASTINT (root->height) - delta < min_height) - delta = XFASTINT (root->height) - min_height; + if (XFASTINT (root->total_lines) - delta < min_height) + /* Note that the root window may already be smaller than + min_height. */ + delta = max (0, XFASTINT (root->total_lines) - min_height); } - + if (delta) { /* Save original window sizes and positions, if not already done. */ @@ -3765,14 +4281,14 @@ grow_mini_window (w, delta) save_restore_orig_size (root, SAVE_ORIG_SIZES); /* Shrink other windows. */ - shrink_window_lowest_first (root, XFASTINT (root->height) - delta); + shrink_window_lowest_first (root, XFASTINT (root->total_lines) - delta); /* Grow the mini-window. */ - w->top = make_number (XFASTINT (root->top) + XFASTINT (root->height)); - w->height = make_number (XFASTINT (w->height) + delta); + w->top_line = make_number (XFASTINT (root->top_line) + XFASTINT (root->total_lines)); + w->total_lines = make_number (XFASTINT (w->total_lines) + delta); XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); - + adjust_glyphs (f); } } @@ -3797,13 +4313,13 @@ shrink_mini_window (w) FRAME_WINDOW_SIZES_CHANGED (f) = 1; windows_or_buffers_changed = 1; } - else if (XFASTINT (w->height) > 1) + else if (XFASTINT (w->total_lines) > 1) { /* Distribute the additional lines of the mini-window among the other windows. */ Lisp_Object window; XSETWINDOW (window, w); - enlarge_window (window, 1 - XFASTINT (w->height), 0); + enlarge_window (window, 1 - XFASTINT (w->total_lines), 0, 0); } } @@ -3838,7 +4354,7 @@ int window_internal_height (w) struct window *w; { - int ht = XFASTINT (w->height); + int ht = XFASTINT (w->total_lines); if (!MINI_WINDOW_P (w)) { @@ -3863,24 +4379,27 @@ window_internal_height (w) separating W from the sibling to its right. */ int -window_internal_width (w) +window_box_text_cols (w) struct window *w; { struct frame *f = XFRAME (WINDOW_FRAME (w)); - int width = XINT (w->width); + int width = XINT (w->total_cols); - if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) + if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) /* Scroll bars occupy a few columns. */ - width -= FRAME_SCROLL_BAR_COLS (f); - else if (!WINDOW_RIGHTMOST_P (w) && !WINDOW_FULL_WIDTH_P (w)) + width -= WINDOW_CONFIG_SCROLL_BAR_COLS (w); + else if (!FRAME_WINDOW_P (f) + && !WINDOW_RIGHTMOST_P (w) && !WINDOW_FULL_WIDTH_P (w)) /* The column of `|' characters separating side-by-side windows occupies one column only. */ width -= 1; - /* On window-systems, areas to the left and right of the window - are used to display bitmaps there. */ if (FRAME_WINDOW_P (f)) - width -= FRAME_FLAGS_AREA_COLS (f); + /* On window-systems, fringes and display margins cannot be + used for normal text. */ + width -= (WINDOW_FRINGE_COLS (w) + + WINDOW_LEFT_MARGIN_COLS (w) + + WINDOW_RIGHT_MARGIN_COLS (w)); return width; } @@ -3904,12 +4423,16 @@ window_scroll (window, n, whole, noerror) int whole; int noerror; { + immediate_quit = 1; + /* If we must, use the pixel-based version which is much slower than the line-based one but can handle varying line heights. */ if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) window_scroll_pixel_based (window, n, whole, noerror); else window_scroll_line_based (window, n, whole, noerror); + + immediate_quit = 0; } @@ -3934,7 +4457,7 @@ window_scroll_pixel_based (window, n, whole, noerror) int vscrolled = 0; SET_TEXT_POS_FROM_MARKER (start, w->start); - + /* If PT is not visible in WINDOW, move back one half of the screen. Allow PT to be partially visible, otherwise something like (scroll-down 1) with PT in the line before @@ -3948,7 +4471,7 @@ window_scroll_pixel_based (window, n, whole, noerror) init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); it.current_y = it.last_visible_y; move_it_vertically (&it, - window_box_height (w) / 2); - + /* The function move_iterator_vertically may move over more than the specified y-distance. If it->w is small, e.g. a mini-buffer window, we may end up in front of the window's @@ -3981,7 +4504,7 @@ window_scroll_pixel_based (window, n, whole, noerror) if (whole) { int screen_full = (window_box_height (w) - - next_screen_context_lines * CANON_Y_UNIT (it.f)); + - next_screen_context_lines * FRAME_LINE_HEIGHT (it.f)); int dy = n * screen_full; /* Note that move_it_vertically always moves the iterator to the @@ -3996,14 +4519,17 @@ window_scroll_pixel_based (window, n, whole, noerror) else move_it_by_lines (&it, n, 1); - /* End if we end up at ZV or BEGV. */ + /* We failed if we find ZV is already on the screen (scrolling up, + means there's nothing past the end), or if we can't start any + earlier (scrolling down, means there's nothing past the top). */ if ((n > 0 && IT_CHARPOS (it) == ZV) || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) { if (IT_CHARPOS (it) == ZV) { - if (it.current_y + it.max_ascent + it.max_descent - > it.last_visible_y) + if (it.current_y < it.last_visible_y + && (it.current_y + it.max_ascent + it.max_descent + >= it.last_visible_y)) { /* The last line was only partially visible, make it fully visible. */ @@ -4038,10 +4564,23 @@ window_scroll_pixel_based (window, n, whole, noerror) if (! vscrolled) { + int pos = IT_CHARPOS (it); + int bytepos; + + /* If in the middle of a multi-glyph character move forward to + the next character. */ + if (in_display_vector_p (&it)) + { + ++pos; + move_it_to (&it, pos, -1, -1, -1, MOVE_TO_POS); + } + /* Set the window start, and set up the window for redisplay. */ - set_marker_restricted (w->start, make_number (IT_CHARPOS (it)), + set_marker_restricted (w->start, make_number (pos), w->buffer); - w->start_at_line_beg = Fbolp (); + bytepos = XMARKER (w->start)->bytepos; + w->start_at_line_beg = ((pos == BEGV || FETCH_BYTE (bytepos - 1) == '\n') + ? Qt : Qnil); w->update_mode_line = Qt; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); @@ -4049,9 +4588,9 @@ window_scroll_pixel_based (window, n, whole, noerror) window-scroll-functions. */ w->force_start = Qt; } - + it.current_y = it.vpos = 0; - + /* Preserve the screen position if we must. */ if (preserve_y >= 0) { @@ -4062,8 +4601,8 @@ window_scroll_pixel_based (window, n, whole, noerror) { /* Move PT out of scroll margins. */ this_scroll_margin = max (0, scroll_margin); - this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4); - this_scroll_margin *= CANON_Y_UNIT (it.f); + this_scroll_margin = min (this_scroll_margin, XFASTINT (w->total_lines) / 4); + this_scroll_margin *= FRAME_LINE_HEIGHT (it.f); if (n > 0) { @@ -4071,7 +4610,12 @@ window_scroll_pixel_based (window, n, whole, noerror) in the scroll margin at the top. */ move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); while (it.current_y < this_scroll_margin) - move_it_by_lines (&it, 1, 1); + { + int prev = it.current_y; + move_it_by_lines (&it, 1, 1); + if (prev == it.current_y) + break; + } SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); } else if (n < 0) @@ -4087,7 +4631,7 @@ window_scroll_pixel_based (window, n, whole, noerror) /* Save our position, in case it's correct. */ charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); - + /* See if point is on a partially visible line at the end. */ move_it_by_lines (&it, 1, 1); if (it.current_y > it.last_visible_y) @@ -4135,7 +4679,7 @@ window_scroll_line_based (window, n, whole, noerror) posit = *compute_motion (startpos, 0, 0, 0, PT, ht, 0, - window_internal_width (w), XINT (w->hscroll), + window_box_text_cols (w), XINT (w->hscroll), 0, w); original_vpos = posit.vpos; @@ -4172,8 +4716,8 @@ window_scroll_line_based (window, n, whole, noerror) if (this_scroll_margin < 0) this_scroll_margin = 0; - if (XINT (w->height) < 4 * scroll_margin) - this_scroll_margin = XINT (w->height) / 4; + if (XINT (w->total_lines) < 4 * scroll_margin) + this_scroll_margin = XINT (w->total_lines) / 4; set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); w->start_at_line_beg = bolp; @@ -4262,7 +4806,7 @@ scroll_command (n, direction) Lisp_Object n; int direction; { - int count = BINDING_STACK_SIZE (); + int count = SPECPDL_INDEX (); xassert (abs (direction) == 1); @@ -4351,7 +4895,7 @@ showing that buffer is used. */) && ! EQ (window, selected_window)); } - CHECK_LIVE_WINDOW (window, 0); + CHECK_LIVE_WINDOW (window); if (EQ (window, selected_window)) error ("There is no other window"); @@ -4376,7 +4920,7 @@ showing that buffer, popping the buffer up if necessary. */) { Lisp_Object window; struct window *w; - int count = BINDING_STACK_SIZE (); + int count = SPECPDL_INDEX (); window = Fother_window_for_scrolling (); w = XWINDOW (window); @@ -4396,7 +4940,7 @@ showing that buffer, popping the buffer up if necessary. */) { if (CONSP (arg)) arg = Fcar (arg); - CHECK_NUMBER (arg, 0); + CHECK_NUMBER (arg); window_scroll (window, XINT (arg), 0, 1); } @@ -4408,16 +4952,22 @@ showing that buffer, popping the buffer up if necessary. */) DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 0, 1, "P", doc: /* Scroll selected window display ARG columns left. -Default for ARG is window width minus 2. */) +Default for ARG is window width minus 2. +Value is the total amount of leftward horizontal scrolling in +effect after the change. +If `automatic-hscrolling' is non-nil, the argument ARG modifies +a lower bound for automatic scrolling, i.e. automatic scrolling +will not scroll a window to a column less than the value returned +by this function. */) (arg) register Lisp_Object arg; { Lisp_Object result; int hscroll; struct window *w = XWINDOW (selected_window); - + if (NILP (arg)) - XSETFASTINT (arg, window_internal_width (w) - 2); + XSETFASTINT (arg, window_box_text_cols (w) - 2); else arg = Fprefix_numeric_value (arg); @@ -4432,28 +4982,47 @@ Default for ARG is window width minus 2. */) DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 0, 1, "P", doc: /* Scroll selected window display ARG columns right. -Default for ARG is window width minus 2. */) +Default for ARG is window width minus 2. +Value is the total amount of leftward horizontal scrolling in +effect after the change. +If `automatic-hscrolling' is non-nil, the argument ARG modifies +a lower bound for automatic scrolling, i.e. automatic scrolling +will not scroll a window to a column less than the value returned +by this function. */) (arg) register Lisp_Object arg; { Lisp_Object result; int hscroll; struct window *w = XWINDOW (selected_window); - + if (NILP (arg)) - XSETFASTINT (arg, window_internal_width (w) - 2); + XSETFASTINT (arg, window_box_text_cols (w) - 2); else arg = Fprefix_numeric_value (arg); hscroll = XINT (w->hscroll) - XINT (arg); result = Fset_window_hscroll (selected_window, make_number (hscroll)); - + if (interactive_p (0)) w->min_hscroll = w->hscroll; return result; } +DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0, + doc: /* Return the window which was selected when entering the minibuffer. +Returns nil, if current window is not a minibuffer window. */) + () +{ + if (minibuf_level > 0 + && MINI_WINDOW_P (XWINDOW (selected_window)) + && WINDOW_LIVE_P (minibuf_selected_window)) + return minibuf_selected_window; + + return Qnil; +} + /* Value is the number of lines actually displayed in window W, as opposed to its height. */ @@ -4489,10 +5058,19 @@ displayed_window_lines (w) move_it_vertically (&it, height); bottom_y = line_bottom_y (&it); + /* rms: On a non-window display, + the value of it.vpos at the bottom of the screen + seems to be 1 larger than window_box_height (w). + This kludge fixes a bug whereby (move-to-window-line -1) + when ZV is on the last screen line + moves to the previous screen line instead of the last one. */ + if (! FRAME_WINDOW_P (XFRAME (w->frame))) + height++; + /* Add in empty lines at the bottom of the window. */ if (bottom_y < height) { - int uy = CANON_Y_UNIT (it.f); + int uy = FRAME_LINE_HEIGHT (it.f); it.vpos += (height - bottom_y + uy - 1) / uy; } @@ -4522,6 +5100,9 @@ and redisplay normally--don't erase and redraw the frame. */) int center_p = 0; int charpos, bytepos; + /* If redisplay is suppressed due to an error, try again. */ + obuf->display_error_modiff = 0; + if (NILP (arg)) { int i; @@ -4539,7 +5120,7 @@ and redisplay normally--don't erase and redraw the frame. */) else { arg = Fprefix_numeric_value (arg); - CHECK_NUMBER (arg, 0); + CHECK_NUMBER (arg); } set_buffer_internal (buf); @@ -4553,7 +5134,7 @@ and redisplay normally--don't erase and redraw the frame. */) { struct it it; struct text_pos pt; - + SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); move_it_vertically (&it, - window_box_height (w) / 2); @@ -4565,7 +5146,7 @@ and redisplay normally--don't erase and redraw the frame. */) struct it it; struct text_pos pt; int y0, y1, h, nlines; - + SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); y0 = it.current_y; @@ -4576,18 +5157,17 @@ and redisplay normally--don't erase and redraw the frame. */) nlines = - XINT (arg) - 1; move_it_by_lines (&it, nlines, 1); - y1 = it.current_y - y0; - h = line_bottom_y (&it) - y1; + y1 = line_bottom_y (&it); /* If we can't move down NLINES lines because we hit the end of the buffer, count in some empty lines. */ if (it.vpos < nlines) - y1 += (nlines - it.vpos) * CANON_Y_UNIT (it.f); - - y0 = it.last_visible_y - y1 - h; - + y1 += (nlines - it.vpos) * FRAME_LINE_HEIGHT (it.f); + + h = window_box_height (w) - (y1 - y0); + start_display (&it, w, pt); - move_it_vertically (&it, - y0); + move_it_vertically (&it, - h); charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); } @@ -4608,7 +5188,7 @@ and redisplay normally--don't erase and redraw the frame. */) arg = make_number (ht / 2); else if (XINT (arg) < 0) arg = make_number (XINT (arg) + ht); - + pos = *vmotion (PT, - XINT (arg), w); charpos = pos.bufpos; bytepos = pos.bytepos; @@ -4617,12 +5197,14 @@ and redisplay normally--don't erase and redraw the frame. */) /* Set the new window start. */ set_marker_both (w->start, w->buffer, charpos, bytepos); w->window_end_valid = Qnil; - w->force_start = Qt; + + w->optional_new_start = Qt; + if (bytepos == BEGV_BYTE || FETCH_BYTE (bytepos - 1) == '\n') w->start_at_line_beg = Qt; else w->start_at_line_beg = Qnil; - + set_buffer_internal (obuf); return Qnil; } @@ -4638,7 +5220,7 @@ partial-height lines in the text display area. */) { struct window *w = decode_window (window); int pixel_height = window_box_height (w); - int line_height = pixel_height / CANON_Y_UNIT (XFRAME (w->frame)); + int line_height = pixel_height / FRAME_LINE_HEIGHT (XFRAME (w->frame)); return make_number (line_height); } @@ -4697,12 +5279,13 @@ struct save_window_data { EMACS_INT size_from_Lisp_Vector_struct; struct Lisp_Vector *next_from_Lisp_Vector_struct; - Lisp_Object frame_width, frame_height, frame_menu_bar_lines; + Lisp_Object frame_cols, frame_lines, frame_menu_bar_lines; Lisp_Object frame_tool_bar_lines; Lisp_Object selected_frame; Lisp_Object current_window; Lisp_Object current_buffer; Lisp_Object minibuf_scroll_window; + Lisp_Object minibuf_selected_window; Lisp_Object root_window; Lisp_Object focus_frame; /* Record the values of window-min-width and window-min-height @@ -4722,14 +5305,18 @@ struct saved_window Lisp_Object window; Lisp_Object buffer, start, pointm, mark; - Lisp_Object left, top, width, height, hscroll, min_hscroll; + Lisp_Object left_col, top_line, total_cols, total_lines; + Lisp_Object hscroll, min_hscroll; Lisp_Object parent, prev; Lisp_Object start_at_line_beg; Lisp_Object display_table; - Lisp_Object orig_top, orig_height; + Lisp_Object orig_top_line, orig_total_lines; + Lisp_Object left_margin_cols, right_margin_cols; + Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; + Lisp_Object scroll_bar_width, vertical_scroll_bar_type; }; -#define SAVED_WINDOW_VECTOR_SIZE 17 /* Arg to Fmake_vector */ +#define SAVED_WINDOW_VECTOR_SIZE 24 /* Arg to Fmake_vector */ #define SAVED_WINDOW_N(swv,n) \ ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) @@ -4791,11 +5378,13 @@ the return value is nil. Otherwise the value is t. */) { if (XBUFFER (new_current_buffer) == current_buffer) old_point = PT; + else + old_point = BUF_PT (XBUFFER (new_current_buffer)); } frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; f = XFRAME (frame); - + /* If f is a dead frame, don't bother rebuilding its window tree. However, there is other stuff we should still try to do below. */ if (FRAME_LIVE_P (f)) @@ -4811,8 +5400,8 @@ the return value is nil. Otherwise the value is t. */) made, we change the frame to the size specified in the configuration, restore the configuration, and then resize it back. We keep track of the prevailing height in these variables. */ - int previous_frame_height = FRAME_HEIGHT (f); - int previous_frame_width = FRAME_WIDTH (f); + int previous_frame_lines = FRAME_LINES (f); + int previous_frame_cols = FRAME_COLS (f); int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f); @@ -4820,10 +5409,10 @@ the return value is nil. Otherwise the value is t. */) if it runs during this. */ BLOCK_INPUT; - if (XFASTINT (data->frame_height) != previous_frame_height - || XFASTINT (data->frame_width) != previous_frame_width) - change_frame_size (f, XFASTINT (data->frame_height), - XFASTINT (data->frame_width), 0, 0, 0); + if (XFASTINT (data->frame_lines) != previous_frame_lines + || XFASTINT (data->frame_cols) != previous_frame_cols) + change_frame_size (f, XFASTINT (data->frame_lines), + XFASTINT (data->frame_cols), 0, 0, 0); #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) if (XFASTINT (data->frame_menu_bar_lines) != previous_frame_menu_bar_lines) @@ -4852,7 +5441,7 @@ the return value is nil. Otherwise the value is t. */) FRAME_WINDOW_SIZES_CHANGED (f) = 1; /* Problem: Freeing all matrices and later allocating them again - is a serious redisplay flickering problem. What we would + is a serious redisplay flickering problem. What we would really like to do is to free only those matrices not reused below. */ root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); @@ -4898,7 +5487,7 @@ the return value is nil. Otherwise the value is t. */) w->prev = Qnil; if (!NILP (w->parent)) { - if (EQ (p->width, XWINDOW (w->parent)->width)) + if (EQ (p->total_cols, XWINDOW (w->parent)->total_cols)) { XWINDOW (w->parent)->vchild = p->window; XWINDOW (w->parent)->hchild = Qnil; @@ -4913,17 +5502,24 @@ the return value is nil. Otherwise the value is t. */) /* If we squirreled away the buffer in the window's height, restore it now. */ - if (BUFFERP (w->height)) - w->buffer = w->height; - w->left = p->left; - w->top = p->top; - w->width = p->width; - w->height = p->height; + if (BUFFERP (w->total_lines)) + w->buffer = w->total_lines; + w->left_col = p->left_col; + w->top_line = p->top_line; + w->total_cols = p->total_cols; + w->total_lines = p->total_lines; w->hscroll = p->hscroll; w->min_hscroll = p->min_hscroll; w->display_table = p->display_table; - w->orig_top = p->orig_top; - w->orig_height = p->orig_height; + w->orig_top_line = p->orig_top_line; + w->orig_total_lines = p->orig_total_lines; + w->left_margin_cols = p->left_margin_cols; + w->right_margin_cols = p->right_margin_cols; + w->left_fringe_width = p->left_fringe_width; + w->right_fringe_width = p->right_fringe_width; + w->fringes_outside_margins = p->fringes_outside_margins; + w->scroll_bar_width = p->scroll_bar_width; + w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); @@ -4943,8 +5539,8 @@ the return value is nil. Otherwise the value is t. */) p->mark, w->buffer); /* As documented in Fcurrent_window_configuration, don't - save the location of point in the buffer which was current - when the window configuration was recorded. */ + restore the location of point in the buffer which was + current when the window configuration was recorded. */ if (!EQ (p->buffer, new_current_buffer) && XBUFFER (p->buffer) == current_buffer) Fgoto_char (w->pointm); @@ -4979,10 +5575,16 @@ the return value is nil. Otherwise the value is t. */) FRAME_ROOT_WINDOW (f) = data->root_window; /* Prevent "swapping out point" in the old selected window using the buffer that has been restored into it. - That swapping out has already been done, - near the beginning of this function. */ + Use the point value from the beginning of this function + since unshow_buffer (called from delete_all_subwindows) + could have altered it. */ selected_window = Qnil; - Fselect_window (data->current_window); + if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)) + set_marker_restricted (XWINDOW (data->current_window)->pointm, + make_number (old_point), + XWINDOW (data->current_window)->buffer); + + Fselect_window (data->current_window, Qnil); XBUFFER (XWINDOW (selected_window)->buffer)->last_selected_window = selected_window; @@ -4999,9 +5601,9 @@ the return value is nil. Otherwise the value is t. */) #endif /* Set the screen height to the value it had before this function. */ - if (previous_frame_height != FRAME_HEIGHT (f) - || previous_frame_width != FRAME_WIDTH (f)) - change_frame_size (f, previous_frame_height, previous_frame_width, + if (previous_frame_lines != FRAME_LINES (f) + || previous_frame_cols != FRAME_COLS (f)) + change_frame_size (f, previous_frame_lines, previous_frame_cols, 0, 0, 0); #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) @@ -5020,7 +5622,7 @@ the return value is nil. Otherwise the value is t. */) if (NILP (leaf_windows[i]->buffer)) { /* Assert it's not reused as a combination. */ - xassert (NILP (leaf_windows[i]->hchild) + xassert (NILP (leaf_windows[i]->hchild) && NILP (leaf_windows[i]->vchild)); free_window_matrices (leaf_windows[i]); } @@ -5028,11 +5630,6 @@ the return value is nil. Otherwise the value is t. */) ++n; } - /* If more than one window shows the new and old current buffer, - don't try to preserve point in that buffer. */ - if (old_point > 0 && n > 1) - old_point = -1; - adjust_glyphs (f); UNBLOCK_INPUT; @@ -5051,21 +5648,14 @@ the return value is nil. Otherwise the value is t. */) } if (!NILP (new_current_buffer)) - { - Fset_buffer (new_current_buffer); - - /* If the buffer that is current now is the same - that was current before setting the window configuration, - don't alter its PT. */ - if (old_point >= 0) - SET_PT (old_point); - } + Fset_buffer (new_current_buffer); /* Restore the minimum heights recorded in the configuration. */ window_min_height = XINT (data->min_height); window_min_width = XINT (data->min_width); Vminibuf_scroll_window = data->minibuf_scroll_window; + minibuf_selected_window = data->minibuf_selected_window; return (FRAME_LIVE_P (f) ? Qt : Qnil); } @@ -5084,7 +5674,7 @@ delete_all_subwindows (w) if (!NILP (w->hchild)) delete_all_subwindows (XWINDOW (w->hchild)); - w->height = w->buffer; /* See Fset_window_configuration for excuse. */ + w->total_lines = w->buffer; /* See Fset_window_configuration for excuse. */ if (!NILP (w->buffer)) unshow_buffer (w); @@ -5115,7 +5705,7 @@ count_windows (window) } -/* Fill vector FLAT with leaf windows under W, starting at index I. +/* Fill vector FLAT with leaf windows under W, starting at index I. Value is last index + 1. */ static int @@ -5130,7 +5720,7 @@ get_leaf_windows (w, flat, i) i = get_leaf_windows (XWINDOW (w->hchild), flat, i); else if (!NILP (w->vchild)) i = get_leaf_windows (XWINDOW (w->vchild), flat, i); - else + else flat[i++] = w; w = NILP (w->next) ? 0 : XWINDOW (w->next); @@ -5182,15 +5772,22 @@ save_window_save (window, vector, i) XSETFASTINT (w->temslot, i++); p->window = window; p->buffer = w->buffer; - p->left = w->left; - p->top = w->top; - p->width = w->width; - p->height = w->height; + p->left_col = w->left_col; + p->top_line = w->top_line; + p->total_cols = w->total_cols; + p->total_lines = w->total_lines; p->hscroll = w->hscroll; p->min_hscroll = w->min_hscroll; p->display_table = w->display_table; - p->orig_top = w->orig_top; - p->orig_height = w->orig_height; + p->orig_top_line = w->orig_top_line; + p->orig_total_lines = w->orig_total_lines; + p->left_margin_cols = w->left_margin_cols; + p->right_margin_cols = w->right_margin_cols; + p->left_fringe_width = w->left_fringe_width; + p->right_fringe_width = w->right_fringe_width; + p->fringes_outside_margins = w->fringes_outside_margins; + p->scroll_bar_width = w->scroll_bar_width; + p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; if (!NILP (w->buffer)) { /* Save w's value of point in the window configuration. @@ -5261,21 +5858,22 @@ redirection (see `redirect-frame-focus'). */) if (NILP (frame)) frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); f = XFRAME (frame); n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f))); vec = allocate_other_vector (VECSIZE (struct save_window_data)); data = (struct save_window_data *)vec; - XSETFASTINT (data->frame_width, FRAME_WIDTH (f)); - XSETFASTINT (data->frame_height, FRAME_HEIGHT (f)); + XSETFASTINT (data->frame_cols, FRAME_COLS (f)); + XSETFASTINT (data->frame_lines, FRAME_LINES (f)); XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f)); XSETFASTINT (data->frame_tool_bar_lines, FRAME_TOOL_BAR_LINES (f)); data->selected_frame = selected_frame; data->current_window = FRAME_SELECTED_WINDOW (f); XSETBUFFER (data->current_buffer, current_buffer); - data->minibuf_scroll_window = Vminibuf_scroll_window; + data->minibuf_scroll_window = minibuf_level > 0 ? Vminibuf_scroll_window : Qnil; + data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; data->root_window = FRAME_ROOT_WINDOW (f); data->focus_frame = FRAME_FOCUS_FRAME (f); XSETINT (data->min_height, window_min_height); @@ -5303,7 +5901,7 @@ usage: (save-window-excursion BODY ...) */) Lisp_Object args; { register Lisp_Object val; - register int count = specpdl_ptr - specpdl; + register int count = SPECPDL_INDEX (); record_unwind_protect (Fset_window_configuration, Fcurrent_window_configuration (Qnil)); @@ -5319,40 +5917,45 @@ usage: (save-window-excursion BODY ...) */) DEFUN ("set-window-margins", Fset_window_margins, Sset_window_margins, 2, 3, 0, doc: /* Set width of marginal areas of window WINDOW. -If window is nil, set margins of the currently selected window. -First parameter LEFT-WIDTH specifies the number of character -cells to reserve for the left marginal area. Second parameter -RIGHT-WIDTH does the same for the right marginal area. -A nil width parameter means no margin. */) +If WINDOW is nil, set margins of the currently selected window. +Second arg LEFT-WIDTH specifies the number of character cells to +reserve for the left marginal area. Optional third arg RIGHT-WIDTH +does the same for the right marginal area. A nil width parameter +means no margin. */) (window, left, right) Lisp_Object window, left, right; { struct window *w = decode_window (window); + /* Translate negative or zero widths to nil. + Margins that are too wide have to be checked elsewhere. */ + if (!NILP (left)) - CHECK_NUMBER_OR_FLOAT (left, 1); + { + CHECK_NUMBER (left); + if (XINT (left) <= 0) + left = Qnil; + } + if (!NILP (right)) - CHECK_NUMBER_OR_FLOAT (right, 2); + { + CHECK_NUMBER (right); + if (XINT (right) <= 0) + right = Qnil; + } - /* Check widths < 0 and translate a zero width to nil. - Margins that are too wide have to be checked elsewhere. */ - if ((INTEGERP (left) && XINT (left) < 0) - || (FLOATP (left) && XFLOAT_DATA (left) <= 0)) - XSETFASTINT (left, 0); - if (INTEGERP (left) && XFASTINT (left) == 0) - left = Qnil; - - if ((INTEGERP (right) && XINT (right) < 0) - || (FLOATP (right) && XFLOAT_DATA (right) <= 0)) - XSETFASTINT (right, 0); - if (INTEGERP (right) && XFASTINT (right) == 0) - right = Qnil; - - w->left_margin_width = left; - w->right_margin_width = right; + if (!EQ (w->left_margin_cols, left) + || !EQ (w->right_margin_cols, right)) + { + w->left_margin_cols = left; + w->right_margin_cols = right; + + adjust_window_margins (w); + + ++windows_or_buffers_changed; + adjust_glyphs (XFRAME (WINDOW_FRAME (w))); + } - ++windows_or_buffers_changed; - adjust_glyphs (XFRAME (WINDOW_FRAME (w))); return Qnil; } @@ -5368,7 +5971,143 @@ as nil. */) Lisp_Object window; { struct window *w = decode_window (window); - return Fcons (w->left_margin_width, w->right_margin_width); + return Fcons (w->left_margin_cols, w->right_margin_cols); +} + + + +/*********************************************************************** + Fringes + ***********************************************************************/ + +DEFUN ("set-window-fringes", Fset_window_fringes, Sset_window_fringes, + 2, 4, 0, + doc: /* Set the fringe widths of window WINDOW. +If WINDOW is nil, set the fringe widths of the currently selected +window. +Second arg LEFT-WIDTH specifies the number of pixels to reserve for +the left fringe. Optional third arg RIGHT-WIDTH specifies the right +fringe width. If a fringe width arg is nil, that means to use the +frame's default fringe width. Default fringe widths can be set with +the command `set-fringe-style'. +If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes +outside of the display margins. By default, fringes are drawn between +display marginal areas and the text area. */) + (window, left, right, outside_margins) + Lisp_Object window, left, right, outside_margins; +{ + struct window *w = decode_window (window); + + if (!NILP (left)) + CHECK_NUMBER (left); + if (!NILP (right)) + CHECK_NUMBER (right); + + if (!EQ (w->left_fringe_width, left) + || !EQ (w->right_fringe_width, right) + || !EQ (w->fringes_outside_margins, outside_margins)) + { + w->left_fringe_width = left; + w->right_fringe_width = right; + w->fringes_outside_margins = outside_margins; + + adjust_window_margins (w); + + clear_glyph_matrix (w->current_matrix); + w->window_end_valid = Qnil; + + ++windows_or_buffers_changed; + adjust_glyphs (XFRAME (WINDOW_FRAME (w))); + } + + return Qnil; +} + + +DEFUN ("window-fringes", Fwindow_fringes, Swindow_fringes, + 0, 1, 0, + doc: /* Get width of fringes of window WINDOW. +If WINDOW is omitted or nil, use the currently selected window. +Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */) + (window) + Lisp_Object window; +{ + struct window *w = decode_window (window); + return Fcons (make_number (WINDOW_LEFT_FRINGE_WIDTH (w)), + Fcons (make_number (WINDOW_RIGHT_FRINGE_WIDTH (w)), + Fcons ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) ? + Qt : Qnil), Qnil))); +} + + + +/*********************************************************************** + Scroll bars + ***********************************************************************/ + +DEFUN ("set-window-scroll-bars", Fset_window_scroll_bars, Sset_window_scroll_bars, + 2, 4, 0, + doc: /* Set width and type of scroll bars of window WINDOW. +If window is nil, set scroll bars of the currently selected window. +Second parameter WIDTH specifies the pixel width for the scroll bar; +this is automatically adjusted to a multiple of the frame column width. +Third parameter VERTICAL-TYPE specifies the type of the vertical scroll +bar: left, right, or nil. +If WIDTH is nil, use the frame's scroll-bar width. +If TYPE is t, use the frame's scroll-bar type. */) + (window, width, vertical_type, horizontal_type) + Lisp_Object window, width, vertical_type, horizontal_type; +{ + struct window *w = decode_window (window); + + if (!NILP (width)) + CHECK_NUMBER (width); + + if (XINT (width) == 0) + vertical_type = Qnil; + + if (!(EQ (vertical_type, Qnil) + || EQ (vertical_type, Qleft) + || EQ (vertical_type, Qright) + || EQ (vertical_type, Qt))) + error ("Invalid type of vertical scroll bar"); + + if (!EQ (w->scroll_bar_width, width) + || !EQ (w->vertical_scroll_bar_type, vertical_type)) + { + w->scroll_bar_width = width; + w->vertical_scroll_bar_type = vertical_type; + + adjust_window_margins (w); + + clear_glyph_matrix (w->current_matrix); + w->window_end_valid = Qnil; + + ++windows_or_buffers_changed; + adjust_glyphs (XFRAME (WINDOW_FRAME (w))); + } + + return Qnil; +} + + +DEFUN ("window-scroll-bars", Fwindow_scroll_bars, Swindow_scroll_bars, + 0, 1, 0, + doc: /* Get width and type of scroll bars of window WINDOW. +If WINDOW is omitted or nil, use the currently selected window. +Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORIZONTAL-TYPE). +If WIDTH is nil or TYPE is t, the window is using the frame's corresponding +value. */) + (window) + Lisp_Object window; +{ + struct window *w = decode_window (window); + return Fcons (make_number ((WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) + ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) + : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), + Fcons (make_number (WINDOW_SCROLL_BAR_COLS (w)), + Fcons (w->vertical_scroll_bar_type, + Fcons (Qnil, Qnil)))); } @@ -5387,16 +6126,16 @@ Value is a multiple of the canonical character height of WINDOW. */) Lisp_Object result; struct frame *f; struct window *w; - + if (NILP (window)) window = selected_window; else - CHECK_WINDOW (window, 0); + CHECK_WINDOW (window); w = XWINDOW (window); f = XFRAME (w->frame); - + if (FRAME_WINDOW_P (f)) - result = CANON_Y_FROM_PIXEL_Y (f, -w->vscroll); + result = FRAME_CANON_Y_FROM_PIXEL_Y (f, -w->vscroll); else result = make_number (0); return result; @@ -5406,42 +6145,42 @@ Value is a multiple of the canonical character height of WINDOW. */) DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll, 2, 2, 0, doc: /* Set amount by which WINDOW should be scrolled vertically to VSCROLL. -WINDOW nil or omitted means use the selected window. VSCROLL is a -non-negative multiple of the canonical character height of WINDOW. */) +WINDOW nil means use the selected window. VSCROLL is a non-negative +multiple of the canonical character height of WINDOW. */) (window, vscroll) Lisp_Object window, vscroll; { struct window *w; struct frame *f; - + if (NILP (window)) window = selected_window; else - CHECK_WINDOW (window, 0); - CHECK_NUMBER_OR_FLOAT (vscroll, 1); - + CHECK_WINDOW (window); + CHECK_NUMBER_OR_FLOAT (vscroll); + w = XWINDOW (window); f = XFRAME (w->frame); if (FRAME_WINDOW_P (f)) { int old_dy = w->vscroll; - - w->vscroll = - CANON_Y_UNIT (f) * XFLOATINT (vscroll); + + w->vscroll = - FRAME_LINE_HEIGHT (f) * XFLOATINT (vscroll); w->vscroll = min (w->vscroll, 0); /* Adjust glyph matrix of the frame if the virtual display area becomes larger than before. */ if (w->vscroll < 0 && w->vscroll < old_dy) adjust_glyphs (f); - + /* Prevent redisplay shortcuts. */ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; } - + return Fwindow_vscroll (window); } - + /* Call FN for all leaf windows on frame F. FN is called with the first argument being a pointer to the leaf window, and with @@ -5469,16 +6208,16 @@ foreach_window_1 (w, fn, user_data) void *user_data; { int cont; - + for (cont = 1; w && cont;) { if (!NILP (w->hchild)) cont = foreach_window_1 (XWINDOW (w->hchild), fn, user_data); else if (!NILP (w->vchild)) cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); - else + else cont = fn (w, user_data); - + w = NILP (w->next) ? 0 : XWINDOW (w->next); } @@ -5501,7 +6240,7 @@ freeze_window_start (w, freeze_p) && ! NILP (Vminibuf_scroll_window) && w == XWINDOW (Vminibuf_scroll_window))) freeze_p = NULL; - + w->frozen_window_start_p = freeze_p != NULL; return 1; } @@ -5540,15 +6279,15 @@ compare_window_configurations (c1, c2, ignore_positions) wrong_type_argument (Qwindow_configuration_p, c1); if (!WINDOW_CONFIGURATIONP (c2)) wrong_type_argument (Qwindow_configuration_p, c2); - + d1 = (struct save_window_data *) XVECTOR (c1); d2 = (struct save_window_data *) XVECTOR (c2); sw1 = XVECTOR (d1->saved_windows); sw2 = XVECTOR (d2->saved_windows); - if (! EQ (d1->frame_width, d2->frame_width)) + if (! EQ (d1->frame_cols, d2->frame_cols)) return 0; - if (! EQ (d1->frame_height, d2->frame_height)) + if (! EQ (d1->frame_lines, d2->frame_lines)) return 0; if (! EQ (d1->frame_menu_bar_lines, d2->frame_menu_bar_lines)) return 0; @@ -5559,8 +6298,12 @@ compare_window_configurations (c1, c2, ignore_positions) if (! EQ (d1->current_buffer, d2->current_buffer)) return 0; if (! ignore_positions) - if (! EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window)) - return 0; + { + if (! EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window)) + return 0; + if (! EQ (d1->minibuf_selected_window, d2->minibuf_selected_window)) + return 0; + } /* Don't compare the root_window field. We don't require the two configurations to use the same window object, @@ -5596,13 +6339,13 @@ compare_window_configurations (c1, c2, ignore_positions) /* Verify that the corresponding windows do match. */ if (! EQ (p1->buffer, p2->buffer)) return 0; - if (! EQ (p1->left, p2->left)) + if (! EQ (p1->left_col, p2->left_col)) return 0; - if (! EQ (p1->top, p2->top)) + if (! EQ (p1->top_line, p2->top_line)) return 0; - if (! EQ (p1->width, p2->width)) + if (! EQ (p1->total_cols, p2->total_cols)) return 0; - if (! EQ (p1->height, p2->height)) + if (! EQ (p1->total_lines, p2->total_lines)) return 0; if (! EQ (p1->display_table, p2->display_table)) return 0; @@ -5625,6 +6368,20 @@ compare_window_configurations (c1, c2, ignore_positions) if (NILP (Fequal (p1->mark, p2->mark))) return 0; } + if (! EQ (p1->left_margin_cols, p2->left_margin_cols)) + return 0; + if (! EQ (p1->right_margin_cols, p2->right_margin_cols)) + return 0; + if (! EQ (p1->left_fringe_width, p2->left_fringe_width)) + return 0; + if (! EQ (p1->right_fringe_width, p2->right_fringe_width)) + return 0; + if (! EQ (p1->fringes_outside_margins, p2->fringes_outside_margins)) + return 0; + if (! EQ (p1->scroll_bar_width, p2->scroll_bar_width)) + return 0; + if (! EQ (p1->vertical_scroll_bar_type, p2->vertical_scroll_bar_type)) + return 0; } return 1; @@ -5665,14 +6422,9 @@ init_window () void syms_of_window () { - Qleft_fringe = intern ("left-fringe"); - staticpro (&Qleft_fringe); - Qright_fringe = intern ("right-fringe"); - staticpro (&Qright_fringe); - Qwindow_size_fixed = intern ("window-size-fixed"); staticpro (&Qwindow_size_fixed); - + staticpro (&Qwindow_configuration_change_hook); Qwindow_configuration_change_hook = intern ("window-configuration-change-hook"); @@ -5691,6 +6443,9 @@ syms_of_window () staticpro (&Vwindow_list); + minibuf_selected_window = Qnil; + staticpro (&minibuf_selected_window); + DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, doc: /* Non-nil means call as function to display a help buffer. The function is called with one argument, the buffer to be displayed. @@ -5716,6 +6471,12 @@ If nil, `display-buffer' will leave the window configuration alone. */); doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); Vminibuf_scroll_window = Qnil; + DEFVAR_BOOL ("mode-line-in-non-selected-windows", &mode_line_in_non_selected_windows, + doc: /* Non-nil means to use `mode-line-inactive' face in non-selected windows. +If the minibuffer is active, the `minibuffer-scroll-window' mode line +is displayed in the `mode-line' face. */); + mode_line_in_non_selected_windows = 1; + DEFVAR_LISP ("other-window-scroll-buffer", &Vother_window_scroll_buffer, doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); Vother_window_scroll_buffer = Qnil; @@ -5750,6 +6511,11 @@ In the latter case, FUNCTION is called with BUFFER as the first argument, followed by OTHER-ARGS--it can display BUFFER in any way it likes. All this is done by the function found in `special-display-function'. +If the specified frame parameters include (same-buffer . t), the +buffer is displayed in the currently selected window. Otherwise, if +they include (same-frame . t), the buffer is displayed in a new window +in the currently selected frame. + If this variable appears \"not to work\", because you add a name to it but that buffer still appears in the selected window, look at the values of `same-window-buffer-names' and `same-window-regexps'. @@ -5770,6 +6536,11 @@ In the latter case, FUNCTION is called with the buffer as first argument, followed by OTHER-ARGS--it can display the buffer in any way it likes. All this is done by the function found in `special-display-function'. +If the specified frame parameters include (same-buffer . t), the +buffer is displayed in the currently selected window. Otherwise, if +they include (same-frame . t), the buffer is displayed in a new window +in the currently selected frame. + If this variable appears \"not to work\", because you add a regexp to it but the matching buffers still appear in the selected window, look at the values of `same-window-buffer-names' and `same-window-regexps'. @@ -5780,10 +6551,14 @@ Those variables take precedence over this one. */); doc: /* Function to call to make a new frame for a special buffer. It is called with two arguments, the buffer and optional buffer specific data, and should return a window displaying that buffer. -The default value makes a separate frame for the buffer, -using `special-display-frame-alist' to specify the frame parameters. - -A buffer is special if its is listed in `special-display-buffer-names' +The default value normally makes a separate frame for the buffer, + using `special-display-frame-alist' to specify the frame parameters. +But if the buffer specific data includes (same-buffer . t) then the + buffer is displayed in the current selected window. +Otherwise if it includes (same-frame . t) then the buffer is displayed in + a new window in the currently selected frame. + +A buffer is special if it is listed in `special-display-buffer-names' or matches a regexp in `special-display-regexps'. */); Vspecial_display_function = Qnil; @@ -5869,6 +6644,9 @@ This variable automatically becomes buffer-local when set. */); defsubr (&Swindow_redisplay_end_trigger); defsubr (&Sset_window_redisplay_end_trigger); defsubr (&Swindow_edges); + defsubr (&Swindow_pixel_edges); + defsubr (&Swindow_inside_edges); + defsubr (&Swindow_inside_pixel_edges); defsubr (&Scoordinates_in_window_p); defsubr (&Swindow_at); defsubr (&Swindow_point); @@ -5895,6 +6673,7 @@ This variable automatically becomes buffer-local when set. */); defsubr (&Sspecial_display_p); defsubr (&Ssame_window_p); defsubr (&Sdisplay_buffer); + defsubr (&Sforce_window_update); defsubr (&Ssplit_window); defsubr (&Senlarge_window); defsubr (&Sshrink_window); @@ -5904,6 +6683,7 @@ This variable automatically becomes buffer-local when set. */); defsubr (&Sscroll_right); defsubr (&Sother_window_for_scrolling); defsubr (&Sscroll_other_window); + defsubr (&Sminibuffer_selected_window); defsubr (&Srecenter); defsubr (&Swindow_text_height); defsubr (&Smove_to_window_line); @@ -5914,6 +6694,10 @@ This variable automatically becomes buffer-local when set. */); defsubr (&Ssave_window_excursion); defsubr (&Sset_window_margins); defsubr (&Swindow_margins); + defsubr (&Sset_window_fringes); + defsubr (&Swindow_fringes); + defsubr (&Sset_window_scroll_bars); + defsubr (&Swindow_scroll_bars); defsubr (&Swindow_vscroll); defsubr (&Sset_window_vscroll); defsubr (&Scompare_window_configurations); @@ -5938,3 +6722,6 @@ keys_of_window () initial_define_key (global_map, Ctl('L'), "recenter"); initial_define_key (meta_map, 'r', "move-to-window-line"); } + +/* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f + (do not change this comment) */