mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-28 07:50:48 -08:00
Code Issues Projects Releases Wiki Activity

(Fx_create_frame): Don't create frame larger than display by default bug#3643.

Browse source
This commit is contained in:
Jan Djärv 2010-01-09 14:26:23 +01:00
parent de62c4d98f
commit 21b9df2f5a
2 changed files with 44 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-09 Jan Djärv <jan.h.d@swipnet.se>
* xfns.c (Fx_create_frame): Don't create frame larger than display
by default bug#3643.
2010-01-09 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* frame.h (FRAME_TOP_MARGIN_HEIGHT): New macro.

39
src/xfns.c
View file

@ -3396,6 +3396,45 @@ This function is an internal primitive--use `make-frame' instead. */)
/* Compute the size of the X window. */
window_prompting = x_figure_window_size (f, parms, 1);
/* Don't make height higher than display height unless the user asked
for it. */
height = FRAME_LINES (f);
tem = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER);
if (EQ (tem, Qunbound))
{
int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f));
int dph = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
if (ph > dph)
{
height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, dph) -
FRAME_TOOL_BAR_LINES (f) - FRAME_MENU_BAR_LINES (f);
if (FRAME_EXTERNAL_TOOL_BAR (f))
height -= 2; /* We can't know how big it will be. */
if (FRAME_EXTERNAL_MENU_BAR (f))
height -= 2; /* We can't know how big it will be. */
}
}
/* Don't make width wider than display width unless the user asked
for it. */
width = FRAME_COLS (f);
tem = x_get_arg (dpyinfo, parms, Qwidth, 0, 0, RES_TYPE_NUMBER);
if (EQ (tem, Qunbound))
{
int pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, FRAME_COLS (f));
int dpw = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
if (pw > dpw)
width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, dpw);
}
if (height != FRAME_LINES (f) || width != FRAME_COLS (f))
{
check_frame_size (f, &height, &width);
FRAME_LINES (f) = height;
SET_FRAME_COLS (f, width);
}
tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
f->no_split = minibuffer_only || EQ (tem, Qt);