aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 9aea0684927..974e29dfc88 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7560,9 +7560,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
7560 SET_FRAME_GARBAGED (f); 7560 SET_FRAME_GARBAGED (f);
7561 cancel_mouse_face (f); 7561 cancel_mouse_face (f);
7562 } 7562 }
7563
7564/** FRAME_PIXEL_WIDTH (f) = event->xconfigure.width; **/
7565/** FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height; **/
7566#endif /* not USE_GTK */ 7563#endif /* not USE_GTK */
7567#endif 7564#endif
7568 7565
@@ -8647,7 +8644,6 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
8647 FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font); 8644 FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font);
8648 8645
8649#ifndef USE_X_TOOLKIT \ 8646#ifndef USE_X_TOOLKIT \
8650/** FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f); **/
8651 FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f); 8647 FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
8652#endif 8648#endif
8653 8649
@@ -9490,18 +9486,6 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
9490{ 9486{
9491 int pixelwidth, pixelheight; 9487 int pixelwidth, pixelheight;
9492 9488
9493/** if (pixelwise) **/
9494/** { **/
9495/** pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, width); **/
9496/** pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, height); **/
9497/** } **/
9498/** else **/
9499/** { **/
9500/** pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width); **/
9501/** pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height); **/
9502/** } **/
9503
9504/** FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOLBAR_HEIGHT (f); **/
9505 pixelwidth = (pixelwise 9489 pixelwidth = (pixelwise
9506 ? FRAME_TEXT_TO_PIXEL_WIDTH (f, width) 9490 ? FRAME_TEXT_TO_PIXEL_WIDTH (f, width)
9507 : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width)); 9491 : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width));
@@ -9509,16 +9493,6 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
9509 ? FRAME_TEXT_TO_PIXEL_HEIGHT (f, height) 9493 ? FRAME_TEXT_TO_PIXEL_HEIGHT (f, height)
9510 : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height))); 9494 : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height)));
9511 9495
9512/** pixelwidth = ((pixelwise ? width : (width * FRAME_COLUMN_WIDTH (f))) **/
9513/** + FRAME_SCROLL_BAR_AREA_WIDTH (f) **/
9514/** + FRAME_TOTAL_FRINGE_WIDTH (f) **/
9515/** + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
9516
9517/** pixelheight = ((pixelwise ? height : (height * FRAME_LINE_HEIGHT (f))) **/
9518/** + FRAME_TOOLBAR_HEIGHT (f) **/
9519/** + FRAME_SCROLL_BAR_AREA_HEIGHT (f) **/
9520/** + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
9521
9522 if (change_gravity) f->win_gravity = NorthWestGravity; 9496 if (change_gravity) f->win_gravity = NorthWestGravity;
9523 x_wm_set_size_hint (f, 0, 0); 9497 x_wm_set_size_hint (f, 0, 0);
9524 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), 9498 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),