diff options
| author | Miles Bader | 2001-10-20 05:55:56 +0000 |
|---|---|---|
| committer | Miles Bader | 2001-10-20 05:55:56 +0000 |
| commit | abcce93ae325f64605f7fced606688028002aa00 (patch) | |
| tree | 0d36e77fbe98ede0b6a471cddd10fb833dce7bbf /src/msdos.c | |
| parent | 8ede64a55f46f793a235d4c8e165878b17e1c72b (diff) | |
| download | emacs-abcce93ae325f64605f7fced606688028002aa00.tar.gz emacs-abcce93ae325f64605f7fced606688028002aa00.zip | |
(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.
Diffstat (limited to 'src/msdos.c')
| -rw-r--r-- | src/msdos.c | 40 |
1 files changed, 7 insertions, 33 deletions
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; | |||
| 374 | #ifndef HAVE_X_WINDOWS | 374 | #ifndef HAVE_X_WINDOWS |
| 375 | extern unsigned char ScreenAttrib; | 375 | extern unsigned char ScreenAttrib; |
| 376 | static int screen_face; | 376 | static int screen_face; |
| 377 | static int highlight; | ||
| 378 | 377 | ||
| 379 | static int screen_size_X; | 378 | static int screen_size_X; |
| 380 | static int screen_size_Y; | 379 | static int screen_size_Y; |
| @@ -895,12 +894,10 @@ IT_set_face (int face) | |||
| 895 | dflt_fg = dfp->foreground; | 894 | dflt_fg = dfp->foreground; |
| 896 | dflt_bg = dfp->background; | 895 | dflt_bg = dfp->background; |
| 897 | 896 | ||
| 898 | /* Don't use invalid colors. In particular, FACE_TTY_DEFAULT_* | 897 | /* Don't use invalid colors. In particular, FACE_TTY_DEFAULT_* colors |
| 899 | colors mean use the colors of the default face, except that if | 898 | mean use the colors of the default face. Note that we assume all |
| 900 | highlight is on, invert the foreground and the background. Note | 899 | 16 colors to be available for the background, since Emacs switches |
| 901 | that we assume all 16 colors to be available for the background, | 900 | on this mode (and loses the blinking attribute) at startup. */ |
| 902 | since Emacs switches on this mode (and loses the blinking | ||
| 903 | attribute) at startup. */ | ||
| 904 | if (fg == FACE_TTY_DEFAULT_COLOR || fg == FACE_TTY_DEFAULT_FG_COLOR) | 901 | if (fg == FACE_TTY_DEFAULT_COLOR || fg == FACE_TTY_DEFAULT_FG_COLOR) |
| 905 | fg = FRAME_FOREGROUND_PIXEL (sf); | 902 | fg = FRAME_FOREGROUND_PIXEL (sf); |
| 906 | else if (fg == FACE_TTY_DEFAULT_BG_COLOR) | 903 | else if (fg == FACE_TTY_DEFAULT_BG_COLOR) |
| @@ -911,8 +908,7 @@ IT_set_face (int face) | |||
| 911 | bg = FRAME_FOREGROUND_PIXEL (sf); | 908 | bg = FRAME_FOREGROUND_PIXEL (sf); |
| 912 | 909 | ||
| 913 | /* Make sure highlighted lines really stand out, come what may. */ | 910 | /* Make sure highlighted lines really stand out, come what may. */ |
| 914 | if ((highlight || fp->tty_reverse_p) | 911 | if (fp->tty_reverse_p && (fg == dflt_fg && bg == dflt_bg)) |
| 915 | && (fg == dflt_fg && bg == dflt_bg)) | ||
| 916 | { | 912 | { |
| 917 | unsigned long tem = fg; | 913 | unsigned long tem = fg; |
| 918 | 914 | ||
| @@ -928,8 +924,8 @@ IT_set_face (int face) | |||
| 928 | bg = tem2; | 924 | bg = tem2; |
| 929 | } | 925 | } |
| 930 | if (termscript) | 926 | if (termscript) |
| 931 | fprintf (termscript, "<FACE %d%s: %d/%d[FG:%d/BG:%d]>", face, | 927 | fprintf (termscript, "<FACE %d: %d/%d[FG:%d/BG:%d]>", face, |
| 932 | highlight ? "H" : "", fp->foreground, fp->background, fg, bg); | 928 | fp->foreground, fp->background, fg, bg); |
| 933 | if (fg >= 0 && fg < 16) | 929 | if (fg >= 0 && fg < 16) |
| 934 | { | 930 | { |
| 935 | ScreenAttrib &= 0xf0; | 931 | ScreenAttrib &= 0xf0; |
| @@ -1936,26 +1932,10 @@ IT_cmgoto (FRAME_PTR f) | |||
| 1936 | } | 1932 | } |
| 1937 | 1933 | ||
| 1938 | static void | 1934 | static void |
| 1939 | IT_reassert_line_highlight (int new, int vpos) | ||
| 1940 | { | ||
| 1941 | highlight = new; | ||
| 1942 | } | ||
| 1943 | |||
| 1944 | static void | ||
| 1945 | IT_change_line_highlight (int new_highlight, int y, int vpos, int first_unused_hpos) | ||
| 1946 | { | ||
| 1947 | highlight = new_highlight; | ||
| 1948 | IT_cursor_to (vpos, 0); | ||
| 1949 | IT_clear_end_of_line (first_unused_hpos); | ||
| 1950 | } | ||
| 1951 | |||
| 1952 | static void | ||
| 1953 | IT_update_begin (struct frame *f) | 1935 | IT_update_begin (struct frame *f) |
| 1954 | { | 1936 | { |
| 1955 | struct display_info *display_info = FRAME_X_DISPLAY_INFO (f); | 1937 | struct display_info *display_info = FRAME_X_DISPLAY_INFO (f); |
| 1956 | struct frame *mouse_face_frame = display_info->mouse_face_mouse_frame; | 1938 | struct frame *mouse_face_frame = display_info->mouse_face_mouse_frame; |
| 1957 | |||
| 1958 | highlight = 0; | ||
| 1959 | 1939 | ||
| 1960 | BLOCK_INPUT; | 1940 | BLOCK_INPUT; |
| 1961 | 1941 | ||
| @@ -2013,7 +1993,6 @@ IT_update_begin (struct frame *f) | |||
| 2013 | static void | 1993 | static void |
| 2014 | IT_update_end (struct frame *f) | 1994 | IT_update_end (struct frame *f) |
| 2015 | { | 1995 | { |
| 2016 | highlight = 0; | ||
| 2017 | FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; | 1996 | FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; |
| 2018 | } | 1997 | } |
| 2019 | 1998 | ||
| @@ -2150,7 +2129,6 @@ IT_set_terminal_modes (void) | |||
| 2150 | { | 2129 | { |
| 2151 | if (termscript) | 2130 | if (termscript) |
| 2152 | fprintf (termscript, "\n<SET_TERM>"); | 2131 | fprintf (termscript, "\n<SET_TERM>"); |
| 2153 | highlight = 0; | ||
| 2154 | 2132 | ||
| 2155 | screen_size_X = ScreenCols (); | 2133 | screen_size_X = ScreenCols (); |
| 2156 | screen_size_Y = ScreenRows (); | 2134 | screen_size_Y = ScreenRows (); |
| @@ -2228,8 +2206,6 @@ IT_reset_terminal_modes (void) | |||
| 2228 | if (termscript) | 2206 | if (termscript) |
| 2229 | fprintf (termscript, "\n<RESET_TERM>"); | 2207 | fprintf (termscript, "\n<RESET_TERM>"); |
| 2230 | 2208 | ||
| 2231 | highlight = 0; | ||
| 2232 | |||
| 2233 | if (!term_setup_done) | 2209 | if (!term_setup_done) |
| 2234 | return; | 2210 | return; |
| 2235 | 2211 | ||
| @@ -2608,10 +2584,8 @@ internal_terminal_init () | |||
| 2608 | clear_to_end_hook = IT_clear_to_end; | 2584 | clear_to_end_hook = IT_clear_to_end; |
| 2609 | clear_end_of_line_hook = IT_clear_end_of_line; | 2585 | clear_end_of_line_hook = IT_clear_end_of_line; |
| 2610 | clear_frame_hook = IT_clear_screen; | 2586 | clear_frame_hook = IT_clear_screen; |
| 2611 | change_line_highlight_hook = IT_change_line_highlight; | ||
| 2612 | update_begin_hook = IT_update_begin; | 2587 | update_begin_hook = IT_update_begin; |
| 2613 | update_end_hook = IT_update_end; | 2588 | update_end_hook = IT_update_end; |
| 2614 | reassert_line_highlight_hook = IT_reassert_line_highlight; | ||
| 2615 | frame_up_to_date_hook = IT_frame_up_to_date; | 2589 | frame_up_to_date_hook = IT_frame_up_to_date; |
| 2616 | 2590 | ||
| 2617 | /* These hooks are called by term.c without being checked. */ | 2591 | /* These hooks are called by term.c without being checked. */ |