From: Miles Bader Date: Sat, 20 Oct 2001 05:55:56 +0000 (+0000) Subject: (IT_reassert_line_highlight, IT_change_line_highlight): Functions removed. X-Git-Tag: ttn-vms-21-2-B4~19327 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=abcce93ae325f64605f7fced606688028002aa00;p=emacs.git (IT_reassert_line_highlight, IT_change_line_highlight): Functions removed. (internal_terminal_init): Don't set reassert_line_highlight_hook or change_line_highlight_hook. (highlight): Variable removed. (IT_set_face, IT_update_begin, IT_update_end, IT_set_terminal_modes): Don't set or use it. --- diff --git a/src/ChangeLog b/src/ChangeLog index a06c9de3dfa..50bfe171455 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,70 @@ +2001-10-20 Miles Bader + + The following changes remove the glyph_row `inverse_p' field, + which is never set anymore, due to other changes: + + * dispextern.h (struct glyph_row): Remove `inverse_p' field. + (reassert_line_highlight, change_line_highlight): Declarations removed. + * dispnew.c (update_frame_line): Don't call reassert_line_highlight. + (line_hash_code, row_equal_p, fake_current_matrices) + (build_frame_matrix_from_leaf_window, update_frame_line) + (update_frame_line, update_frame_line, update_frame_line): + Don't use `inverse_p' field. + * xterm.c (x_initialize): Don't set reassert_line_highlight_hook or + change_line_highlight_hook. + (XTreassert_line_highlight, x_change_line_highlight): + Functions removed. + (x_fix_overlapping_area, x_write_glyphs, expose_area) + (expose_line, x_erase_phys_cursor): Don't use `inverse_p' field. + * xdisp.c (dump_glyph_row, display_mode_line): Don't use + `inverse_p' field. + * w32term.c (x_fix_overlapping_area, x_write_glyphs, expose_area) + (expose_line, x_erase_phys_cursor): Don't use `inverse_p' field. + (w32_reassert_line_highlight, x_change_line_highlight): + Functions removed. + * w32console.c (reassert_line_highlight, change_line_highlight): + Functions removed. + (initialize_w32_display): Don't set reassert_line_highlight_hook + or change_line_highlight_hook. + (hl_mode): Function removed. + (reset_terminal_modes, set_terminal_modes, update_begin) + (update_end, w32_face_attributes, initialize_w32_display): + (clear_frame, ins_del_lines): Don't call it. + * termhooks.h (reassert_line_highlight_hook) + (change_line_highlight_hook): Declarations removed. + * term.c (reassert_line_highlight_hook) + (change_line_highlight_hook): Variables removed. + (reassert_line_highlight, change_line_highlight): Functions removed. + * msdos.c (IT_reassert_line_highlight) + (IT_change_line_highlight): Functions removed. + (internal_terminal_init): Don't set reassert_line_highlight_hook + or change_line_highlight_hook. + (highlight): Variable removed. + (IT_set_face, IT_update_begin, IT_update_end) + (IT_set_terminal_modes): Don't set or use it. + + The following changes remove inverse-video support for terminals + that use a `magic cookie' standout mode. Due to changes in the + way mode-lines are displayed, such support no longer works + anyway, and it's probable that almost no one uses such terminals + anymore: + + * term.c (standout_requested): Variable removed. + (update_end, highlight_if_desired): Don't use it. + (chars_wasted, copybuf): Variables removed. + (write_standout_marker): Function removed. + (cursor_to, clear_to_end, clear_frame, clear_end_of_line_raw) + (clear_end_of_line_raw, write_glyphs, ins_del_lines): + Don't use `chars_wasted' or `copybuf'. + (calculate_costs): Don't allocate `chars_wasted' or `copybuf'. + Set `costs_set' to true. + (cursor_to, clear_end_of_line): Test `costs_set' instead of + `chars_wasted'. + (clear_end_of_line): Function removed. + (clear_end_of_line_raw): Renamed to `clear_end_of_line'. + (clear_to_end): Call `clear_end_of_line' instead of + `clear_end_of_line_raw'. + 2001-10-19 Richard M. Stallman * eval.c (syms_of_eval): Doc fixes. diff --git a/src/msdos.c b/src/msdos.c index 79ac0b9026c..ec7c7161c2b 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -374,7 +374,6 @@ static int internal_terminal = 0; #ifndef HAVE_X_WINDOWS extern unsigned char ScreenAttrib; static int screen_face; -static int highlight; static int screen_size_X; static int screen_size_Y; @@ -895,12 +894,10 @@ IT_set_face (int face) dflt_fg = dfp->foreground; dflt_bg = dfp->background; - /* Don't use invalid colors. In particular, FACE_TTY_DEFAULT_* - colors mean use the colors of the default face, except that if - highlight is on, invert the foreground and the background. Note - that we assume all 16 colors to be available for the background, - since Emacs switches on this mode (and loses the blinking - attribute) at startup. */ + /* Don't use invalid colors. In particular, FACE_TTY_DEFAULT_* colors + mean use the colors of the default face. Note that we assume all + 16 colors to be available for the background, since Emacs switches + on this mode (and loses the blinking attribute) at startup. */ if (fg == FACE_TTY_DEFAULT_COLOR || fg == FACE_TTY_DEFAULT_FG_COLOR) fg = FRAME_FOREGROUND_PIXEL (sf); else if (fg == FACE_TTY_DEFAULT_BG_COLOR) @@ -911,8 +908,7 @@ IT_set_face (int face) bg = FRAME_FOREGROUND_PIXEL (sf); /* Make sure highlighted lines really stand out, come what may. */ - if ((highlight || fp->tty_reverse_p) - && (fg == dflt_fg && bg == dflt_bg)) + if (fp->tty_reverse_p && (fg == dflt_fg && bg == dflt_bg)) { unsigned long tem = fg; @@ -928,8 +924,8 @@ IT_set_face (int face) bg = tem2; } if (termscript) - fprintf (termscript, "", face, - highlight ? "H" : "", fp->foreground, fp->background, fg, bg); + fprintf (termscript, "", face, + fp->foreground, fp->background, fg, bg); if (fg >= 0 && fg < 16) { ScreenAttrib &= 0xf0; @@ -1935,27 +1931,11 @@ IT_cmgoto (FRAME_PTR f) mouse_on (); } -static void -IT_reassert_line_highlight (int new, int vpos) -{ - highlight = new; -} - -static void -IT_change_line_highlight (int new_highlight, int y, int vpos, int first_unused_hpos) -{ - highlight = new_highlight; - IT_cursor_to (vpos, 0); - IT_clear_end_of_line (first_unused_hpos); -} - static void IT_update_begin (struct frame *f) { struct display_info *display_info = FRAME_X_DISPLAY_INFO (f); struct frame *mouse_face_frame = display_info->mouse_face_mouse_frame; - - highlight = 0; BLOCK_INPUT; @@ -2013,7 +1993,6 @@ IT_update_begin (struct frame *f) static void IT_update_end (struct frame *f) { - highlight = 0; FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; } @@ -2150,7 +2129,6 @@ IT_set_terminal_modes (void) { if (termscript) fprintf (termscript, "\n"); - highlight = 0; screen_size_X = ScreenCols (); screen_size_Y = ScreenRows (); @@ -2228,8 +2206,6 @@ IT_reset_terminal_modes (void) if (termscript) fprintf (termscript, "\n"); - highlight = 0; - if (!term_setup_done) return; @@ -2608,10 +2584,8 @@ internal_terminal_init () clear_to_end_hook = IT_clear_to_end; clear_end_of_line_hook = IT_clear_end_of_line; clear_frame_hook = IT_clear_screen; - change_line_highlight_hook = IT_change_line_highlight; update_begin_hook = IT_update_begin; update_end_hook = IT_update_end; - reassert_line_highlight_hook = IT_reassert_line_highlight; frame_up_to_date_hook = IT_frame_up_to_date; /* These hooks are called by term.c without being checked. */