Commit dc0e4c48 authored by Martin Rudalics's avatar Martin Rudalics

Constrain window body sizes.

* window.c (window_body_height, window_body_width): Don't return
negative value.
parent 99f10a5d
2014-02-07 Martin Rudalics <rudalics@gmx.at>
Constrain window box sizes (Bug#16649).
Constrain window box and body sizes (Bug#16649).
* xdisp.c (window_box_width): Don't return less than zero.
(window_box_left_offset, window_box_right_offset): Don't return
more than the window's pixel width.
* window.c (window_body_height, window_body_width): Don't return
negative value.
2014-02-07 Glenn Morris <rgm@gnu.org>
......
......@@ -866,7 +866,11 @@ window_body_height (struct window *w, bool pixelwise)
- WINDOW_MODE_LINE_HEIGHT (w)
- WINDOW_BOTTOM_DIVIDER_WIDTH (w));
return pixelwise ? height : height / FRAME_LINE_HEIGHT (WINDOW_XFRAME (w));
/* Don't return a negative value. */
return max (pixelwise
? height
: height / FRAME_LINE_HEIGHT (WINDOW_XFRAME (w)),
0);
}
/* Return the number of columns/pixels of W's body. Don't count columns
......@@ -893,7 +897,11 @@ window_body_width (struct window *w, bool pixelwise)
? WINDOW_FRINGES_WIDTH (w)
: 0));
return pixelwise ? width : width / FRAME_COLUMN_WIDTH (WINDOW_XFRAME (w));
/* Don't return a negative value. */
return max (pixelwise
? width
: width / FRAME_COLUMN_WIDTH (WINDOW_XFRAME (w)),
0);
}
DEFUN ("window-body-height", Fwindow_body_height, Swindow_body_height, 0, 2, 0,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment