From 9882535b5cf98d099a126c2bc02f956b9e5168c9 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sat, 24 May 2003 22:09:50 +0000 Subject: [PATCH] Make (some) trivial substitutions for renamed and new macros in dispextern.h, frame.h and window.h. --- src/scroll.c | 52 +++++++++++++++--------------- src/term.c | 90 ++++++++++++++++++++++++++-------------------------- src/xmenu.c | 28 +++++++--------- 3 files changed, 83 insertions(+), 87 deletions(-) diff --git a/src/scroll.c b/src/scroll.c index ccbc85ac8b2..d7535509007 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -96,7 +96,7 @@ calculate_scrolling (frame, matrix, window_size, lines_below, int free_at_end; { register int i, j; - int frame_height = FRAME_HEIGHT (frame); + int frame_lines = FRAME_LINES (frame); register struct matrix_elt *p, *p1; register int cost, cost1; @@ -105,18 +105,18 @@ calculate_scrolling (frame, matrix, window_size, lines_below, at the i'th line of the lines we are considering, where I is origin 1 (as it is below). */ int *first_insert_cost - = &FRAME_INSERT_COST (frame)[frame_height - 1 - lines_moved]; + = &FRAME_INSERT_COST (frame)[frame_lines - 1 - lines_moved]; int *first_delete_cost - = &FRAME_DELETE_COST (frame)[frame_height - 1 - lines_moved]; + = &FRAME_DELETE_COST (frame)[frame_lines - 1 - lines_moved]; int *next_insert_cost - = &FRAME_INSERTN_COST (frame)[frame_height - 1 - lines_moved]; + = &FRAME_INSERTN_COST (frame)[frame_lines - 1 - lines_moved]; int *next_delete_cost - = &FRAME_DELETEN_COST (frame)[frame_height - 1 - lines_moved]; + = &FRAME_DELETEN_COST (frame)[frame_lines - 1 - lines_moved]; /* Discourage long scrolls on fast lines. Don't scroll nearly a full frame height unless it saves at least 1/4 second. */ - int extra_cost = baud_rate / (10 * 4 * FRAME_HEIGHT (frame)); + int extra_cost = baud_rate / (10 * 4 * FRAME_LINES (frame)); if (baud_rate <= 0) extra_cost = 1; @@ -438,27 +438,27 @@ calculate_direct_scrolling (frame, matrix, window_size, lines_below, int free_at_end; { register int i, j; - int frame_height = FRAME_HEIGHT (frame); + int frame_lines = FRAME_LINES (frame); register struct matrix_elt *p, *p1; register int cost, cost1, delta; /* first_insert_cost[-I] is the cost of doing the first insert-line at a position I lines above the bottom line in the scroll window. */ int *first_insert_cost - = &FRAME_INSERT_COST (frame)[frame_height - 1]; + = &FRAME_INSERT_COST (frame)[frame_lines - 1]; int *first_delete_cost - = &FRAME_DELETE_COST (frame)[frame_height - 1]; + = &FRAME_DELETE_COST (frame)[frame_lines - 1]; int *next_insert_cost - = &FRAME_INSERTN_COST (frame)[frame_height - 1]; + = &FRAME_INSERTN_COST (frame)[frame_lines - 1]; int *next_delete_cost - = &FRAME_DELETEN_COST (frame)[frame_height - 1]; + = &FRAME_DELETEN_COST (frame)[frame_lines - 1]; int scroll_overhead; /* Discourage long scrolls on fast lines. Don't scroll nearly a full frame height unless it saves at least 1/4 second. */ - int extra_cost = baud_rate / (10 * 4 * FRAME_HEIGHT (frame)); + int extra_cost = baud_rate / (10 * 4 * FRAME_LINES (frame)); if (baud_rate <= 0) extra_cost = 1; @@ -909,7 +909,7 @@ scroll_cost (frame, from, to, amount) will not be involved in actual motion. */ int limit = to; int offset; - int height = FRAME_HEIGHT (frame); + int height = FRAME_LINES (frame); if (amount == 0) return 0; @@ -947,11 +947,11 @@ line_ins_del (frame, ov1, pf1, ovn, pfn, ov, mf) register int *ov, *mf; { register int i; - register int frame_height = FRAME_HEIGHT (frame); + register int frame_lines = FRAME_LINES (frame); register int insert_overhead = ov1 * 10; register int next_insert_cost = ovn * 10; - for (i = frame_height-1; i >= 0; i--) + for (i = frame_lines-1; i >= 0; i--) { mf[i] = next_insert_cost / 10; next_insert_cost += pfn; @@ -1000,12 +1000,12 @@ ins_del_costs (frame, only) and those that must repeatedly insert one line. The cost to insert N lines at line L is - [tt.t_ILov + (frame_height + 1 - L) * tt.t_ILpf] + - N * [tt.t_ILnov + (frame_height + 1 - L) * tt.t_ILnpf] + [tt.t_ILov + (frame_lines + 1 - L) * tt.t_ILpf] + + N * [tt.t_ILnov + (frame_lines + 1 - L) * tt.t_ILnpf] ILov represents the basic insert line overhead. ILpf is the padding required to allow the terminal time to move a line: insertion at line - L changes (frame_height + 1 - L) lines. + L changes (frame_lines + 1 - L) lines. The first bracketed expression above is the overhead; the second is the multiply factor. Both are dependent only on the position at @@ -1035,27 +1035,27 @@ do_line_insertion_deletion_costs (frame, { FRAME_INSERT_COST (frame) = (int *) xrealloc (FRAME_INSERT_COST (frame), - FRAME_HEIGHT (frame) * sizeof (int)); + FRAME_LINES (frame) * sizeof (int)); FRAME_DELETEN_COST (frame) = (int *) xrealloc (FRAME_DELETEN_COST (frame), - FRAME_HEIGHT (frame) * sizeof (int)); + FRAME_LINES (frame) * sizeof (int)); FRAME_INSERTN_COST (frame) = (int *) xrealloc (FRAME_INSERTN_COST (frame), - FRAME_HEIGHT (frame) * sizeof (int)); + FRAME_LINES (frame) * sizeof (int)); FRAME_DELETE_COST (frame) = (int *) xrealloc (FRAME_DELETE_COST (frame), - FRAME_HEIGHT (frame) * sizeof (int)); + FRAME_LINES (frame) * sizeof (int)); } else { FRAME_INSERT_COST (frame) = - (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); + (int *) xmalloc (FRAME_LINES (frame) * sizeof (int)); FRAME_DELETEN_COST (frame) = - (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); + (int *) xmalloc (FRAME_LINES (frame) * sizeof (int)); FRAME_INSERTN_COST (frame) = - (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); + (int *) xmalloc (FRAME_LINES (frame) * sizeof (int)); FRAME_DELETE_COST (frame) = - (int *) xmalloc (FRAME_HEIGHT (frame) * sizeof (int)); + (int *) xmalloc (FRAME_LINES (frame) * sizeof (int)); } ins_del_costs (frame, diff --git a/src/term.c b/src/term.c index 68f522c506c..829f2d88e6b 100644 --- a/src/term.c +++ b/src/term.c @@ -66,14 +66,14 @@ static void tty_show_cursor P_ ((void)); static void tty_hide_cursor P_ ((void)); #define OUTPUT(a) \ - tputs (a, (int) (FRAME_HEIGHT (XFRAME (selected_frame)) - curY), cmputc) + tputs (a, (int) (FRAME_LINES (XFRAME (selected_frame)) - curY), cmputc) #define OUTPUT1(a) tputs (a, 1, cmputc) #define OUTPUTL(a, lines) tputs (a, lines, cmputc) #define OUTPUT_IF(a) \ do { \ if (a) \ - tputs (a, (int) (FRAME_HEIGHT (XFRAME (selected_frame)) \ + tputs (a, (int) (FRAME_LINES (XFRAME (selected_frame)) \ - curY), cmputc); \ } while (0) @@ -363,11 +363,11 @@ static int se_is_so; /* 1 if same string both enters and leaves /* The largest frame width in any call to calculate_costs. */ -int max_frame_width; +int max_frame_cols; /* The largest frame height in any call to calculate_costs. */ -int max_frame_height; +int max_frame_lines; static int costs_set; /* Nonzero if costs have been calculated. */ @@ -378,7 +378,7 @@ int standout_mode; /* Nonzero when in standout mode. */ This is the number of lines, from the top of frame downwards, which can participate in insert-line/delete-line operations. - Effectively it excludes the bottom frame_height - specified_window_size + Effectively it excludes the bottom frame_lines - specified_window_size lines from those operations. */ int specified_window; @@ -504,7 +504,7 @@ set_terminal_window (size) { if (FRAME_TERMCAP_P (updating_frame)) { - specified_window = size ? size : FRAME_HEIGHT (updating_frame); + specified_window = size ? size : FRAME_LINES (updating_frame); if (scroll_region_ok) set_scroll_region (0, specified_window); } @@ -523,11 +523,11 @@ set_scroll_region (start, stop) buf = tparam (TS_set_scroll_region, 0, 0, start, stop - 1); else if (TS_set_scroll_region_1) buf = tparam (TS_set_scroll_region_1, 0, 0, - FRAME_HEIGHT (sf), start, - FRAME_HEIGHT (sf) - stop, - FRAME_HEIGHT (sf)); + FRAME_LINES (sf), start, + FRAME_LINES (sf) - stop, + FRAME_LINES (sf)); else - buf = tparam (TS_set_window, 0, 0, start, 0, stop, FRAME_WIDTH (sf)); + buf = tparam (TS_set_window, 0, 0, start, 0, stop, FRAME_COLS (sf)); OUTPUT (buf); xfree (buf); @@ -701,10 +701,10 @@ clear_to_end () } else { - for (i = curY; i < FRAME_HEIGHT (XFRAME (selected_frame)); i++) + for (i = curY; i < FRAME_LINES (XFRAME (selected_frame)); i++) { cursor_to (i, 0); - clear_end_of_line (FRAME_WIDTH (XFRAME (selected_frame))); + clear_end_of_line (FRAME_COLS (XFRAME (selected_frame))); } } } @@ -773,8 +773,8 @@ clear_end_of_line (first_unused_hpos) turn_off_insert (); /* Do not write in last row last col with Auto-wrap on. */ - if (AutoWrap && curY == FRAME_HEIGHT (sf) - 1 - && first_unused_hpos == FRAME_WIDTH (sf)) + if (AutoWrap && curY == FRAME_LINES (sf) - 1 + && first_unused_hpos == FRAME_COLS (sf)) first_unused_hpos--; for (i = curX; i < first_unused_hpos; i++) @@ -921,8 +921,8 @@ write_glyphs (string, len) since that would scroll the whole frame on some terminals. */ if (AutoWrap - && curY + 1 == FRAME_HEIGHT (sf) - && (curX + len) == FRAME_WIDTH (sf)) + && curY + 1 == FRAME_LINES (sf) + && (curX + len) == FRAME_COLS (sf)) len --; if (len <= 0) return; @@ -1153,7 +1153,7 @@ ins_del_lines (vpos, n) as there will be a matching inslines later that will flush them. */ if (scroll_region_ok && vpos + i >= specified_window) return; - if (!memory_below_frame && vpos + i >= FRAME_HEIGHT (sf)) + if (!memory_below_frame && vpos + i >= FRAME_LINES (sf)) return; if (multi) @@ -1188,7 +1188,7 @@ ins_del_lines (vpos, n) if (!scroll_region_ok && memory_below_frame && n < 0) { - cursor_to (FRAME_HEIGHT (sf) + n, 0); + cursor_to (FRAME_LINES (sf) + n, 0); clear_to_end (); } } @@ -1238,11 +1238,11 @@ per_line_cost (str) #ifndef old /* char_ins_del_cost[n] is cost of inserting N characters. char_ins_del_cost[-n] is cost of deleting N characters. - The length of this vector is based on max_frame_width. */ + The length of this vector is based on max_frame_cols. */ int *char_ins_del_vector; -#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_WIDTH ((f))]) +#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS ((f))]) #endif /* ARGSUSED */ @@ -1295,7 +1295,7 @@ calculate_ins_del_char_costs (frame) /* Delete costs are at negative offsets */ p = &char_ins_del_cost (frame)[0]; - for (i = FRAME_WIDTH (frame); --i >= 0;) + for (i = FRAME_COLS (frame); --i >= 0;) *--p = (del_startup_cost += del_cost_per_char); /* Doing nothing is free */ @@ -1303,7 +1303,7 @@ calculate_ins_del_char_costs (frame) *p++ = 0; /* Insert costs are at positive offsets */ - for (i = FRAME_WIDTH (frame); --i >= 0;) + for (i = FRAME_COLS (frame); --i >= 0;) *p++ = (ins_startup_cost += ins_cost_per_char); } @@ -1325,8 +1325,8 @@ calculate_costs (frame) char_ins_del_vector (i.e., char_ins_del_cost) isn't used because X turns off char_ins_del_ok. */ - max_frame_height = max (max_frame_height, FRAME_HEIGHT (frame)); - max_frame_width = max (max_frame_width, FRAME_WIDTH (frame)); + max_frame_lines = max (max_frame_lines, FRAME_LINES (frame)); + max_frame_cols = max (max_frame_cols, FRAME_COLS (frame)); costs_set = 1; @@ -1334,14 +1334,14 @@ calculate_costs (frame) char_ins_del_vector = (int *) xrealloc (char_ins_del_vector, (sizeof (int) - + 2 * max_frame_width * sizeof (int))); + + 2 * max_frame_cols * sizeof (int))); else char_ins_del_vector = (int *) xmalloc (sizeof (int) - + 2 * max_frame_width * sizeof (int)); + + 2 * max_frame_cols * sizeof (int)); bzero (char_ins_del_vector, (sizeof (int) - + 2 * max_frame_width * sizeof (int))); + + 2 * max_frame_cols * sizeof (int))); if (f && (!TS_ins_line && !TS_del_line)) do_line_insertion_deletion_costs (frame, @@ -1360,7 +1360,7 @@ calculate_costs (frame) if (TS_repeat && per_line_cost (TS_repeat) * baud_rate < 9000) RPov = string_cost (TS_repeat); else - RPov = FRAME_WIDTH (frame) * 2; + RPov = FRAME_COLS (frame) * 2; cmcostinit (); /* set up cursor motion costs */ } @@ -2174,9 +2174,9 @@ term_init (terminal_type) if (area == 0) abort (); - FrameRows = FRAME_HEIGHT (sf); - FrameCols = FRAME_WIDTH (sf); - specified_window = FRAME_HEIGHT (sf); + FrameRows = FRAME_LINES (sf); + FrameCols = FRAME_COLS (sf); + specified_window = FRAME_LINES (sf); delete_in_insert_mode = 1; @@ -2356,21 +2356,21 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", { int height, width; get_frame_size (&width, &height); - FRAME_WIDTH (sf) = width; - FRAME_HEIGHT (sf) = height; + FRAME_COLS (sf) = width; + FRAME_LINES (sf) = height; } - if (FRAME_WIDTH (sf) <= 0) - SET_FRAME_WIDTH (sf, tgetnum ("co")); + if (FRAME_COLS (sf) <= 0) + SET_FRAME_COLS (sf, tgetnum ("co")); else /* Keep width and external_width consistent */ - SET_FRAME_WIDTH (sf, FRAME_WIDTH (sf)); - if (FRAME_HEIGHT (sf) <= 0) - FRAME_HEIGHT (sf) = tgetnum ("li"); + SET_FRAME_COLS (sf, FRAME_COLS (sf)); + if (FRAME_LINES (sf) <= 0) + FRAME_LINES (sf) = tgetnum ("li"); - if (FRAME_HEIGHT (sf) < 3 || FRAME_WIDTH (sf) < 3) + if (FRAME_LINES (sf) < 3 || FRAME_COLS (sf) < 3) fatal ("Screen size %dx%d is too small", - FRAME_HEIGHT (sf), FRAME_WIDTH (sf)); + FRAME_LINES (sf), FRAME_COLS (sf)); min_padding_speed = tgetnum ("pb"); TabWidth = tgetnum ("tw"); @@ -2493,9 +2493,9 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", } } - FrameRows = FRAME_HEIGHT (sf); - FrameCols = FRAME_WIDTH (sf); - specified_window = FRAME_HEIGHT (sf); + FrameRows = FRAME_LINES (sf); + FrameCols = FRAME_COLS (sf); + specified_window = FRAME_LINES (sf); if (Wcm_init () == -1) /* can't do cursor motion */ #ifdef VMS @@ -2524,8 +2524,8 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", terminal_type); # endif /* TERMINFO */ #endif /*VMS */ - if (FRAME_HEIGHT (sf) <= 0 - || FRAME_WIDTH (sf) <= 0) + if (FRAME_LINES (sf) <= 0 + || FRAME_COLS (sf) <= 0) fatal ("The frame size has not been specified"); delete_in_insert_mode diff --git a/src/xmenu.c b/src/xmenu.c index 6d402f660d0..daafad6140a 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -709,10 +709,8 @@ mouse_position_for_popup(f, x, y) /* xmenu_show expects window coordinates, not root window coordinates. Translate. */ - *x -= f->output_data.x->left_pos - + FRAME_OUTER_TO_INNER_DIFF_X (f); - *y -= f->output_data.x->top_pos - + FRAME_OUTER_TO_INNER_DIFF_Y (f); + *x -= f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); + *y -= f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); } #endif /* HAVE_X_WINDOWS */ @@ -861,10 +859,8 @@ cached information about equivalent key sequences. */) CHECK_LIVE_WINDOW (window); f = XFRAME (WINDOW_FRAME (XWINDOW (window))); - xpos = (FONT_WIDTH (FRAME_FONT (f)) - * XFASTINT (XWINDOW (window)->left)); - ypos = (FRAME_LINE_HEIGHT (f) - * XFASTINT (XWINDOW (window)->top)); + xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window)); + ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window)); } else /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, @@ -1779,8 +1775,8 @@ update_frame_menubar (f) BLOCK_INPUT; /* Save the size of the frame because the pane widget doesn't accept to resize itself. So force it. */ - columns = f->width; - rows = f->height; + 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." */ @@ -2314,8 +2310,8 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) pos_func = menu_position_func; /* Adjust coordinates to be root-window-relative. */ - x += f->output_data.x->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); - y += f->output_data.x->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); + x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); + y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); popup_x_y.x = x; popup_x_y.y = y; @@ -2402,8 +2398,8 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click) dummy.y = y; /* Adjust coordinates to be root-window-relative. */ - x += f->output_data.x->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); - y += f->output_data.x->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); + x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); + y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); dummy.x_root = x; dummy.y_root = y; @@ -3120,8 +3116,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) #endif /* HAVE_X_WINDOWS */ /* Adjust coordinates to be root-window-relative. */ - x += f->output_data.x->left_pos; - y += f->output_data.x->top_pos; + x += f->left_pos; + y += f->top_pos; /* Create all the necessary panes and their items. */ i = 0; -- 2.39.2