Commit 340e4cce authored by Martin Rudalics's avatar Martin Rudalics

Remove code left dead after 2014-07-27 changes.

* frame.c (frame_inhibit_resize):
* widget.c (EmacsFrameResize):
* window.c (resize_frame_windows, Fset_window_configuration):
* xdisp.c (expose_frame):
* xfns.c (x_change_tool_bar_height):
* xmenu.c (update_frame_menubar):
* xterm.c (handle_one_xevent, x_new_font, x_set_window_size_1):
Remove code left dead after 2014-07-27 changes.
parent 2494447b
2014-09-25 Martin Rudalics <rudalics@gmx.at>
* frame.c (frame_inhibit_resize):
* widget.c (EmacsFrameResize):
* window.c (resize_frame_windows, Fset_window_configuration):
* xdisp.c (expose_frame):
* xfns.c (x_change_tool_bar_height):
* xmenu.c (update_frame_menubar):
* xterm.c (handle_one_xevent, x_new_font, x_set_window_size_1):
Remove code left dead after 2014-07-27 changes.
2014-09-25 Paul Eggert <eggert@cs.ucla.edu>
Fix local_cons etc. to not exhaust the stack when in a loop.
......
......@@ -219,21 +219,6 @@ frame_inhibit_resize (struct frame *f, bool horizontal)
|| FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f));
}
#if 0
bool
frame_inhibit_resize (struct frame *f, bool horizontal)
{
Lisp_Object fullscreen = get_frame_param (f, Qfullscreen);
return (frame_inhibit_implied_resize
|| EQ (fullscreen, Qfullboth)
|| EQ (fullscreen, Qfullscreen)
|| EQ (fullscreen, Qmaximized)
|| (horizontal && EQ (fullscreen, Qfullwidth))
|| (!horizontal && EQ (fullscreen, Qfullheight)));
}
#endif
static void
set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
......
......@@ -579,15 +579,6 @@ EmacsFrameResize (Widget widget)
if (true || frame_resize_pixelwise)
{
int width, height;
/** int width = (ew->core.width **/
/** - FRAME_SCROLL_BAR_AREA_WIDTH (f) **/
/** - FRAME_TOTAL_FRINGE_WIDTH (f) **/
/** - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
/** int height = (ew->core.height **/
/** - FRAME_TOOLBAR_HEIGHT (f) **/
/** - FRAME_SCROLL_BAR_AREA_HEIGHT (f) **/
/** - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
pixel_to_text_size (ew, ew->core.width, ew->core.height, &width, &height);
change_frame_size (f, width, height, 0, 1, 0, 1);
......
This diff is collapsed.
......@@ -30145,8 +30145,6 @@ expose_frame (struct frame *f, int x, int y, int w, int h)
r.x = r.y = 0;
r.width = FRAME_TEXT_WIDTH (f);
r.height = FRAME_TEXT_HEIGHT (f);
/** r.width = FRAME_COLUMN_WIDTH (f) * FRAME_COLS (f); **/
/** r.height = FRAME_LINE_HEIGHT (f) * FRAME_LINES (f); **/
}
else
{
......
......@@ -1140,10 +1140,8 @@ x_change_tool_bar_height (struct frame *f, int height)
adjust_frame_size (f, -1, -1, 4, 0);
/** #if !defined USE_X_TOOLKIT **/
if (FRAME_X_WINDOW (f))
x_clear_under_internal_border (f);
/** #endif **/
#endif /* USE_GTK */
}
......
......@@ -627,7 +627,6 @@ update_frame_menubar (struct frame *f)
xg_update_frame_menubar (f);
#else
struct x_output *x;
/** int columns, rows; **/
eassert (FRAME_X_P (f));
......@@ -637,10 +636,6 @@ update_frame_menubar (struct frame *f)
return;
block_input ();
/* Save the size of the frame because the pane widget doesn't accept
to resize itself. So force it. */
/** columns = FRAME_COLS (f); **/
/** rows = FRAME_LINES (f); **/
/* Do the voodoo which means "I'm changing lots of things, don't try
to refigure sizes until I'm done." */
......@@ -661,8 +656,7 @@ update_frame_menubar (struct frame *f)
XtManageChild (x->edit_widget);
lw_refigure_widget (x->column_widget, True);
/* Force the pane widget to resize itself with the right values. */
/** EmacsFrameSetCharSize (x->edit_widget, columns, rows); **/
/* Force the pane widget to resize itself. */
adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 2, 0);
unblock_input ();
#endif
......
......@@ -7560,9 +7560,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
SET_FRAME_GARBAGED (f);
cancel_mouse_face (f);
}
/** FRAME_PIXEL_WIDTH (f) = event->xconfigure.width; **/
/** FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height; **/
#endif /* not USE_GTK */
#endif
......@@ -8647,7 +8644,6 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font);
#ifndef USE_X_TOOLKIT \
/** FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f); **/
FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
#endif
......@@ -9490,18 +9486,6 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
{
int pixelwidth, pixelheight;
/** if (pixelwise) **/
/** { **/
/** pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, width); **/
/** pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, height); **/
/** } **/
/** else **/
/** { **/
/** pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width); **/
/** pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height); **/
/** } **/
/** FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOLBAR_HEIGHT (f); **/
pixelwidth = (pixelwise
? FRAME_TEXT_TO_PIXEL_WIDTH (f, width)
: 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,
? FRAME_TEXT_TO_PIXEL_HEIGHT (f, height)
: FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height)));
/** pixelwidth = ((pixelwise ? width : (width * FRAME_COLUMN_WIDTH (f))) **/
/** + FRAME_SCROLL_BAR_AREA_WIDTH (f) **/
/** + FRAME_TOTAL_FRINGE_WIDTH (f) **/
/** + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
/** pixelheight = ((pixelwise ? height : (height * FRAME_LINE_HEIGHT (f))) **/
/** + FRAME_TOOLBAR_HEIGHT (f) **/
/** + FRAME_SCROLL_BAR_AREA_HEIGHT (f) **/
/** + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/
if (change_gravity) f->win_gravity = NorthWestGravity;
x_wm_set_size_hint (f, 0, 0);
XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
......
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