mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 09:20:54 -08:00
Code Issues Projects Releases Wiki Activity

Constrain window body sizes.

Browse source 
* window.c (window_body_height, window_body_width): Don't return
negative value.
This commit is contained in:
Martin Rudalics 2014-02-07 11:03:10 +01:00
parent 99f10a5dae
commit dc0e4c4851
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,9 +1,11 @@
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>

12
src/window.c
View file

@ -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,