+2010-04-07 Jan Djärv <jan.h.d@swipnet.se>
+
+ * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
+ FRAME_LINE_TO_PIXEL_Y.
+
+ * xterm.c (x_set_window_size_1): Don't add border_width/height to
+ pixelwidth/height.
+
2010-04-05 Chong Yidong <cyd@stupidchicken.com>
* xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+ FRAME_INTERNAL_BORDER_WIDTH (f))
#define FRAME_TEXT_LINES_TO_PIXEL_HEIGHT(f, lines) \
- (FRAME_LINE_TO_PIXEL_Y (f, lines) \
- + FRAME_INTERNAL_BORDER_WIDTH (f))
+ ((lines) * FRAME_LINE_HEIGHT (f) \
+ + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
/* Return the row/column (zero-based) of the character cell containing
compute_fringe_widths (f, 0);
- pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols)
- + 2*f->border_width;
+ pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows)
- + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)
- + 2*f->border_width;
+ + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
if (change_gravity) f->win_gravity = NorthWestGravity;
x_wm_set_size_hint (f, (long) 0, 0);