diff options
Diffstat (limited to 'contrib/ncurses/ncurses/tty')
| -rw-r--r-- | contrib/ncurses/ncurses/tty/hashmap.c | 4 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tty/lib_mvcur.c | 683 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tty/lib_tstp.c | 3 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tty/lib_twait.c | 7 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tty/lib_vidattr.c | 331 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tty/tty_display.h | 9 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tty/tty_update.c | 1883 |
7 files changed, 1463 insertions, 1457 deletions
diff --git a/contrib/ncurses/ncurses/tty/hashmap.c b/contrib/ncurses/ncurses/tty/hashmap.c index f6a58bc6e112..300ac9a3232a 100644 --- a/contrib/ncurses/ncurses/tty/hashmap.c +++ b/contrib/ncurses/ncurses/tty/hashmap.c @@ -70,7 +70,7 @@ AUTHOR #include <curses.priv.h> #include <term.h> /* for back_color_erase */ -MODULE_ID("$Id: hashmap.c,v 1.33 1999/03/18 02:09:45 Alexander.V.Lukyanov Exp $") +MODULE_ID("$Id: hashmap.c,v 1.34 1999/11/28 00:10:57 tom Exp $") #ifdef HASHDEBUG @@ -286,7 +286,9 @@ void _nc_hash_map(void) if (!hashtab) { if (oldhash) + { FreeAndNull(oldhash); + } lines_alloc = 0; return; } diff --git a/contrib/ncurses/ncurses/tty/lib_mvcur.c b/contrib/ncurses/ncurses/tty/lib_mvcur.c index 955eb8c6cd84..190c59bd4a15 100644 --- a/contrib/ncurses/ncurses/tty/lib_mvcur.c +++ b/contrib/ncurses/ncurses/tty/lib_mvcur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -31,7 +31,6 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ - /* ** lib_mvcur.c ** @@ -153,13 +152,13 @@ #include <term.h> #include <ctype.h> -MODULE_ID("$Id: lib_mvcur.c,v 1.60 1999/10/03 01:08:27 Alexander.V.Lukyanov Exp $") +MODULE_ID("$Id: lib_mvcur.c,v 1.67 2000/06/24 21:13:51 tom Exp $") #define STRLEN(s) (s != 0) ? strlen(s) : 0 +#define CURRENT_ROW SP->_cursrow /* phys cursor row */ +#define CURRENT_COLUMN SP->_curscol /* phys cursor column */ #define CURRENT_ATTR SP->_current_attr /* current phys attribute */ -#define CURRENT_ROW SP->_cursrow /* phys cursor row */ -#define CURRENT_COLUMN SP->_curscol /* phys cursor column */ #define REAL_ATTR SP->_current_attr /* phys current attribute */ #define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */ #define BAUDRATE cur_term->_baudrate /* bits per second */ @@ -176,20 +175,21 @@ static float diff; static int normalized_cost(const char *const cap, int affcnt); #if !HAVE_STRSTR -char * _nc_strstr(const char *haystack, const char *needle) +char * +_nc_strstr(const char *haystack, const char *needle) { - size_t len1 = strlen(haystack); - size_t len2 = strlen(needle); - char *result = 0; - - while ((len1 != 0) && (len1-- >= len2)) { - if (!strncmp(haystack, needle, len2)) { - result = haystack; - break; - } - haystack++; + size_t len1 = strlen(haystack); + size_t len2 = strlen(needle); + char *result = 0; + + while ((len1 != 0) && (len1-- >= len2)) { + if (!strncmp(haystack, needle, len2)) { + result = haystack; + break; } - return result; + haystack++; + } + return result; } #endif @@ -203,18 +203,20 @@ char * _nc_strstr(const char *haystack, const char *needle) static int trace_cost_of(const char *capname, const char *cap, int affcnt) { - int result = _nc_msec_cost(cap,affcnt); - TR(TRACE_CHARPUT|TRACE_MOVE, ("CostOf %s %d", capname, result)); - return result; + int result = _nc_msec_cost(cap, affcnt); + TR(TRACE_CHARPUT | TRACE_MOVE, + ("CostOf %s %d %s", capname, result, _nc_visbuf(cap))); + return result; } #define CostOf(cap,affcnt) trace_cost_of(#cap,cap,affcnt); static int trace_normalized_cost(const char *capname, const char *cap, int affcnt) { - int result = normalized_cost(cap,affcnt); - TR(TRACE_CHARPUT|TRACE_MOVE, ("NormalizedCost %s %d", capname, result)); - return result; + int result = normalized_cost(cap, affcnt); + TR(TRACE_CHARPUT | TRACE_MOVE, + ("NormalizedCost %s %d %s", capname, result, _nc_visbuf(cap))); + return result; } #define NormalizedCost(cap,affcnt) trace_normalized_cost(#cap,cap,affcnt); @@ -225,25 +227,22 @@ trace_normalized_cost(const char *capname, const char *cap, int affcnt) #endif -int _nc_msec_cost(const char *const cap, int affcnt) +int +_nc_msec_cost(const char *const cap, int affcnt) /* compute the cost of a given operation */ { if (cap == 0) - return(INFINITY); - else - { - const char *cp; - float cum_cost = 0; + return (INFINITY); + else { + const char *cp; + float cum_cost = 0; - for (cp = cap; *cp; cp++) - { + for (cp = cap; *cp; cp++) { /* extract padding, either mandatory or required */ - if (cp[0] == '$' && cp[1] == '<' && strchr(cp, '>')) - { - float number = 0; + if (cp[0] == '$' && cp[1] == '<' && strchr(cp, '>')) { + float number = 0; - for (cp += 2; *cp != '>'; cp++) - { + for (cp += 2; *cp != '>'; cp++) { if (isdigit(*cp)) number = number * 10 + (*cp - '0'); else if (*cp == '*') @@ -252,41 +251,44 @@ int _nc_msec_cost(const char *const cap, int affcnt) number += (*cp - '0') / 10.0; } - cum_cost += number * 10; - } - else +#ifdef NCURSES_NO_PADDING + if (!(SP->_no_padding)) +#endif + cum_cost += number * 10; + } else cum_cost += SP->_char_padding; } - return((int)cum_cost); + return ((int) cum_cost); } } -static int normalized_cost(const char *const cap, int affcnt) +static int +normalized_cost(const char *const cap, int affcnt) /* compute the effective character-count for an operation (round up) */ { - int cost = _nc_msec_cost(cap, affcnt); - if (cost != INFINITY) - cost = (cost + SP->_char_padding - 1) / SP->_char_padding; - return cost; + int cost = _nc_msec_cost(cap, affcnt); + if (cost != INFINITY) + cost = (cost + SP->_char_padding - 1) / SP->_char_padding; + return cost; } -static void reset_scroll_region(void) +static void +reset_scroll_region(void) /* Set the scroll-region to a known state (the default) */ { - if (change_scroll_region) - { + if (change_scroll_region) { TPUTS_TRACE("change_scroll_region"); putp(tparm(change_scroll_region, 0, screen_lines - 1)); } } -void _nc_mvcur_resume(void) +void +_nc_mvcur_resume(void) /* what to do at initialization time and after each shellout */ { /* initialize screen for cursor access */ - if (enter_ca_mode) - { + if (enter_ca_mode) { TPUTS_TRACE("enter_ca_mode"); putp(enter_ca_mode); } @@ -304,15 +306,15 @@ void _nc_mvcur_resume(void) SP->_cursrow = SP->_curscol = -1; /* restore cursor shape */ - if (SP->_cursor != -1) - { + if (SP->_cursor != -1) { int cursor = SP->_cursor; SP->_cursor = -1; - curs_set (cursor); + curs_set(cursor); } } -void _nc_mvcur_init(void) +void +_nc_mvcur_init(void) /* initialize the cost structure */ { /* @@ -321,15 +323,15 @@ void _nc_mvcur_init(void) SP->_char_padding = (9 * 1000 * 10) / (BAUDRATE > 0 ? BAUDRATE : 9600); if (SP->_char_padding <= 0) SP->_char_padding = 1; /* must be nonzero */ - TR(TRACE_CHARPUT|TRACE_MOVE, ("char_padding %d msecs", SP->_char_padding)); + TR(TRACE_CHARPUT | TRACE_MOVE, ("char_padding %d msecs", SP->_char_padding)); /* non-parameterized local-motion strings */ - SP->_cr_cost = CostOf(carriage_return, 0); + SP->_cr_cost = CostOf(carriage_return, 0); SP->_home_cost = CostOf(cursor_home, 0); - SP->_ll_cost = CostOf(cursor_to_ll, 0); + SP->_ll_cost = CostOf(cursor_to_ll, 0); #if USE_HARD_TABS - SP->_ht_cost = CostOf(tab, 0); - SP->_cbt_cost = CostOf(back_tab, 0); + SP->_ht_cost = CostOf(tab, 0); + SP->_cbt_cost = CostOf(back_tab, 0); #endif /* USE_HARD_TABS */ SP->_cub1_cost = CostOf(cursor_left, 0); SP->_cuf1_cost = CostOf(cursor_right, 0); @@ -357,7 +359,7 @@ void _nc_mvcur_init(void) * * (1) They never have * padding. In the entire master terminfo database * as of March 1995, only the obsolete Zenith Z-100 pc violates this. - * (Proportional padding is found mainly in insert, delete and scroll + * (Proportional padding is found mainly in insert, delete and scroll * capabilities). * * (2) The average case of cup has two two-digit parameters. Strictly, @@ -375,34 +377,38 @@ void _nc_mvcur_init(void) * All these averages depend on the assumption that all parameter values * are equally probable. */ - SP->_cup_cost = CostOf(tparm(SP->_address_cursor, 23, 23), 1); - SP->_cub_cost = CostOf(tparm(parm_left_cursor, 23), 1); - SP->_cuf_cost = CostOf(tparm(parm_right_cursor, 23), 1); - SP->_cud_cost = CostOf(tparm(parm_down_cursor, 23), 1); - SP->_cuu_cost = CostOf(tparm(parm_up_cursor, 23), 1); - SP->_hpa_cost = CostOf(tparm(column_address, 23), 1); - SP->_vpa_cost = CostOf(tparm(row_address, 23), 1); + SP->_cup_cost = CostOf(tparm(SP->_address_cursor, 23, 23), 1); + SP->_cub_cost = CostOf(tparm(parm_left_cursor, 23), 1); + SP->_cuf_cost = CostOf(tparm(parm_right_cursor, 23), 1); + SP->_cud_cost = CostOf(tparm(parm_down_cursor, 23), 1); + SP->_cuu_cost = CostOf(tparm(parm_up_cursor, 23), 1); + SP->_hpa_cost = CostOf(tparm(column_address, 23), 1); + SP->_vpa_cost = CostOf(tparm(row_address, 23), 1); /* non-parameterized screen-update strings */ - SP->_ed_cost = NormalizedCost(clr_eos, 1); - SP->_el_cost = NormalizedCost(clr_eol, 1); - SP->_el1_cost = NormalizedCost(clr_bol, 1); + SP->_ed_cost = NormalizedCost(clr_eos, 1); + SP->_el_cost = NormalizedCost(clr_eol, 1); + SP->_el1_cost = NormalizedCost(clr_bol, 1); SP->_dch1_cost = NormalizedCost(delete_character, 1); SP->_ich1_cost = NormalizedCost(insert_character, 1); /* parameterized screen-update strings */ - SP->_dch_cost = NormalizedCost(tparm(parm_dch, 23), 1); - SP->_ich_cost = NormalizedCost(tparm(parm_ich, 23), 1); - SP->_ech_cost = NormalizedCost(tparm(erase_chars, 23), 1); - SP->_rep_cost = NormalizedCost(tparm(repeat_char, ' ', 23), 1); + SP->_dch_cost = NormalizedCost(tparm(parm_dch, 23), 1); + SP->_ich_cost = NormalizedCost(tparm(parm_ich, 23), 1); + SP->_ech_cost = NormalizedCost(tparm(erase_chars, 23), 1); + SP->_rep_cost = NormalizedCost(tparm(repeat_char, ' ', 23), 1); SP->_cup_ch_cost = NormalizedCost(tparm(SP->_address_cursor, 23, 23), 1); SP->_hpa_ch_cost = NormalizedCost(tparm(column_address, 23), 1); + SP->_cuf_ch_cost = NormalizedCost(tparm(parm_right_cursor, 23), 1); + SP->_inline_cost = min(SP->_cup_ch_cost, + min(SP->_hpa_ch_cost, + SP->_cuf_ch_cost)); /* pre-compute some capability lengths */ SP->_carriage_return_length = STRLEN(carriage_return); - SP->_cursor_home_length = STRLEN(cursor_home); - SP->_cursor_to_ll_length = STRLEN(cursor_to_ll); + SP->_cursor_home_length = STRLEN(cursor_home); + SP->_cursor_to_ll_length = STRLEN(cursor_to_ll); /* * If save_cursor is used within enter_ca_mode, we should not use it for @@ -411,8 +417,8 @@ void _nc_mvcur_init(void) * feature. */ if (save_cursor != 0 - && enter_ca_mode != 0 - && strstr(enter_ca_mode, save_cursor) != 0) { + && enter_ca_mode != 0 + && strstr(enter_ca_mode, save_cursor) != 0) { T(("...suppressed sc/rc capability due to conflict with smcup/rmcup")); save_cursor = 0; restore_cursor = 0; @@ -426,7 +432,8 @@ void _nc_mvcur_init(void) _nc_mvcur_resume(); } -void _nc_mvcur_wrap(void) +void +_nc_mvcur_wrap(void) /* wrap up cursor-addressing mode */ { /* leave cursor at screen bottom */ @@ -436,8 +443,7 @@ void _nc_mvcur_wrap(void) if (SP->_cursor != -1) curs_set(1); - if (exit_ca_mode) - { + if (exit_ca_mode) { TPUTS_TRACE("exit_ca_mode"); putp(exit_ca_mode); } @@ -462,24 +468,24 @@ void _nc_mvcur_wrap(void) * Perform repeated-append, returning cost */ static inline int -repeated_append (int total, int num, int repeat, char *dst, const char *src) +repeated_append(int total, int num, int repeat, char *dst, const char *src) { - register size_t src_len = strlen(src); - register size_t dst_len = STRLEN(dst); - - if ((dst_len + repeat * src_len) < OPT_SIZE-1) { - total += (num * repeat); - if (dst) { - dst += dst_len; - while (repeat-- > 0) { - (void) strcpy(dst, src); - dst += src_len; - } - } - } else { - total = INFINITY; + register size_t src_len = strlen(src); + register size_t dst_len = STRLEN(dst); + + if ((dst_len + repeat * src_len) < OPT_SIZE - 1) { + total += (num * repeat); + if (dst) { + dst += dst_len; + while (repeat-- > 0) { + (void) strcpy(dst, src); + dst += src_len; + } } - return total; + } else { + total = INFINITY; + } + return total; } #ifndef NO_OPTIMIZE @@ -494,56 +500,47 @@ repeated_append (int total, int num, int repeat, char *dst, const char *src) /* Note: we'd like to inline this for speed, but GNU C barfs on the attempt. */ static int -relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) +relative_move(char *result, int from_y, int from_x, int to_y, int to_x, bool ovw) /* move via local motions (cuu/cuu1/cud/cud1/cub1/cub/cuf1/cuf/vpa/hpa) */ { - int n, vcost = 0, hcost = 0; + int n, vcost = 0, hcost = 0; if (result) result[0] = '\0'; - if (to_y != from_y) - { + if (to_y != from_y) { vcost = INFINITY; - if (row_address) - { + if (row_address) { if (result) (void) strcpy(result, tparm(row_address, to_y)); vcost = SP->_vpa_cost; } - if (to_y > from_y) - { + if (to_y > from_y) { n = (to_y - from_y); - if (parm_down_cursor && SP->_cud_cost < vcost) - { + if (parm_down_cursor && SP->_cud_cost < vcost) { if (result) (void) strcpy(result, tparm(parm_down_cursor, n)); vcost = SP->_cud_cost; } - if (cursor_down && (n * SP->_cud1_cost < vcost)) - { + if (cursor_down && (n * SP->_cud1_cost < vcost)) { if (result) result[0] = '\0'; vcost = repeated_append(0, SP->_cud1_cost, n, result, cursor_down); } - } - else /* (to_y < from_y) */ - { + } else { /* (to_y < from_y) */ n = (from_y - to_y); - if (parm_up_cursor && SP->_cup_cost < vcost) - { + if (parm_up_cursor && SP->_cup_cost < vcost) { if (result) (void) strcpy(result, tparm(parm_up_cursor, n)); vcost = SP->_cup_cost; } - if (cursor_up && (n * SP->_cuu1_cost < vcost)) - { + if (cursor_up && (n * SP->_cuu1_cost < vcost)) { if (result) result[0] = '\0'; vcost = repeated_append(0, SP->_cuu1_cost, n, result, cursor_up); @@ -551,53 +548,47 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) } if (vcost == INFINITY) - return(INFINITY); + return (INFINITY); } if (result) result += strlen(result); - if (to_x != from_x) - { - char str[OPT_SIZE]; + if (to_x != from_x) { + char str[OPT_SIZE]; hcost = INFINITY; - if (column_address) - { + if (column_address) { if (result) (void) strcpy(result, tparm(column_address, to_x)); hcost = SP->_hpa_cost; } - if (to_x > from_x) - { + if (to_x > from_x) { n = to_x - from_x; - if (parm_right_cursor && SP->_cuf_cost < hcost) - { + if (parm_right_cursor && SP->_cuf_cost < hcost) { if (result) (void) strcpy(result, tparm(parm_right_cursor, n)); hcost = SP->_cuf_cost; } - if (cursor_right) - { - int lhcost = 0; + if (cursor_right) { + int lhcost = 0; str[0] = '\0'; #if USE_HARD_TABS /* use hard tabs, if we have them, to do as much as possible */ - if (init_tabs > 0 && tab) - { - int nxt, fr; + if (init_tabs > 0 && tab) { + int nxt, fr; - for (fr = from_x; (nxt = NEXTTAB(fr)) <= to_x; fr = nxt) - { - lhcost = repeated_append(lhcost, SP->_ht_cost, 1, str, tab); + for (fr = from_x; (nxt = NEXTTAB(fr)) <= to_x; fr = nxt) { + lhcost = repeated_append(lhcost, SP->_ht_cost, 1, + str, tab); if (lhcost == INFINITY) - break; + break; } n = to_x - fr; @@ -614,11 +605,11 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) * screen. */ if (ovw - && n > 0 - && vcost == 0 - && str[0] == '\0' - && isdigit(TextOf(WANT_CHAR(to_y, from_x)))) - ovw = FALSE; + && n > 0 + && vcost == 0 + && str[0] == '\0' + && isdigit(TextOf(WANT_CHAR(to_y, from_x)))) + ovw = FALSE; #endif /* * If we have no attribute changes, overwrite is cheaper. @@ -628,21 +619,18 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) * and the time the structure WANT_CHAR would access has been * updated. */ - if (ovw) - { - int i; + if (ovw) { + int i; for (i = 0; i < n; i++) - if ((WANT_CHAR(to_y, from_x + i) & A_ATTRIBUTES) != CURRENT_ATTR) - { + if ((WANT_CHAR(to_y, from_x + i) & A_ATTRIBUTES) != CURRENT_ATTR) { ovw = FALSE; break; } } - if (ovw) - { - char *sp; - int i; + if (ovw) { + char *sp; + int i; sp = str + strlen(str); @@ -650,48 +638,41 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) *sp++ = WANT_CHAR(to_y, from_x + i); *sp = '\0'; lhcost += n * SP->_char_padding; - } - else + } else #endif /* defined(REAL_ATTR) && defined(WANT_CHAR) */ { lhcost = repeated_append(lhcost, SP->_cuf1_cost, n, str, cursor_right); } - if (lhcost < hcost) - { + if (lhcost < hcost) { if (result) (void) strcpy(result, str); hcost = lhcost; } } - } - else /* (to_x < from_x) */ - { + } else { /* (to_x < from_x) */ n = from_x - to_x; - if (parm_left_cursor && SP->_cub_cost < hcost) - { + if (parm_left_cursor && SP->_cub_cost < hcost) { if (result) (void) strcpy(result, tparm(parm_left_cursor, n)); hcost = SP->_cub_cost; } - if (cursor_left) - { - int lhcost = 0; + if (cursor_left) { + int lhcost = 0; str[0] = '\0'; #if USE_HARD_TABS - if (init_tabs > 0 && back_tab) - { - int nxt, fr; + if (init_tabs > 0 && back_tab) { + int nxt, fr; - for (fr = from_x; (nxt = LASTTAB(fr)) >= to_x; fr = nxt) - { - lhcost = repeated_append(lhcost, SP->_cbt_cost, 1, str, back_tab); + for (fr = from_x; (nxt = LASTTAB(fr)) >= to_x; fr = nxt) { + lhcost = repeated_append(lhcost, SP->_cbt_cost, 1, + str, back_tab); if (lhcost == INFINITY) - break; + break; } n = fr - to_x; @@ -700,8 +681,7 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) lhcost = repeated_append(lhcost, SP->_cub1_cost, n, str, cursor_left); - if (lhcost < hcost) - { + if (lhcost < hcost) { if (result) (void) strcpy(result, str); hcost = lhcost; @@ -710,10 +690,10 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) } if (hcost == INFINITY) - return(INFINITY); + return (INFINITY); } - return(vcost + hcost); + return (vcost + hcost); } #endif /* !NO_OPTIMIZE */ @@ -729,12 +709,12 @@ relative_move(char *result, int from_y,int from_x,int to_y,int to_x, bool ovw) */ static inline int -onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) +onscreen_mvcur(int yold, int xold, int ynew, int xnew, bool ovw) /* onscreen move from (yold, xold) to (ynew, xnew) */ { - char use[OPT_SIZE], *sp; - int tactic = 0, newcost, usecost = INFINITY; - int t5_cr_cost; + char use[OPT_SIZE], *sp; + int tactic = 0, newcost, usecost = INFINITY; + int t5_cr_cost; #if defined(MAIN) || defined(NCURSES_TEST) struct timeval before, after; @@ -744,8 +724,7 @@ onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) /* tactic #0: use direct cursor addressing */ sp = tparm(SP->_address_cursor, ynew, xnew); - if (sp) - { + if (sp) { tactic = 0; (void) strcpy(use, sp); usecost = SP->_cup_cost; @@ -763,11 +742,9 @@ onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) * (like, say, local-movement \n getting mapped to some obscure * character because A_ALTCHARSET is on). */ - if (yold == -1 || xold == -1 || NOT_LOCAL(yold, xold, ynew, xnew)) - { + if (yold == -1 || xold == -1 || NOT_LOCAL(yold, xold, ynew, xnew)) { #if defined(MAIN) || defined(NCURSES_TEST) - if (!profiling) - { + if (!profiling) { (void) fputs("nonlocal\n", stderr); goto nonlocal; /* always run the optimizer if profiling */ } @@ -776,40 +753,36 @@ onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) #endif /* MAIN */ } } - #ifndef NO_OPTIMIZE /* tactic #1: use local movement */ if (yold != -1 && xold != -1 - && ((newcost=relative_move(NULL, yold, xold, ynew, xnew, ovw))!=INFINITY) - && newcost < usecost) - { + && ((newcost = relative_move(NULL, yold, xold, ynew, xnew, ovw)) != INFINITY) + && newcost < usecost) { tactic = 1; usecost = newcost; } /* tactic #2: use carriage-return + local movement */ if (yold != -1 && carriage_return - && ((newcost=relative_move(NULL, yold,0,ynew,xnew, ovw)) != INFINITY) - && SP->_cr_cost + newcost < usecost) - { + && ((newcost = relative_move(NULL, yold, 0, ynew, xnew, ovw)) != INFINITY) + && SP->_cr_cost + newcost < usecost) { tactic = 2; usecost = SP->_cr_cost + newcost; } /* tactic #3: use home-cursor + local movement */ if (cursor_home - && ((newcost=relative_move(NULL, 0, 0, ynew, xnew, ovw)) != INFINITY) - && SP->_home_cost + newcost < usecost) - { + && ((newcost = relative_move(NULL, 0, 0, ynew, xnew, ovw)) != INFINITY) + && SP->_home_cost + newcost < usecost) { tactic = 3; usecost = SP->_home_cost + newcost; } /* tactic #4: use home-down + local movement */ if (cursor_to_ll - && ((newcost=relative_move(NULL, screen_lines-1, 0, ynew, xnew, ovw)) != INFINITY) - && SP->_ll_cost + newcost < usecost) - { + && ((newcost = relative_move(NULL, screen_lines - 1, 0, ynew, xnew, + ovw)) != INFINITY) + && SP->_ll_cost + newcost < usecost) { tactic = 4; usecost = SP->_ll_cost + newcost; } @@ -818,12 +791,12 @@ onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) * tactic #5: use left margin for wrap to right-hand side, * unless strange wrap behavior indicated by xenl might hose us. */ - t5_cr_cost = (xold>0 ? SP->_cr_cost : 0); + t5_cr_cost = (xold > 0 ? SP->_cr_cost : 0); if (auto_left_margin && !eat_newline_glitch && yold > 0 && cursor_left - && ((newcost=relative_move(NULL, yold-1, screen_columns-1, ynew, xnew, ovw)) != INFINITY) - && t5_cr_cost + SP->_cub1_cost + newcost < usecost) - { + && ((newcost = relative_move(NULL, yold - 1, screen_columns - 1, + ynew, xnew, ovw)) != INFINITY) + && t5_cr_cost + SP->_cub1_cost + newcost < usecost) { tactic = 5; usecost = t5_cr_cost + SP->_cub1_cost + newcost; } @@ -831,37 +804,33 @@ onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) /* * These cases are ordered by estimated relative frequency. */ - if (tactic) - { - if (tactic == 1) - (void) relative_move(use, yold, xold, ynew, xnew, ovw); - else if (tactic == 2) - { - (void) strcpy(use, carriage_return); - (void) relative_move(use + SP->_carriage_return_length, - yold,0,ynew,xnew, ovw); - } - else if (tactic == 3) - { - (void) strcpy(use, cursor_home); - (void) relative_move(use + SP->_cursor_home_length, - 0, 0, ynew, xnew, ovw); - } - else if (tactic == 4) - { - (void) strcpy(use, cursor_to_ll); - (void) relative_move(use + SP->_cursor_to_ll_length, - screen_lines-1, 0, ynew, xnew, ovw); - } - else /* if (tactic == 5) */ - { - use[0] = '\0'; - if (xold > 0) - (void) strcat(use, carriage_return); - (void) strcat(use, cursor_left); - (void) relative_move(use + strlen(use), - yold-1, screen_columns-1, ynew, xnew, ovw); - } + switch (tactic) { + case 1: + (void) relative_move(use, yold, xold, ynew, xnew, ovw); + break; + case 2: + (void) strcpy(use, carriage_return); + (void) relative_move(use + SP->_carriage_return_length, + yold, 0, ynew, xnew, ovw); + break; + case 3: + (void) strcpy(use, cursor_home); + (void) relative_move(use + SP->_cursor_home_length, + 0, 0, ynew, xnew, ovw); + break; + case 4: + (void) strcpy(use, cursor_to_ll); + (void) relative_move(use + SP->_cursor_to_ll_length, + screen_lines - 1, 0, ynew, xnew, ovw); + break; + case 5: + use[0] = '\0'; + if (xold > 0) + (void) strcat(use, carriage_return); + (void) strcat(use, cursor_left); + (void) relative_move(use + strlen(use), + yold - 1, screen_columns - 1, ynew, xnew, ovw); + break; } #endif /* !NO_OPTIMIZE */ @@ -870,28 +839,28 @@ onscreen_mvcur(int yold,int xold,int ynew,int xnew, bool ovw) diff = after.tv_usec - before.tv_usec + (after.tv_sec - before.tv_sec) * 1000000; if (!profiling) - (void) fprintf(stderr, "onscreen: %d msec, %f 28.8Kbps char-equivalents\n", - (int)diff, diff/288); + (void) fprintf(stderr, + "onscreen: %d msec, %f 28.8Kbps char-equivalents\n", + (int) diff, diff / 288); #endif /* MAIN */ - nonlocal: - if (usecost != INFINITY) - { + nonlocal: + if (usecost != INFINITY) { TPUTS_TRACE("mvcur"); tputs(use, 1, _nc_outch); - return(OK); - } - else - return(ERR); + return (OK); + } else + return (ERR); } -int mvcur(int yold, int xold, int ynew, int xnew) +int +mvcur(int yold, int xold, int ynew, int xnew) /* optimized cursor move from (yold, xold) to (ynew, xnew) */ { TR(TRACE_MOVE, ("mvcur(%d,%d,%d,%d) called", yold, xold, ynew, xnew)); if (yold == ynew && xold == xnew) - return(OK); + return (OK); /* * Most work here is rounding for terminal boundaries getting the @@ -899,40 +868,33 @@ int mvcur(int yold, int xold, int ynew, int xnew) * rolling up the screen to get ynew on the screen. */ - if (xnew >= screen_columns) - { + if (xnew >= screen_columns) { ynew += xnew / screen_columns; xnew %= screen_columns; } - if (xold >= screen_columns) - { - int l; + if (xold >= screen_columns) { + int l; l = (xold + 1) / screen_columns; yold += l; if (yold >= screen_lines) - l -= (yold - screen_lines - 1); + l -= (yold - screen_lines - 1); while (l > 0) { - if (newline) - { - TPUTS_TRACE("newline"); - tputs(newline, 0, _nc_outch); - } - else - putchar('\n'); - l--; - if (xold > 0) - { - if (carriage_return) - { - TPUTS_TRACE("carriage_return"); - tputs(carriage_return, 0, _nc_outch); - } - else - putchar('\r'); - xold = 0; - } + if (newline) { + TPUTS_TRACE("newline"); + tputs(newline, 0, _nc_outch); + } else + putchar('\n'); + l--; + if (xold > 0) { + if (carriage_return) { + TPUTS_TRACE("carriage_return"); + tputs(carriage_return, 0, _nc_outch); + } else + putchar('\r'); + xold = 0; + } } } @@ -942,7 +904,7 @@ int mvcur(int yold, int xold, int ynew, int xnew) ynew = screen_lines - 1; /* destination location is on screen now */ - return(onscreen_mvcur(yold, xold, ynew, xnew, TRUE)); + return (onscreen_mvcur(yold, xold, ynew, xnew, TRUE)); } #if defined(TRACE) || defined(NCURSES_TEST) @@ -963,35 +925,51 @@ const char *_nc_progname = "mvcur"; static unsigned long xmits; -int tputs(const char *string, int affcnt GCC_UNUSED, int (*outc)(int) GCC_UNUSED) +/* these override lib_tputs.c */ +int +tputs(const char *string, int affcnt GCC_UNUSED, int (*outc) (int) GCC_UNUSED) /* stub tputs() that dumps sequences in a visible form */ { if (profiling) xmits += strlen(string); else (void) fputs(_nc_visbuf(string), stdout); - return(OK); + return (OK); } -int putp(const char *string) +int +putp(const char *string) { - return(tputs(string, 1, _nc_outch)); + return (tputs(string, 1, _nc_outch)); } -int _nc_outch(int ch) +int +_nc_outch(int ch) { putc(ch, stdout); return OK; } -static char tname[MAX_ALIAS]; +char PC = 0; /* used by termcap library */ +speed_t ospeed = 0; /* used by termcap library */ +int _nc_nulls_sent = 0; /* used by 'tack' program */ + +int +delay_output(int ms GCC_UNUSED) +{ + return OK; +} + +static char tname[MAX_ALIAS]; -static void load_term(void) +static void +load_term(void) { (void) setupterm(tname, STDOUT_FILENO, NULL); } -static int roll(int n) +static int +roll(int n) { int i, j; @@ -1001,7 +979,8 @@ static int roll(int n) return (j % n); } -int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) +int +main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) { (void) strcpy(tname, termname()); load_term(); @@ -1016,30 +995,32 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) fputs("smcup:", stdout); putchar('\n'); - for (;;) - { - int fy, fx, ty, tx, n, i; - char buf[BUFSIZ], capname[BUFSIZ]; + for (;;) { + int fy, fx, ty, tx, n, i; + char buf[BUFSIZ], capname[BUFSIZ]; (void) fputs("> ", stdout); (void) fgets(buf, sizeof(buf), stdin); - if (buf[0] == '?') - { -(void) puts("? -- display this help message"); -(void) puts("fy fx ty tx -- (4 numbers) display (fy,fx)->(ty,tx) move"); -(void) puts("s[croll] n t b m -- display scrolling sequence"); -(void) printf("r[eload] -- reload terminal info for %s\n", termname()); -(void) puts("l[oad] <term> -- load terminal info for type <term>"); -(void) puts("d[elete] <cap> -- delete named capability"); -(void) puts("i[nspect] -- display terminal capabilities"); -(void) puts("c[ost] -- dump cursor-optimization cost table"); -(void) puts("o[optimize] -- toggle movement optimization"); -(void) puts("t[orture] <num> -- torture-test with <num> random moves"); -(void) puts("q[uit] -- quit the program"); - } - else if (sscanf(buf, "%d %d %d %d", &fy, &fx, &ty, &tx) == 4) - { + if (buf[0] == '?') { + (void) puts("? -- display this help message"); + (void) + puts("fy fx ty tx -- (4 numbers) display (fy,fx)->(ty,tx) move"); + (void) puts("s[croll] n t b m -- display scrolling sequence"); + (void) + printf("r[eload] -- reload terminal info for %s\n", + termname()); + (void) + puts("l[oad] <term> -- load terminal info for type <term>"); + (void) puts("d[elete] <cap> -- delete named capability"); + (void) puts("i[nspect] -- display terminal capabilities"); + (void) + puts("c[ost] -- dump cursor-optimization cost table"); + (void) puts("o[optimize] -- toggle movement optimization"); + (void) + puts("t[orture] <num> -- torture-test with <num> random moves"); + (void) puts("q[uit] -- quit the program"); + } else if (sscanf(buf, "%d %d %d %d", &fy, &fx, &ty, &tx) == 4) { struct timeval before, after; putchar('"'); @@ -1049,10 +1030,9 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) gettimeofday(&after, NULL); printf("\" (%ld msec)\n", - (long)(after.tv_usec - before.tv_usec + (after.tv_sec - before.tv_sec) * 1000000)); - } - else if (sscanf(buf, "s %d %d %d %d", &fy, &fx, &ty, &tx) == 4) - { + (long) (after.tv_usec - before.tv_usec + (after.tv_sec - + before.tv_sec) * 1000000)); + } else if (sscanf(buf, "s %d %d %d %d", &fy, &fx, &ty, &tx) == 4) { struct timeval before, after; putchar('"'); @@ -1062,66 +1042,53 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) gettimeofday(&after, NULL); printf("\" (%ld msec)\n", - (long)(after.tv_usec - before.tv_usec + (after.tv_sec - before.tv_sec) * 1000000)); - } - else if (buf[0] == 'r') - { + (long) (after.tv_usec - before.tv_usec + (after.tv_sec - + before.tv_sec) * 1000000)); + } else if (buf[0] == 'r') { (void) strcpy(tname, termname()); load_term(); - } - else if (sscanf(buf, "l %s", tname) == 1) - { + } else if (sscanf(buf, "l %s", tname) == 1) { load_term(); - } - else if (sscanf(buf, "d %s", capname) == 1) - { - struct name_table_entry const *np = _nc_find_entry(capname, - _nc_info_hash_table); + } else if (sscanf(buf, "d %s", capname) == 1) { + struct name_table_entry const *np = _nc_find_entry(capname, + _nc_info_hash_table); if (np == NULL) (void) printf("No such capability as \"%s\"\n", capname); - else - { - switch(np->nte_type) - { + else { + switch (np->nte_type) { case BOOLEAN: cur_term->type.Booleans[np->nte_index] = FALSE; - (void) printf("Boolean capability `%s' (%d) turned off.\n", - np->nte_name, np->nte_index); + (void) + printf("Boolean capability `%s' (%d) turned off.\n", + np->nte_name, np->nte_index); break; case NUMBER: - cur_term->type.Numbers[np->nte_index] = -1; + cur_term->type.Numbers[np->nte_index] = ABSENT_NUMERIC; (void) printf("Number capability `%s' (%d) set to -1.\n", - np->nte_name, np->nte_index); + np->nte_name, np->nte_index); break; case STRING: - cur_term->type.Strings[np->nte_index] = (char *)NULL; + cur_term->type.Strings[np->nte_index] = ABSENT_STRING; (void) printf("String capability `%s' (%d) deleted.\n", - np->nte_name, np->nte_index); + np->nte_name, np->nte_index); break; } } - } - else if (buf[0] == 'i') - { - dump_init((char *)NULL, F_TERMINFO, S_TERMINFO, 70, 0, FALSE); - dump_entry(&cur_term->type, FALSE, TRUE, 0); - putchar('\n'); - } - else if (buf[0] == 'o') - { - if (_nc_optimize_enable & OPTIMIZE_MVCUR) - { - _nc_optimize_enable &=~ OPTIMIZE_MVCUR; - (void) puts("Optimization is now off."); - } - else - { - _nc_optimize_enable |= OPTIMIZE_MVCUR; - (void) puts("Optimization is now on."); - } + } else if (buf[0] == 'i') { + dump_init((char *) NULL, F_TERMINFO, S_TERMINFO, 70, 0, FALSE); + dump_entry(&cur_term->type, FALSE, TRUE, 0); + putchar('\n'); + } else if (buf[0] == 'o') { + if (_nc_optimize_enable & OPTIMIZE_MVCUR) { + _nc_optimize_enable &= ~OPTIMIZE_MVCUR; + (void) puts("Optimization is now off."); + } else { + _nc_optimize_enable |= OPTIMIZE_MVCUR; + (void) puts("Optimization is now on."); + } } /* * You can use the `t' test to profile and tune the movement @@ -1142,16 +1109,15 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) * modes. As long as the optimized times are less, the optimizer * is winning. */ - else if (sscanf(buf, "t %d", &n) == 1) - { + else if (sscanf(buf, "t %d", &n) == 1) { float cumtime = 0, perchar; - int speeds[] = {2400, 9600, 14400, 19200, 28800, 38400, 0}; + int speeds[] = + {2400, 9600, 14400, 19200, 28800, 38400, 0}; - srand((unsigned)(getpid() + time((time_t *)0))); + srand((unsigned) (getpid() + time((time_t *) 0))); profiling = TRUE; xmits = 0; - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { /* * This does a move test between two random locations, * Random moves probably short-change the optimizer, @@ -1182,10 +1148,9 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) perchar = cumtime / n; (void) printf("%d moves (%ld chars) in %d msec, %f msec each:\n", - n, xmits, (int)cumtime, perchar); + n, xmits, (int) cumtime, perchar); - for (i = 0; speeds[i]; i++) - { + for (i = 0; speeds[i]; i++) { /* * Total estimated time for the moves, computation and * transmission both. Transmission time is an estimate @@ -1200,12 +1165,11 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) */ float overhead = speeds[i] * perchar / 1e6; - (void) printf("%6d bps: %3.2f char-xmits overhead; total estimated time %15.2f\n", - speeds[i], overhead, totalest); + (void) + printf("%6d bps: %3.2f char-xmits overhead; total estimated time %15.2f\n", + speeds[i], overhead, totalest); } - } - else if (buf[0] == 'c') - { + } else if (buf[0] == 'c') { (void) printf("char padding: %d\n", SP->_char_padding); (void) printf("cr cost: %d\n", SP->_cr_cost); (void) printf("cup cost: %d\n", SP->_cup_cost); @@ -1225,8 +1189,7 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) (void) printf("cuu cost: %d\n", SP->_cuu_cost); (void) printf("hpa cost: %d\n", SP->_hpa_cost); (void) printf("vpa cost: %d\n", SP->_vpa_cost); - } - else if (buf[0] == 'x' || buf[0] == 'q') + } else if (buf[0] == 'x' || buf[0] == 'q') break; else (void) puts("Invalid command."); @@ -1236,7 +1199,7 @@ int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) _nc_mvcur_wrap(); putchar('\n'); - return(0); + return (0); } #endif /* MAIN */ diff --git a/contrib/ncurses/ncurses/tty/lib_tstp.c b/contrib/ncurses/ncurses/tty/lib_tstp.c index 6fb912cf5096..d01a62f71487 100644 --- a/contrib/ncurses/ncurses/tty/lib_tstp.c +++ b/contrib/ncurses/ncurses/tty/lib_tstp.c @@ -48,7 +48,7 @@ #define _POSIX_SOURCE #endif -MODULE_ID("$Id: lib_tstp.c,v 1.20 1999/10/22 23:11:09 tom Exp $") +MODULE_ID("$Id: lib_tstp.c,v 1.21 2000/05/20 23:28:56 tom Exp $") #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC) #define USE_SIGTSTP 1 @@ -226,6 +226,7 @@ static void cleanup(int sig) && SP->_ofp != 0 && isatty(fileno(SP->_ofp))) { SP->_cleanup = TRUE; + SP->_outch = _nc_outch; } set_term(scan); endwin(); diff --git a/contrib/ncurses/ncurses/tty/lib_twait.c b/contrib/ncurses/ncurses/tty/lib_twait.c index f095c9b53c0c..a21e2a16db0f 100644 --- a/contrib/ncurses/ncurses/tty/lib_twait.c +++ b/contrib/ncurses/ncurses/tty/lib_twait.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -47,8 +47,6 @@ #include <curses.priv.h> #if USE_FUNC_POLL -# include <stropts.h> -# include <poll.h> # if HAVE_SYS_TIME_H # include <sys/time.h> # endif @@ -61,7 +59,7 @@ # endif #endif -MODULE_ID("$Id: lib_twait.c,v 1.34 1999/10/16 21:25:10 tom Exp $") +MODULE_ID("$Id: lib_twait.c,v 1.37 2000/06/29 23:03:09 tom Exp $") static long _nc_gettime(bool first) { @@ -243,7 +241,6 @@ retry: if ((mode & (1 << count)) && (fds[count].revents & POLLIN)) { result |= (1 << count); - count++; } } #elif defined(__BEOS__) diff --git a/contrib/ncurses/ncurses/tty/lib_vidattr.c b/contrib/ncurses/ncurses/tty/lib_vidattr.c index 20cc2b138011..7cff22ec4b43 100644 --- a/contrib/ncurses/ncurses/tty/lib_vidattr.c +++ b/contrib/ncurses/ncurses/tty/lib_vidattr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -64,7 +64,7 @@ #include <curses.priv.h> #include <term.h> -MODULE_ID("$Id: lib_vidattr.c,v 1.23 1999/06/12 21:20:41 tom Exp $") +MODULE_ID("$Id: lib_vidattr.c,v 1.27 2000/04/29 23:25:27 tom Exp $") #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) @@ -76,203 +76,218 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.23 1999/06/12 21:20:41 tom Exp $") /* if there is no current screen, assume we *can* do color */ #define SetColorsIf(why,old_attr) \ - if ((!SP || SP->_coloron) && (why)) { \ + if (can_color && (why)) { \ int old_pair = PAIR_NUMBER(old_attr); \ T(("old pair = %d -- new pair = %d", old_pair, pair)); \ if ((pair != old_pair) \ + || (fix_pair0 && (pair == 0)) \ || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \ - _nc_do_color(pair, reverse, outc); \ + _nc_do_color(old_pair, pair, reverse, outc); \ } \ } -int vidputs(attr_t newmode, int (*outc)(int)) +int +vidputs(attr_t newmode, int (*outc) (int)) { -static attr_t previous_attr = A_NORMAL; -attr_t turn_on, turn_off; -int pair; -bool reverse = FALSE; -bool used_ncv = FALSE; + static attr_t previous_attr = A_NORMAL; + attr_t turn_on, turn_off; + int pair; + bool reverse = FALSE; + bool used_ncv = FALSE; + bool can_color = (SP == 0 || SP->_coloron); +#ifdef NCURSES_EXT_FUNCS + bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color); +#else +#define fix_pair0 FALSE +#endif - T((T_CALLED("vidputs(%s)"), _traceattr(newmode))); + T((T_CALLED("vidputs(%s)"), _traceattr(newmode))); - /* this allows us to go on whether or not newterm() has been called */ - if (SP) - previous_attr = SP->_current_attr; + /* this allows us to go on whether or not newterm() has been called */ + if (SP) + previous_attr = SP->_current_attr; - T(("previous attribute was %s", _traceattr(previous_attr))); + T(("previous attribute was %s", _traceattr(previous_attr))); #if !USE_XMC_SUPPORT - if ((SP != 0) - && (magic_cookie_glitch > 0)) - newmode &= ~(SP->_xmc_suppress); + if ((SP != 0) + && (magic_cookie_glitch > 0)) + newmode &= ~(SP->_xmc_suppress); #endif - /* - * If we have a terminal that cannot combine color with video - * attributes, use the colors in preference. - */ - if ((newmode & A_COLOR) - && (no_color_video > 0)) { - static const struct { - attr_t video; - unsigned bit; - } table[] = { - { A_STANDOUT, 1 }, - { A_UNDERLINE, 2 }, - { A_REVERSE, 4 }, - { A_BLINK, 8 }, - { A_DIM, 16 }, - { A_BOLD, 32 }, - { A_INVIS, 64 }, - { A_PROTECT, 128 }, - { A_ALTCHARSET, 256 }, - }; - size_t n; - for (n = 0; n < SIZEOF(table); n++) { - if ((table[n].bit & no_color_video) - && (table[n].video & newmode)) { - used_ncv = TRUE; - if (table[n].video == A_REVERSE) - reverse = TRUE; - else - newmode &= ~table[n].video; - } - } + /* + * If we have a terminal that cannot combine color with video + * attributes, use the colors in preference. + */ + if (((newmode & A_COLOR) != 0 + || fix_pair0) + && (no_color_video > 0)) { + /* *INDENT-OFF* */ + static const struct { + attr_t video; + unsigned bit; + } table[] = { + { A_STANDOUT, 1 }, + { A_UNDERLINE, 2 }, + { A_REVERSE, 4 }, + { A_BLINK, 8 }, + { A_DIM, 16 }, + { A_BOLD, 32 }, + { A_INVIS, 64 }, + { A_PROTECT, 128 }, + { A_ALTCHARSET, 256 }, + }; + /* *INDENT-ON* */ + + size_t n; + for (n = 0; n < SIZEOF(table); n++) { + if ((table[n].bit & no_color_video) + && (table[n].video & newmode)) { + used_ncv = TRUE; + if (table[n].video == A_REVERSE) + reverse = TRUE; + else + newmode &= ~table[n].video; + } } + } + + if (newmode == previous_attr) + returnCode(OK); + + pair = PAIR_NUMBER(newmode); - if (newmode == previous_attr) - returnCode(OK); + if (reverse) { + newmode &= ~A_REVERSE; + } - pair = PAIR_NUMBER(newmode); + turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR; + turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR; - if (reverse) { - newmode &= ~A_REVERSE; + SetColorsIf(((pair == 0) && !fix_pair0), previous_attr); + + if (newmode == A_NORMAL) { + if ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) { + doPut(exit_alt_charset_mode); + previous_attr &= ~A_ALTCHARSET; + } + if (previous_attr) { + doPut(exit_attribute_mode); + previous_attr &= ~A_COLOR; } - turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR; - turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR; - - SetColorsIf(pair == 0, previous_attr); - - if (newmode == A_NORMAL) { - if((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) { - doPut(exit_alt_charset_mode); - previous_attr &= ~A_ALTCHARSET; - } - if (previous_attr) { - doPut(exit_attribute_mode); - previous_attr &= ~A_COLOR; - } - - SetColorsIf(pair != 0, previous_attr); - } else if (set_attributes && !used_ncv) { - if (turn_on || turn_off) { - TPUTS_TRACE("set_attributes"); - tputs(tparm(set_attributes, - (newmode & A_STANDOUT) != 0, - (newmode & A_UNDERLINE) != 0, - (newmode & A_REVERSE) != 0, - (newmode & A_BLINK) != 0, - (newmode & A_DIM) != 0, - (newmode & A_BOLD) != 0, - (newmode & A_INVIS) != 0, - (newmode & A_PROTECT) != 0, - (newmode & A_ALTCHARSET) != 0), 1, outc); - previous_attr &= ~A_COLOR; - } - SetColorsIf(pair != 0, previous_attr); - } else { - - T(("turning %s off", _traceattr(turn_off))); - - TurnOff(A_ALTCHARSET, exit_alt_charset_mode); - - if (!SP || SP->_use_rmul) { - TurnOff(A_UNDERLINE, exit_underline_mode); - } - - if (!SP || SP->_use_rmso) { - TurnOff(A_STANDOUT, exit_standout_mode); - } - - if (turn_off && exit_attribute_mode) { - doPut(exit_attribute_mode); - turn_on |= (newmode & (chtype)(~A_COLOR)); - previous_attr &= ~A_COLOR; - } - SetColorsIf(pair != 0, previous_attr); - - T(("turning %s on", _traceattr(turn_on))); - - TurnOn (A_ALTCHARSET, enter_alt_charset_mode); - TurnOn (A_BLINK, enter_blink_mode); - TurnOn (A_BOLD, enter_bold_mode); - TurnOn (A_DIM, enter_dim_mode); - TurnOn (A_REVERSE, enter_reverse_mode); - TurnOn (A_STANDOUT, enter_standout_mode); - TurnOn (A_PROTECT, enter_protected_mode); - TurnOn (A_INVIS, enter_secure_mode); - TurnOn (A_UNDERLINE, enter_underline_mode); - TurnOn (A_HORIZONTAL, enter_horizontal_hl_mode); - TurnOn (A_LEFT, enter_left_hl_mode); - TurnOn (A_LOW, enter_low_hl_mode); - TurnOn (A_RIGHT, enter_right_hl_mode); - TurnOn (A_TOP, enter_top_hl_mode); - TurnOn (A_VERTICAL, enter_vertical_hl_mode); + SetColorsIf((pair != 0) || fix_pair0, previous_attr); + } else if (set_attributes && !used_ncv) { + if (turn_on || turn_off) { + TPUTS_TRACE("set_attributes"); + tputs(tparm(set_attributes, + (newmode & A_STANDOUT) != 0, + (newmode & A_UNDERLINE) != 0, + (newmode & A_REVERSE) != 0, + (newmode & A_BLINK) != 0, + (newmode & A_DIM) != 0, + (newmode & A_BOLD) != 0, + (newmode & A_INVIS) != 0, + (newmode & A_PROTECT) != 0, + (newmode & A_ALTCHARSET) != 0), 1, outc); + previous_attr &= ~A_COLOR; } + SetColorsIf((pair != 0) || fix_pair0, previous_attr); + } else { - if (reverse) - newmode |= A_REVERSE; + T(("turning %s off", _traceattr(turn_off))); - if (SP) - SP->_current_attr = newmode; - else - previous_attr = newmode; + TurnOff(A_ALTCHARSET, exit_alt_charset_mode); - returnCode(OK); + if (!SP || SP->_use_rmul) { + TurnOff(A_UNDERLINE, exit_underline_mode); + } + + if (!SP || SP->_use_rmso) { + TurnOff(A_STANDOUT, exit_standout_mode); + } + + if (turn_off && exit_attribute_mode) { + doPut(exit_attribute_mode); + turn_on |= (newmode & (chtype) (~A_COLOR)); + previous_attr &= ~A_COLOR; + } + SetColorsIf((pair != 0) || fix_pair0, previous_attr); + + T(("turning %s on", _traceattr(turn_on))); + /* *INDENT-OFF* */ + TurnOn(A_ALTCHARSET, enter_alt_charset_mode); + TurnOn(A_BLINK, enter_blink_mode); + TurnOn(A_BOLD, enter_bold_mode); + TurnOn(A_DIM, enter_dim_mode); + TurnOn(A_REVERSE, enter_reverse_mode); + TurnOn(A_STANDOUT, enter_standout_mode); + TurnOn(A_PROTECT, enter_protected_mode); + TurnOn(A_INVIS, enter_secure_mode); + TurnOn(A_UNDERLINE, enter_underline_mode); + TurnOn(A_HORIZONTAL, enter_horizontal_hl_mode); + TurnOn(A_LEFT, enter_left_hl_mode); + TurnOn(A_LOW, enter_low_hl_mode); + TurnOn(A_RIGHT, enter_right_hl_mode); + TurnOn(A_TOP, enter_top_hl_mode); + TurnOn(A_VERTICAL, enter_vertical_hl_mode); + /* *INDENT-ON* */ + + } + + if (reverse) + newmode |= A_REVERSE; + + if (SP) + SP->_current_attr = newmode; + else + previous_attr = newmode; + + returnCode(OK); } -int vidattr(attr_t newmode) +int +vidattr(attr_t newmode) { - T((T_CALLED("vidattr(%s)"), _traceattr(newmode))); + T((T_CALLED("vidattr(%s)"), _traceattr(newmode))); - returnCode(vidputs(newmode, _nc_outch)); + returnCode(vidputs(newmode, _nc_outch)); } -chtype termattrs(void) +chtype +termattrs(void) { - chtype attrs = A_NORMAL; + chtype attrs = A_NORMAL; - if (enter_alt_charset_mode) - attrs |= A_ALTCHARSET; + if (enter_alt_charset_mode) + attrs |= A_ALTCHARSET; - if (enter_blink_mode) - attrs |= A_BLINK; + if (enter_blink_mode) + attrs |= A_BLINK; - if (enter_bold_mode) - attrs |= A_BOLD; + if (enter_bold_mode) + attrs |= A_BOLD; - if (enter_dim_mode) - attrs |= A_DIM; + if (enter_dim_mode) + attrs |= A_DIM; - if (enter_reverse_mode) - attrs |= A_REVERSE; + if (enter_reverse_mode) + attrs |= A_REVERSE; - if (enter_standout_mode) - attrs |= A_STANDOUT; + if (enter_standout_mode) + attrs |= A_STANDOUT; - if (enter_protected_mode) - attrs |= A_PROTECT; + if (enter_protected_mode) + attrs |= A_PROTECT; - if (enter_secure_mode) - attrs |= A_INVIS; + if (enter_secure_mode) + attrs |= A_INVIS; - if (enter_underline_mode) - attrs |= A_UNDERLINE; + if (enter_underline_mode) + attrs |= A_UNDERLINE; - if (SP->_coloron) - attrs |= A_COLOR; + if (SP->_coloron) + attrs |= A_COLOR; - return(attrs); + return (attrs); } - diff --git a/contrib/ncurses/ncurses/tty/tty_display.h b/contrib/ncurses/ncurses/tty/tty_display.h index 1bc0d2d9dc42..e7b447d8045d 100644 --- a/contrib/ncurses/ncurses/tty/tty_display.h +++ b/contrib/ncurses/ncurses/tty/tty_display.h @@ -132,15 +132,6 @@ struct tty_display_data { vidattr(AttrOf(c)); #endif -/* - * Check whether the given character can be output by clearing commands. This - * includes test for being a space and not including any 'bad' attributes, such - * as A_REVERSE. All attribute flags which don't affect appearance of a space - * or can be output by clearing (A_COLOR in case of bce-terminal) are excluded. - */ -#define can_clear_with(ch) \ - ((ch & ~(NONBLANK_ATTR|(back_color_erase ? A_COLOR:0))) == BLANK) - #define XMC_CHANGES(c) ((c) & D->_xmc_suppress) #endif /* TTY_DISPLAY_H */ diff --git a/contrib/ncurses/ncurses/tty/tty_update.c b/contrib/ncurses/ncurses/tty/tty_update.c index a5a640f8663c..b8670cd15f1d 100644 --- a/contrib/ncurses/ncurses/tty/tty_update.c +++ b/contrib/ncurses/ncurses/tty/tty_update.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -31,7 +31,6 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ - /*----------------------------------------------------------------- * * lib_doupdate.c @@ -63,8 +62,6 @@ #endif #if USE_FUNC_POLL -#include <stropts.h> -#include <poll.h> #elif HAVE_SELECT #if HAVE_SYS_SELECT_H #include <sys/select.h> @@ -73,7 +70,7 @@ #include <term.h> -MODULE_ID("$Id: tty_update.c,v 1.117 1999/10/22 23:28:46 tom Exp $") +MODULE_ID("$Id: tty_update.c,v 1.139 2000/06/24 23:45:17 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a @@ -86,6 +83,8 @@ MODULE_ID("$Id: tty_update.c,v 1.117 1999/10/22 23:28:46 tom Exp $") */ #define CHECK_INTERVAL 5 +#define FILL_BCE() (SP->_coloron && !SP->_default_color && !back_color_erase) + /* * Enable checking to see if doupdate and friends are tracking the true * cursor position correctly. NOTE: this is a debugging hack which will @@ -93,13 +92,13 @@ MODULE_ID("$Id: tty_update.c,v 1.117 1999/10/22 23:28:46 tom Exp $") */ /* #define POSITION_DEBUG */ -static inline chtype ClrBlank ( WINDOW *win ); +static inline chtype ClrBlank(WINDOW *win); static int ClrBottom(int total); -static void ClearScreen( chtype blank ); -static void ClrUpdate( void ); -static void DelChar( int count ); -static void InsStr( chtype *line, int count ); -static void TransformLine( int const lineno ); +static void ClearScreen(chtype blank); +static void ClrUpdate(void); +static void DelChar(int count); +static void InsStr(chtype * line, int count); +static void TransformLine(int const lineno); #ifdef POSITION_DEBUG /**************************************************************************** @@ -108,19 +107,20 @@ static void TransformLine( int const lineno ); * ****************************************************************************/ -static void position_check(int expected_y, int expected_x, char *legend) +static void +position_check(int expected_y, int expected_x, char *legend) /* check to see if the real cursor position matches the virtual */ { - char buf[20]; + char buf[20]; int y, x; if (!_nc_tracing || (expected_y < 0 && expected_x < 0)) return; memset(buf, '\0', sizeof(buf)); - putp("\033[6n"); /* only works on ANSI-compatibles */ + putp("\033[6n"); /* only works on ANSI-compatibles */ _nc_flush(); - (void) read(0, buf, sizeof(buf)-1); + (void) read(0, buf, sizeof(buf) - 1); _tracef("probe returned %s", _nc_visbuf(buf)); /* try to interpret as a position report */ @@ -134,14 +134,14 @@ static void position_check(int expected_y, int expected_x, char *legend) if (y - 1 != expected_y || x - 1 != expected_x) { beep(); _tracef("position seen (%d, %d) doesn't match expected one (%d, %d) in %s", - y-1, x-1, expected_y, expected_x, legend); + y - 1, x - 1, expected_y, expected_x, legend); } else { _tracef("position matches OK in %s", legend); } } } #else -#define position_check(expected_y, expected_x, legend) /* nothing */ +#define position_check(expected_y, expected_x, legend) /* nothing */ #endif /* POSITION_DEBUG */ /**************************************************************************** @@ -150,115 +150,118 @@ static void position_check(int expected_y, int expected_x, char *legend) * ****************************************************************************/ -static inline void GoTo(int const row, int const col) +static inline void +GoTo(int const row, int const col) { - chtype oldattr = SP->_current_attr; + chtype oldattr = SP->_current_attr; - TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)", - row, col, SP->_cursrow, SP->_curscol)); + TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)", + row, col, SP->_cursrow, SP->_curscol)); - position_check(SP->_cursrow, SP->_curscol, "GoTo"); + position_check(SP->_cursrow, SP->_curscol, "GoTo"); - /* - * Force restore even if msgr is on when we're in an alternate - * character set -- these have a strong tendency to screw up the - * CR & LF used for local character motions! - */ - if ((oldattr & A_ALTCHARSET) - || (oldattr && !move_standout_mode)) - { - TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move", - oldattr, _traceattr(oldattr))); - vidattr(A_NORMAL); - } + /* + * Force restore even if msgr is on when we're in an alternate + * character set -- these have a strong tendency to screw up the + * CR & LF used for local character motions! + */ + if ((oldattr & A_ALTCHARSET) + || (oldattr && !move_standout_mode)) { + TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move", + oldattr, _traceattr(oldattr))); + vidattr(A_NORMAL); + } - mvcur(SP->_cursrow, SP->_curscol, row, col); - SP->_cursrow = row; - SP->_curscol = col; - position_check(SP->_cursrow, SP->_curscol, "GoTo2"); + mvcur(SP->_cursrow, SP->_curscol, row, col); + SP->_cursrow = row; + SP->_curscol = col; + position_check(SP->_cursrow, SP->_curscol, "GoTo2"); } -static inline void PutAttrChar(chtype ch) +static inline void +PutAttrChar(chtype ch) { - if (tilde_glitch && (TextOf(ch) == '~')) - ch = ('`' | AttrOf(ch)); - - TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)", - _tracechtype(ch), - SP->_cursrow, SP->_curscol)); - UpdateAttrs(ch); - if (SP->_cleanup) { - _nc_outch((int)TextOf(ch)); - } else { - putc((int)TextOf(ch), SP->_ofp); /* macro's fastest... */ + int data; + + if (tilde_glitch && (TextOf(ch) == '~')) + ch = ('`' | AttrOf(ch)); + + TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)", + _tracechtype(ch), + SP->_cursrow, SP->_curscol)); + UpdateAttrs(ch); + data = TextOf(ch); + if (SP->_outch != 0) { + SP->_outch(data); + } else { + putc(data, SP->_ofp); /* macro's fastest... */ #ifdef TRACE - _nc_outchars++; + _nc_outchars++; #endif /* TRACE */ - } - SP->_curscol++; - if (char_padding) { - TPUTS_TRACE("char_padding"); - putp(char_padding); - } + } + SP->_curscol++; + if (char_padding) { + TPUTS_TRACE("char_padding"); + putp(char_padding); + } } -static bool check_pending(void) +static bool +check_pending(void) /* check for pending input */ { - bool have_pending = FALSE; + bool have_pending = FALSE; - /* - * Only carry out this check when the flag is zero, otherwise we'll - * have the refreshing slow down drastically (or stop) if there's an - * unread character available. - */ - if(SP->_fifohold != 0) - return FALSE; + /* + * Only carry out this check when the flag is zero, otherwise we'll + * have the refreshing slow down drastically (or stop) if there's an + * unread character available. + */ + if (SP->_fifohold != 0) + return FALSE; - if (SP->_checkfd >= 0) { + if (SP->_checkfd >= 0) { #if USE_FUNC_POLL - struct pollfd fds[1]; - fds[0].fd = SP->_checkfd; - fds[0].events = POLLIN; - if (poll(fds, 1, 0) > 0) - { - have_pending = TRUE; - } + struct pollfd fds[1]; + fds[0].fd = SP->_checkfd; + fds[0].events = POLLIN; + if (poll(fds, 1, 0) > 0) { + have_pending = TRUE; + } #elif defined(__BEOS__) - /* - * BeOS's select() is declared in socket.h, so the configure script does - * not see it. That's just as well, since that function works only for - * sockets. This (using snooze and ioctl) was distilled from Be's patch - * for ncurses which uses a separate thread to simulate select(). - * - * FIXME: the return values from the ioctl aren't very clear if we get - * interrupted. - */ - int n = 0; - int howmany = ioctl(0, 'ichr', &n); - if (howmany >= 0 && n > 0) { - have_pending = TRUE; - } + /* + * BeOS's select() is declared in socket.h, so the configure script does + * not see it. That's just as well, since that function works only for + * sockets. This (using snooze and ioctl) was distilled from Be's patch + * for ncurses which uses a separate thread to simulate select(). + * + * FIXME: the return values from the ioctl aren't very clear if we get + * interrupted. + */ + int n = 0; + int howmany = ioctl(0, 'ichr', &n); + if (howmany >= 0 && n > 0) { + have_pending = TRUE; + } #elif HAVE_SELECT - fd_set fdset; - struct timeval ktimeout; + fd_set fdset; + struct timeval ktimeout; - ktimeout.tv_sec = - ktimeout.tv_usec = 0; + ktimeout.tv_sec = + ktimeout.tv_usec = 0; - FD_ZERO(&fdset); - FD_SET(SP->_checkfd, &fdset); - if (select(SP->_checkfd+1, &fdset, NULL, NULL, &ktimeout) != 0) - { - have_pending = TRUE; - } -#endif - } - if (have_pending) { - SP->_fifohold = 5; - _nc_flush(); + FD_ZERO(&fdset); + FD_SET(SP->_checkfd, &fdset); + if (select(SP->_checkfd + 1, &fdset, NULL, NULL, &ktimeout) != 0) { + have_pending = TRUE; } - return FALSE; +#endif + } + if (have_pending) { + SP->_fifohold = 5; + _nc_flush(); + } + return FALSE; } /* @@ -274,15 +277,13 @@ static void callPutChar(chtype const); static inline void PutChar(chtype const ch); /* forward declaration */ /* put char at lower right corner */ -static void PutCharLR(chtype const ch) +static void +PutCharLR(chtype const ch) { - if (!auto_right_margin) - { + if (!auto_right_margin) { /* we can put the char directly */ PutAttrChar(ch); - } - else if (enter_am_mode && exit_am_mode) - { + } else if (enter_am_mode && exit_am_mode) { /* we can suppress automargin */ TPUTS_TRACE("exit_am_mode"); putp(exit_am_mode); @@ -293,21 +294,19 @@ static void PutCharLR(chtype const ch) TPUTS_TRACE("enter_am_mode"); putp(enter_am_mode); - } - else if ((enter_insert_mode && exit_insert_mode) - || insert_character || parm_ich) - { - GoTo(screen_lines-1,screen_columns-2); + } else if ((enter_insert_mode && exit_insert_mode) + || insert_character || parm_ich) { + GoTo(screen_lines - 1, screen_columns - 2); callPutChar(ch); - GoTo(screen_lines-1,screen_columns-2); - InsStr(newscr->_line[screen_lines-1].text+screen_columns-2,1); + GoTo(screen_lines - 1, screen_columns - 2); + InsStr(newscr->_line[screen_lines - 1].text + screen_columns - 2, 1); } } -static void wrap_cursor(void) +static void +wrap_cursor(void) { - if (eat_newline_glitch) - { + if (eat_newline_glitch) { /* * xenl can manifest two different ways. The vt100 * way is that, when you'd expect the cursor to wrap, @@ -326,23 +325,20 @@ static void wrap_cursor(void) */ SP->_curscol = -1; SP->_cursrow = -1; - } - else if (auto_right_margin) - { + } else if (auto_right_margin) { SP->_curscol = 0; SP->_cursrow++; - } - else - { + } else { SP->_curscol--; } position_check(SP->_cursrow, SP->_curscol, "wrap_cursor"); } -static inline void PutChar(chtype const ch) +static inline void +PutChar(chtype const ch) /* insert character, handling automargin stuff */ { - if (SP->_cursrow == screen_lines-1 && SP->_curscol == screen_columns-1) + if (SP->_cursrow == screen_lines - 1 && SP->_curscol == screen_columns - 1) PutCharLR(ch); else PutAttrChar(ch); @@ -354,6 +350,28 @@ static inline void PutChar(chtype const ch) } /* + * Check whether the given character can be output by clearing commands. This + * includes test for being a space and not including any 'bad' attributes, such + * as A_REVERSE. All attribute flags which don't affect appearance of a space + * or can be output by clearing (A_COLOR in case of bce-terminal) are excluded. + */ +static inline bool +can_clear_with(chtype ch) +{ + if (!back_color_erase && SP->_coloron) { + if (ch & A_COLOR) + return FALSE; +#ifdef NCURSES_EXT_FUNCS + if (!SP->_default_color) + return FALSE; + if (SP->_default_fg != C_MASK || SP->_default_bg != C_MASK) + return FALSE; +#endif + } + return ((ch & ~(NONBLANK_ATTR | A_COLOR)) == BLANK); +} + +/* * Issue a given span of characters from an array. * Must be functionally equivalent to: * for (i = 0; i < num; i++) @@ -365,26 +383,23 @@ static inline void PutChar(chtype const ch) * * This code is optimized using ech and rep. */ -static int EmitRange(const chtype *ntext, int num) +static int +EmitRange(const chtype * ntext, int num) { - int i; + int i; - if (erase_chars || repeat_char) - { - while (num > 0) - { - int runcount; + if (erase_chars || repeat_char) { + while (num > 0) { + int runcount; chtype ntext0; - while (num>1 && ntext[0]!=ntext[1]) - { + while (num > 1 && ntext[0] != ntext[1]) { PutChar(ntext[0]); ntext++; num--; } ntext0 = ntext[0]; - if (num==1) - { + if (num == 1) { PutChar(ntext0); return 0; } @@ -395,16 +410,15 @@ static int EmitRange(const chtype *ntext, int num) /* * The cost expression in the middle isn't exactly right. - * _cup_cost is an upper bound on the cost for moving to the + * _cup_ch_cost is an upper bound on the cost for moving to the * end of the erased area, but not the cost itself (which we * can't compute without emitting the move). This may result * in erase_chars not getting used in some situations for * which it would be marginally advantageous. */ if (erase_chars - && runcount > SP->_ech_cost + SP->_cup_cost - && can_clear_with(ntext0)) - { + && runcount > SP->_ech_cost + SP->_cup_ch_cost + && can_clear_with(ntext0)) { UpdateAttrs(ntext0); putp(tparm(erase_chars, runcount)); @@ -417,9 +431,7 @@ static int EmitRange(const chtype *ntext, int num) GoTo(SP->_cursrow, SP->_curscol + runcount); else return 1; /* cursor stays in the middle */ - } - else if (repeat_char && runcount > SP->_rep_cost) - { + } else if (repeat_char && runcount > SP->_rep_cost) { bool wrap_possible = (SP->_curscol + runcount >= screen_columns); int rep_count = runcount; @@ -432,9 +444,7 @@ static int EmitRange(const chtype *ntext, int num) if (wrap_possible) PutChar(ntext0); - } - else - { + } else { for (i = 0; i < runcount; i++) PutChar(ntext[i]); } @@ -457,345 +467,333 @@ static int EmitRange(const chtype *ntext, int num) * * Returns: same as EmitRange */ -static int PutRange( - const chtype *otext, - const chtype *ntext, - int row, - int first, int last) +static int +PutRange( + const chtype * otext, + const chtype * ntext, + int row, + int first, int last) { - int j, run; - int cost = min(SP->_cup_ch_cost, SP->_hpa_ch_cost); - - TR(TRACE_CHARPUT, ("PutRange(%p, %p, %d, %d, %d)", - otext, ntext, row, first, last)); - - if (otext != ntext - && (last-first+1) > cost) { - for (j = first, run = 0; j <= last; j++) { - if (otext[j] == ntext[j]) { - run++; - } else { - if (run > cost) { - int before_run = (j - run); - EmitRange(ntext+first, before_run-first); - GoTo(row, first = j); - } - run = 0; - } + int j, run; + + TR(TRACE_CHARPUT, ("PutRange(%p, %p, %d, %d, %d)", + otext, ntext, row, first, last)); + + if (otext != ntext + && (last - first + 1) > SP->_inline_cost) { + for (j = first, run = 0; j <= last; j++) { + if (otext[j] == ntext[j]) { + run++; + } else { + if (run > SP->_inline_cost) { + int before_run = (j - run); + EmitRange(ntext + first, before_run - first); + GoTo(row, first = j); } + run = 0; + } } - return EmitRange(ntext + first, last-first+1); + } + return EmitRange(ntext + first, last - first + 1); } #if CC_HAS_INLINE_FUNCS -static void callPutChar(chtype const ch) +static void +callPutChar(chtype const ch) { - PutChar(ch); + PutChar(ch); } #endif +/* leave unbracketed here so 'indent' works */ #define MARK_NOCHANGE(win,row) \ - { \ win->_line[row].firstchar = _NOCHANGE; \ win->_line[row].lastchar = _NOCHANGE; \ - if_USE_SCROLL_HINTS(win->_line[row].oldindex = row); \ - } + if_USE_SCROLL_HINTS(win->_line[row].oldindex = row) -int doupdate(void) +int +doupdate(void) { -int i; -int nonempty; + int i; + int nonempty; #if USE_TRACE_TIMES -struct tms before, after; + struct tms before, after; #endif /* USE_TRACE_TIMES */ - T((T_CALLED("doupdate()"))); + T((T_CALLED("doupdate()"))); #ifdef TRACE - if (_nc_tracing & TRACE_UPDATE) - { - if (curscr->_clear) - _tracef("curscr is clear"); - else - _tracedump("curscr", curscr); - _tracedump("newscr", newscr); - } + if (_nc_tracing & TRACE_UPDATE) { + if (curscr->_clear) + _tracef("curscr is clear"); + else + _tracedump("curscr", curscr); + _tracedump("newscr", newscr); + } #endif /* TRACE */ - _nc_signal_handler(FALSE); + _nc_signal_handler(FALSE); - if (SP->_fifohold) - SP->_fifohold--; + if (SP->_fifohold) + SP->_fifohold--; #if USE_SIZECHANGE - if (SP->_endwin || SP->_sig_winch) - { - /* - * This is a transparent extension: XSI does not address it, - * and applications need not know that ncurses can do it. - * - * Check if the terminal size has changed while curses was off - * (this can happen in an xterm, for example), and resize the - * ncurses data structures accordingly. - */ - _nc_update_screensize(); - } + if (SP->_endwin || SP->_sig_winch) { + /* + * This is a transparent extension: XSI does not address it, + * and applications need not know that ncurses can do it. + * + * Check if the terminal size has changed while curses was off + * (this can happen in an xterm, for example), and resize the + * ncurses data structures accordingly. + */ + _nc_update_screensize(); + } #endif - if (SP->_endwin) { + if (SP->_endwin) { - T(("coming back from shell mode")); - reset_prog_mode(); + T(("coming back from shell mode")); + reset_prog_mode(); - _nc_mvcur_resume(); - _nc_screen_resume(); - SP->_mouse_resume(SP); - - SP->_endwin = FALSE; - } + _nc_mvcur_resume(); + _nc_screen_resume(); + SP->_mouse_resume(SP); + SP->_endwin = FALSE; + } #if USE_TRACE_TIMES - /* zero the metering machinery */ - _nc_outchars = 0; - (void) times(&before); + /* zero the metering machinery */ + _nc_outchars = 0; + (void) times(&before); #endif /* USE_TRACE_TIMES */ - /* - * This is the support for magic-cookie terminals. The - * theory: we scan the virtual screen looking for attribute - * turnons. Where we find one, check to make sure it's - * realizable by seeing if the required number of - * un-attributed blanks are present before and after the - * attributed range; try to shift the range boundaries over - * blanks (not changing the screen display) so this becomes - * true. If it is, shift the beginning attribute change - * appropriately (the end one, if we've gotten this far, is - * guaranteed room for its cookie). If not, nuke the added - * attributes out of the span. - */ + /* + * This is the support for magic-cookie terminals. The + * theory: we scan the virtual screen looking for attribute + * turnons. Where we find one, check to make sure it's + * realizable by seeing if the required number of + * un-attributed blanks are present before and after the + * attributed range; try to shift the range boundaries over + * blanks (not changing the screen display) so this becomes + * true. If it is, shift the beginning attribute change + * appropriately (the end one, if we've gotten this far, is + * guaranteed room for its cookie). If not, nuke the added + * attributes out of the span. + */ #if USE_XMC_SUPPORT - if (magic_cookie_glitch > 0) { - int j, k; - attr_t rattr = A_NORMAL; - - for (i = 0; i < screen_lines; i++) - for (j = 0; j < screen_columns; j++) - { - bool failed = FALSE; - chtype turnon = AttrOf(newscr->_line[i].text[j]) & ~rattr; - - /* is an attribute turned on here? */ - if (turnon == 0) { - rattr = AttrOf(newscr->_line[i].text[j]); - continue; - } + if (magic_cookie_glitch > 0) { + int j, k; + attr_t rattr = A_NORMAL; - T(("At (%d, %d): from %s...", i, j, _traceattr(rattr))); - T(("...to %s",_traceattr(turnon))); + for (i = 0; i < screen_lines; i++) { + for (j = 0; j < screen_columns; j++) { + bool failed = FALSE; + chtype turnon = AttrOf(newscr->_line[i].text[j]) & ~rattr; - /* - * If the attribute change location is a blank with a - * "safe" attribute, undo the attribute turnon. This may - * ensure there's enough room to set the attribute before - * the first non-blank in the run. - */ -#define SAFE(a) !((a) & (chtype)~NONBLANK_ATTR) - if (TextOf(newscr->_line[i].text[j])==' ' && SAFE(turnon)) - { - newscr->_line[i].text[j] &= ~turnon; - continue; - } + /* is an attribute turned on here? */ + if (turnon == 0) { + rattr = AttrOf(newscr->_line[i].text[j]); + continue; + } - /* check that there's enough room at start of span */ - for (k = 1; k <= magic_cookie_glitch; k++) - if (j-k < 0 - || TextOf(newscr->_line[i].text[j-k]) != ' ' - || !SAFE(AttrOf(newscr->_line[i].text[j-k]))) - failed = TRUE; - if (!failed) - { - bool end_onscreen = FALSE; - int m, n = j; - - /* find end of span, if it's onscreen */ - for (m = i; m < screen_lines; m++) - { - for ( ; n < screen_columns; n++) - { - if (AttrOf(newscr->_line[m].text[n]) == rattr) - { - end_onscreen = TRUE; - T(("Range attributed with %s ends at (%d, %d)", - _traceattr(turnon),m,n)); - goto foundit; - } - } - n = 0; - } - T(("Range attributed with %s ends offscreen", - _traceattr(turnon))); - foundit:; - - if (end_onscreen) - { - chtype *lastline = newscr->_line[m].text; - - /* - * If there are safely-attributed blanks at the - * end of the range, shorten the range. This will - * help ensure that there is enough room at end - * of span. - */ - while (n >= 0 - && TextOf(lastline[n]) == ' ' - && SAFE(AttrOf(lastline[n]))) - lastline[n--] &= ~turnon; - - /* check that there's enough room at end of span */ - for (k = 1; k <= magic_cookie_glitch; k++) - if (n + k >= screen_columns - || TextOf(lastline[n + k]) != ' ' - || !SAFE(AttrOf(lastline[n+k]))) - failed = TRUE; - } - } + T(("At (%d, %d): from %s...", i, j, _traceattr(rattr))); + T(("...to %s", _traceattr(turnon))); + + /* + * If the attribute change location is a blank with a + * "safe" attribute, undo the attribute turnon. This may + * ensure there's enough room to set the attribute before + * the first non-blank in the run. + */ +#define SAFE(a) (!((a) & (chtype)~NONBLANK_ATTR)) + if (TextOf(newscr->_line[i].text[j]) == ' ' && SAFE(turnon)) { + newscr->_line[i].text[j] &= ~turnon; + continue; + } - if (failed) - { - int p, q = j; - - T(("Clearing %s beginning at (%d, %d)", - _traceattr(turnon), i, j)); - - /* turn off new attributes over span */ - for (p = i; p < screen_lines; p++) - { - for ( ; q < screen_columns; q++) - { - if (AttrOf(newscr->_line[p].text[q]) == rattr) - goto foundend; - newscr->_line[p].text[q] &= ~turnon; + /* check that there's enough room at start of span */ + for (k = 1; k <= magic_cookie_glitch; k++) { + if (j - k < 0 + || TextOf(newscr->_line[i].text[j - k]) != ' ' + || !SAFE(AttrOf(newscr->_line[i].text[j - k]))) + failed = TRUE; + } + if (!failed) { + bool end_onscreen = FALSE; + int m, n = j; + + /* find end of span, if it's onscreen */ + for (m = i; m < screen_lines; m++) { + for (; n < screen_columns; n++) { + if (AttrOf(newscr->_line[m].text[n]) == rattr) { + end_onscreen = TRUE; + T(("Range attributed with %s ends at (%d, %d)", + _traceattr(turnon), m, n)); + goto foundit; } - q = 0; } - foundend:; + n = 0; } - else - { - T(("Cookie space for %s found before (%d, %d)", - _traceattr(turnon), i, j)); + T(("Range attributed with %s ends offscreen", + _traceattr(turnon))); + foundit:; + + if (end_onscreen) { + chtype *lastline = newscr->_line[m].text; /* - * back up the start of range so there's room - * for cookies before the first nonblank character + * If there are safely-attributed blanks at the + * end of the range, shorten the range. This will + * help ensure that there is enough room at end + * of span. */ + while (n >= 0 + && TextOf(lastline[n]) == ' ' + && SAFE(AttrOf(lastline[n]))) + lastline[n--] &= ~turnon; + + /* check that there's enough room at end of span */ for (k = 1; k <= magic_cookie_glitch; k++) - newscr->_line[i].text[j-k] |= turnon; + if (n + k >= screen_columns + || TextOf(lastline[n + k]) != ' ' + || !SAFE(AttrOf(lastline[n + k]))) + failed = TRUE; } + } - rattr = AttrOf(newscr->_line[i].text[j]); + if (failed) { + int p, q = j; + + T(("Clearing %s beginning at (%d, %d)", + _traceattr(turnon), i, j)); + + /* turn off new attributes over span */ + for (p = i; p < screen_lines; p++) { + for (; q < screen_columns; q++) { + if (AttrOf(newscr->_line[p].text[q]) == rattr) + goto foundend; + newscr->_line[p].text[q] &= ~turnon; + } + q = 0; + } + foundend:; + } else { + T(("Cookie space for %s found before (%d, %d)", + _traceattr(turnon), i, j)); + + /* + * back up the start of range so there's room + * for cookies before the first nonblank character + */ + for (k = 1; k <= magic_cookie_glitch; k++) + newscr->_line[i].text[j - k] |= turnon; } -#ifdef TRACE - /* show altered highlights after magic-cookie check */ - if (_nc_tracing & TRACE_UPDATE) - { - _tracef("After magic-cookie check..."); - _tracedump("newscr", newscr); + rattr = AttrOf(newscr->_line[i].text[j]); } -#endif /* TRACE */ } -#endif /* USE_XMC_SUPPORT */ - - nonempty = 0; - if (curscr->_clear || newscr->_clear) { /* force refresh ? */ - T(("clearing and updating from scratch")); - ClrUpdate(); - curscr->_clear = FALSE; /* reset flag */ - newscr->_clear = FALSE; /* reset flag */ - } else { - int changedlines = CHECK_INTERVAL; - if(check_pending()) - goto cleanup; +#ifdef TRACE + /* show altered highlights after magic-cookie check */ + if (_nc_tracing & TRACE_UPDATE) { + _tracef("After magic-cookie check..."); + _tracedump("newscr", newscr); + } +#endif /* TRACE */ + } +#endif /* USE_XMC_SUPPORT */ - nonempty = min(screen_lines, newscr->_maxy+1); + nonempty = 0; + if (curscr->_clear || newscr->_clear) { /* force refresh ? */ + T(("clearing and updating from scratch")); + ClrUpdate(); + curscr->_clear = FALSE; /* reset flag */ + newscr->_clear = FALSE; /* reset flag */ + } else { + int changedlines = CHECK_INTERVAL; - if (SP->_scrolling) { - _nc_scroll_optimize(); - } + if (check_pending()) + goto cleanup; - nonempty = ClrBottom(nonempty); + nonempty = min(screen_lines, newscr->_maxy + 1); - T(("Transforming lines, nonempty %d", nonempty)); - for (i = 0; i < nonempty; i++) { - /* - * Here is our line-breakout optimization. - */ - if (changedlines == CHECK_INTERVAL) - { - if (check_pending()) - goto cleanup; - changedlines = 0; - } + if (SP->_scrolling) { + _nc_scroll_optimize(); + } - /* - * newscr->line[i].firstchar is normally set - * by wnoutrefresh. curscr->line[i].firstchar - * is normally set by _nc_scroll_window in the - * vertical-movement optimization code, - */ - if (newscr->_line[i].firstchar != _NOCHANGE - || curscr->_line[i].firstchar != _NOCHANGE) - { - TransformLine(i); - changedlines++; - } + nonempty = ClrBottom(nonempty); - /* mark line changed successfully */ - if (i <= newscr->_maxy) - MARK_NOCHANGE(newscr,i) - if (i <= curscr->_maxy) - MARK_NOCHANGE(curscr,i) - } + T(("Transforming lines, nonempty %d", nonempty)); + for (i = 0; i < nonempty; i++) { + /* + * Here is our line-breakout optimization. + */ + if (changedlines == CHECK_INTERVAL) { + if (check_pending()) + goto cleanup; + changedlines = 0; + } + + /* + * newscr->line[i].firstchar is normally set + * by wnoutrefresh. curscr->line[i].firstchar + * is normally set by _nc_scroll_window in the + * vertical-movement optimization code, + */ + if (newscr->_line[i].firstchar != _NOCHANGE + || curscr->_line[i].firstchar != _NOCHANGE) { + TransformLine(i); + changedlines++; + } + + /* mark line changed successfully */ + if (i <= newscr->_maxy) { + MARK_NOCHANGE(newscr, i) + } + if (i <= curscr->_maxy) { + MARK_NOCHANGE(curscr, i) + } } + } - /* put everything back in sync */ - for (i = nonempty; i <= newscr->_maxy; i++) - MARK_NOCHANGE(newscr,i) - for (i = nonempty; i <= curscr->_maxy; i++) - MARK_NOCHANGE(curscr,i) + /* put everything back in sync */ + for (i = nonempty; i <= newscr->_maxy; i++) { + MARK_NOCHANGE(newscr, i) + } + for (i = nonempty; i <= curscr->_maxy; i++) { + MARK_NOCHANGE(curscr, i) + } - if (!newscr->_leaveok) - { - curscr->_curx = newscr->_curx; - curscr->_cury = newscr->_cury; + if (!newscr->_leaveok) { + curscr->_curx = newscr->_curx; + curscr->_cury = newscr->_cury; - GoTo(curscr->_cury, curscr->_curx); - } + GoTo(curscr->_cury, curscr->_curx); + } - cleanup: - /* - * Keep the physical screen in normal mode in case we get other - * processes writing to the screen. - */ - UpdateAttrs(A_NORMAL); + cleanup: + /* + * Keep the physical screen in normal mode in case we get other + * processes writing to the screen. + */ + UpdateAttrs(A_NORMAL); - _nc_flush(); - curscr->_attrs = newscr->_attrs; -/* curscr->_bkgd = newscr->_bkgd; */ + _nc_flush(); + curscr->_attrs = newscr->_attrs; #if USE_TRACE_TIMES - (void) times(&after); - TR(TRACE_TIMES, ("Update cost: %ld chars, %ld clocks system time, %ld clocks user time", + (void) times(&after); + TR(TRACE_TIMES, + ("Update cost: %ld chars, %ld clocks system time, %ld clocks user time", _nc_outchars, - after.tms_stime-before.tms_stime, - after.tms_utime-before.tms_utime)); + after.tms_stime - before.tms_stime, + after.tms_utime - before.tms_utime)); #endif /* USE_TRACE_TIMES */ - _nc_signal_handler(TRUE); + _nc_signal_handler(TRUE); - returnCode(OK); + returnCode(OK); } /* @@ -811,12 +809,13 @@ struct tms before, after; #define BCE_ATTRS (A_NORMAL|A_COLOR) #define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_bkgd) -static inline chtype ClrBlank (WINDOW *win) +static inline chtype +ClrBlank(WINDOW *win) { -chtype blank = BLANK; - if (back_color_erase) - blank |= (BCE_BKGD(win) & BCE_ATTRS); - return blank; + chtype blank = BLANK; + if (back_color_erase) + blank |= (BCE_BKGD(win) & BCE_ATTRS); + return blank; } /* @@ -826,22 +825,23 @@ chtype blank = BLANK; ** */ -static void ClrUpdate(void) +static void +ClrUpdate(void) { - int i; - chtype blank = ClrBlank(stdscr); - int nonempty = min(screen_lines, newscr->_maxy+1); + int i; + chtype blank = ClrBlank(stdscr); + int nonempty = min(screen_lines, newscr->_maxy + 1); - T(("ClrUpdate() called")); + T(("ClrUpdate() called")); - ClearScreen(blank); + ClearScreen(blank); - T(("updating screen from scratch")); + T(("updating screen from scratch")); - nonempty = ClrBottom(nonempty); + nonempty = ClrBottom(nonempty); - for (i = 0; i < nonempty; i++) - TransformLine(i); + for (i = 0; i < nonempty; i++) + TransformLine(i); } /* @@ -850,35 +850,37 @@ static void ClrUpdate(void) ** Clear to end of current line, starting at the cursor position */ -static void ClrToEOL(chtype blank) +static void +ClrToEOL(chtype blank, bool needclear) { -int j; -bool needclear = FALSE; + int j; - for (j = SP->_curscol; j < screen_columns; j++) - { + if (curscr != 0 + && SP->_cursrow >= 0 + && SP->_curscol >= 0) { + for (j = SP->_curscol; j < screen_columns; j++) { chtype *cp = &(curscr->_line[SP->_cursrow].text[j]); - if (*cp != blank) - { + if (*cp != blank) { *cp = blank; needclear = TRUE; } } + } else { + needclear = TRUE; + } - if (needclear) - { - UpdateAttrs(blank); - TPUTS_TRACE("clr_eol"); - if (SP->_el_cost > (screen_columns - SP->_curscol)) - { - int count = (screen_columns - SP->_curscol); - while (count-- > 0) - PutChar(blank); - } - else - putp(clr_eol); + if (needclear) { + UpdateAttrs(blank); + TPUTS_TRACE("clr_eol"); + if (SP->_el_cost > (screen_columns - SP->_curscol)) { + int count = (screen_columns - SP->_curscol); + while (count-- > 0) + PutChar(blank); + } else { + putp(clr_eol); } + } } /* @@ -887,23 +889,27 @@ bool needclear = FALSE; ** Clear to end of screen, starting at the cursor position */ -static void ClrToEOS(chtype blank) +static void +ClrToEOS(chtype blank) { -int row, col; + int row, col; + + row = SP->_cursrow; + col = SP->_curscol; + { UpdateAttrs(blank); TPUTS_TRACE("clr_eos"); - row = SP->_cursrow; - tputs(clr_eos, screen_lines-row, _nc_outch); + tputs(clr_eos, screen_lines - row, _nc_outch); + } - for (col = SP->_curscol; col < screen_columns; col++) - curscr->_line[row].text[col] = blank; + while (col < screen_columns) + curscr->_line[row].text[col++] = blank; - for (row++; row < screen_lines; row++) - { - for (col = 0; col < screen_columns; col++) - curscr->_line[row].text[col] = blank; - } + for (row++; row < screen_lines; row++) { + for (col = 0; col < screen_columns; col++) + curscr->_line[row].text[col] = blank; + } } /* @@ -913,57 +919,59 @@ int row, col; * screen-update. Do this by scanning backwards through the lines in the * screen, checking if each is blank, and one or more are changed. */ -static int ClrBottom(int total) +static int +ClrBottom(int total) { -static chtype *tstLine; -static size_t lenLine; - -int row, col; -int top = total; -int last = min(screen_columns, newscr->_maxx+1); -size_t length = sizeof(chtype) * last; -chtype blank = newscr->_line[total-1].text[last-1]; /* lower right char */ - - if(!clr_eos || !can_clear_with(blank)) - return total; - - if ((tstLine == 0) || (last > (int)lenLine)) { - tstLine = typeRealloc(chtype, last, tstLine); - if (tstLine != 0) { - lenLine = last; - for (col = 0; col < last; col++) - tstLine[col] = blank; - } - } + static chtype *tstLine; + static size_t lenLine; - if (tstLine != 0) { - for (row = total-1; row >= 0; row--) { - if (memcmp(tstLine, newscr->_line[row].text, length)) - break; - if (memcmp(tstLine, curscr->_line[row].text, length)) - top = row; - } + int row; + size_t col; + int top = total; + int last = min(screen_columns, newscr->_maxx + 1); + size_t length = sizeof(chtype) * last; + chtype blank = newscr->_line[total - 1].text[last - 1]; /* lower right char */ - /* don't use clr_eos for just one line if clr_eol available */ - if (top < total-1 || (top < total && !clr_eol && !clr_bol)) { - GoTo(top,0); - ClrToEOS(blank); - total = top; - if (SP->oldhash && SP->newhash) - { - for (row = top; row < screen_lines; row++) - SP->oldhash[row] = SP->newhash[row]; - } - } + if (!clr_eos || !can_clear_with(blank)) + return total; + + if ((tstLine == 0) || (last > (int) lenLine)) { + tstLine = typeRealloc(chtype, last, tstLine); + if (tstLine == 0) + return total; + lenLine = last; + tstLine[0] = ~blank; /* force the fill below */ + } + if (tstLine[0] != blank) { + for (col = 0; col < lenLine; col++) + tstLine[col] = blank; + } + + for (row = total - 1; row >= 0; row--) { + if (memcmp(tstLine, newscr->_line[row].text, length)) + break; + if (memcmp(tstLine, curscr->_line[row].text, length)) + top = row; + } + + /* don't use clr_eos for just one line if clr_eol available */ + if (top < total - 1 || (top < total && !clr_eol && !clr_bol)) { + GoTo(top, 0); + ClrToEOS(blank); + total = top; + if (SP->oldhash && SP->newhash) { + for (row = top; row < screen_lines; row++) + SP->oldhash[row] = SP->newhash[row]; } + } #if NO_LEAKS - if (tstLine != 0) - FreeAndNull(tstLine); + if (tstLine != 0) { + FreeAndNull(tstLine); + } #endif - return total; + return total; } - /* ** TransformLine(lineno) ** @@ -982,35 +990,69 @@ chtype blank = newscr->_line[total-1].text[last-1]; /* lower right char */ ** delete oLastChar - nLastChar spaces */ -static void TransformLine(int const lineno) +static void +TransformLine(int const lineno) { -int firstChar, oLastChar, nLastChar; -chtype *newLine = newscr->_line[lineno].text; -chtype *oldLine = curscr->_line[lineno].text; -int n; -bool attrchanged = FALSE; - - T(("TransformLine(%d) called", lineno)); - - /* copy new hash value to old one */ - if (SP->oldhash && SP->newhash) - SP->oldhash[lineno] = SP->newhash[lineno]; - - if(ceol_standout_glitch && clr_eol) { - firstChar = 0; - while(firstChar < screen_columns) { - if(AttrOf(newLine[firstChar]) != AttrOf(oldLine[firstChar])) - attrchanged = TRUE; - firstChar++; + int firstChar, oLastChar, nLastChar; + chtype *newLine = newscr->_line[lineno].text; + chtype *oldLine = curscr->_line[lineno].text; + int n; + bool attrchanged = FALSE; + + T(("TransformLine(%d) called", lineno)); + + /* copy new hash value to old one */ + if (SP->oldhash && SP->newhash) + SP->oldhash[lineno] = SP->newhash[lineno]; + +#define ColorOf(n) ((n) & A_COLOR) +#define unColor(n) ((n) & ALL_BUT_COLOR) + /* + * If we have colors, there is the possibility of having two color pairs + * that display as the same colors. For instance, Lynx does this. Check + * for this case, and update the old line with the new line's colors when + * they are equivalent. + */ + if (SP->_coloron) { + chtype oldColor; + chtype newColor; + int oldPair; + int newPair; + + for (n = 0; n < screen_columns; n++) { + if (newLine[n] != oldLine[n]) { + oldColor = ColorOf(oldLine[n]); + newColor = ColorOf(newLine[n]); + if (oldColor != newColor + && unColor(oldLine[n]) == unColor(newLine[n])) { + oldPair = PAIR_NUMBER(oldColor); + newPair = PAIR_NUMBER(newColor); + if (oldPair < COLOR_PAIRS + && newPair < COLOR_PAIRS + && SP->_color_pairs[oldPair] == SP->_color_pairs[newPair]) { + oldLine[n] &= ~A_COLOR; + oldLine[n] |= ColorOf(newLine[n]); + } } + } } + } + if (ceol_standout_glitch && clr_eol) { firstChar = 0; + while (firstChar < screen_columns) { + if (AttrOf(newLine[firstChar]) != AttrOf(oldLine[firstChar])) + attrchanged = TRUE; + firstChar++; + } + } - if (attrchanged) { /* we may have to disregard the whole line */ - GoTo(lineno, firstChar); - ClrToEOL(ClrBlank(curscr)); - PutRange(oldLine, newLine, lineno, 0, (screen_columns-1)); + firstChar = 0; + + if (attrchanged) { /* we may have to disregard the whole line */ + GoTo(lineno, firstChar); + ClrToEOL(ClrBlank(curscr), FALSE); + PutRange(oldLine, newLine, lineno, 0, (screen_columns - 1)); #if USE_XMC_SUPPORT #define NEW(r,c) newscr->_line[r].text[c] @@ -1028,199 +1070,194 @@ bool attrchanged = FALSE; * will work properly only once, since we may overwrite a cookie in a * following operation. */ - } else if (magic_cookie_glitch > 0) { - GoTo(lineno, firstChar); - for (n = 0; n < screen_columns; n++) { - int m = n + magic_cookie_glitch; - - /* check for turn-on: - * If we are writing an attributed blank, where the - * previous cell is not attributed. - */ - if (TextOf(newLine[n]) == ' ' - && ((n > 0 - && xmc_turn_on(newLine[n-1], newLine[n])) - || (n == 0 - && lineno > 0 - && xmc_turn_on(NEW(lineno-1,screen_columns-1), newLine[n])))) { - n = m; - } + } else if (magic_cookie_glitch > 0) { + GoTo(lineno, firstChar); + for (n = 0; n < screen_columns; n++) { + int m = n + magic_cookie_glitch; + + /* check for turn-on: + * If we are writing an attributed blank, where the + * previous cell is not attributed. + */ + if (TextOf(newLine[n]) == ' ' + && ((n > 0 + && xmc_turn_on(newLine[n - 1], newLine[n])) + || (n == 0 + && lineno > 0 + && xmc_turn_on(NEW(lineno - 1, screen_columns - 1), + newLine[n])))) { + n = m; + } - PutChar(newLine[n]); + PutChar(newLine[n]); - /* check for turn-off: - * If we are writing an attributed non-blank, where the - * next cell is blank, and not attributed. - */ - if (TextOf(newLine[n]) != ' ' - && ((n+1 < screen_columns - && xmc_turn_off(newLine[n], newLine[n+1])) - || (n+1 >= screen_columns - && lineno+1 < screen_lines - && xmc_turn_off(newLine[n], NEW(lineno+1,0))))) { - n = m; - } + /* check for turn-off: + * If we are writing an attributed non-blank, where the + * next cell is blank, and not attributed. + */ + if (TextOf(newLine[n]) != ' ' + && ((n + 1 < screen_columns + && xmc_turn_off(newLine[n], newLine[n + 1])) + || (n + 1 >= screen_columns + && lineno + 1 < screen_lines + && xmc_turn_off(newLine[n], NEW(lineno + 1, 0))))) { + n = m; + } - } + } #undef NEW #endif - } else { - chtype blank; + } else { + chtype blank; + + /* find the first differing character */ + while (firstChar < screen_columns && + newLine[firstChar] == oldLine[firstChar]) + firstChar++; + + /* if there wasn't one, we're done */ + if (firstChar >= screen_columns) + return; + + /* it may be cheap to clear leading whitespace with clr_bol */ + if (clr_bol && can_clear_with(blank = newLine[0])) { + int oFirstChar, nFirstChar; + + for (oFirstChar = 0; oFirstChar < screen_columns; oFirstChar++) + if (oldLine[oFirstChar] != blank) + break; + for (nFirstChar = 0; nFirstChar < screen_columns; nFirstChar++) + if (newLine[nFirstChar] != blank) + break; + + if (nFirstChar > oFirstChar + SP->_el1_cost) { + if (nFirstChar >= screen_columns && SP->_el_cost <= SP->_el1_cost) { + GoTo(lineno, 0); + UpdateAttrs(blank); + TPUTS_TRACE("clr_eol"); + putp(clr_eol); + } else { + GoTo(lineno, nFirstChar - 1); + UpdateAttrs(blank); + TPUTS_TRACE("clr_bol"); + putp(clr_bol); + } - /* find the first differing character */ - while (firstChar < screen_columns && - newLine[firstChar] == oldLine[firstChar]) - firstChar++; + while (firstChar < nFirstChar) + oldLine[firstChar++] = blank; - /* if there wasn't one, we're done */ if (firstChar >= screen_columns) - return; - - /* it may be cheap to clear leading whitespace with clr_bol */ - if (clr_bol && can_clear_with(blank=newLine[0])) - { - int oFirstChar, nFirstChar; - - for (oFirstChar = 0; oFirstChar < screen_columns; oFirstChar++) - if (oldLine[oFirstChar] != blank) - break; - for (nFirstChar = 0; nFirstChar < screen_columns; nFirstChar++) - if (newLine[nFirstChar] != blank) - break; - - if (nFirstChar > oFirstChar + SP->_el1_cost) - { - if (nFirstChar >= screen_columns && SP->_el_cost <= SP->_el1_cost) - { - GoTo(lineno, 0); - UpdateAttrs(blank); - TPUTS_TRACE("clr_eol"); - putp(clr_eol); - } - else - { - GoTo(lineno, nFirstChar - 1); - UpdateAttrs(blank); - TPUTS_TRACE("clr_bol"); - putp(clr_bol); - } - - while (firstChar < nFirstChar) - oldLine[firstChar++] = blank; - - if (firstChar >= screen_columns) - return; - } - } + return; + } + } - blank = newLine[screen_columns-1]; + blank = newLine[screen_columns - 1]; - if(!can_clear_with(blank)) - { - /* find the last differing character */ - nLastChar = screen_columns - 1; + if (!can_clear_with(blank)) { + /* find the last differing character */ + nLastChar = screen_columns - 1; - while (nLastChar > firstChar - && newLine[nLastChar] == oldLine[nLastChar]) - nLastChar--; + while (nLastChar > firstChar + && newLine[nLastChar] == oldLine[nLastChar]) + nLastChar--; - if (nLastChar >= firstChar) { - GoTo(lineno, firstChar); - PutRange(oldLine, newLine, lineno, firstChar, nLastChar); - memcpy( oldLine + firstChar, - newLine + firstChar, - (nLastChar - firstChar + 1) * sizeof(chtype)); - } - return; - } + if (nLastChar >= firstChar) { + GoTo(lineno, firstChar); + PutRange(oldLine, newLine, lineno, firstChar, nLastChar); + memcpy(oldLine + firstChar, + newLine + firstChar, + (nLastChar - firstChar + 1) * sizeof(chtype)); + } + return; + } - /* find last non-blank character on old line */ - oLastChar = screen_columns - 1; - while (oLastChar > firstChar && oldLine[oLastChar] == blank) - oLastChar--; - - /* find last non-blank character on new line */ - nLastChar = screen_columns - 1; - while (nLastChar > firstChar && newLine[nLastChar] == blank) - nLastChar--; - - if((nLastChar == firstChar) - && (SP->_el_cost < (oLastChar - nLastChar))) { - GoTo(lineno, firstChar); - if(newLine[firstChar] != blank ) - PutChar(newLine[firstChar]); - ClrToEOL(blank); - } else if( (nLastChar != oLastChar) - && (newLine[nLastChar] != oldLine[oLastChar] - || !(_nc_idcok && has_ic())) ) { - GoTo(lineno, firstChar); - if ((oLastChar - nLastChar) > SP->_el_cost) { - if(PutRange(oldLine, newLine, lineno, firstChar, nLastChar)) - GoTo(lineno, nLastChar+1); - ClrToEOL(blank); - } else { - n = max( nLastChar , oLastChar ); - PutRange(oldLine, newLine, lineno, firstChar, n); - } + /* find last non-blank character on old line */ + oLastChar = screen_columns - 1; + while (oLastChar > firstChar && oldLine[oLastChar] == blank) + oLastChar--; + + /* find last non-blank character on new line */ + nLastChar = screen_columns - 1; + while (nLastChar > firstChar && newLine[nLastChar] == blank) + nLastChar--; + + if ((nLastChar == firstChar) + && (SP->_el_cost < (oLastChar - nLastChar))) { + GoTo(lineno, firstChar); + if (newLine[firstChar] != blank) + PutChar(newLine[firstChar]); + ClrToEOL(blank, FALSE); + } else if ((nLastChar != oLastChar) + && (newLine[nLastChar] != oldLine[oLastChar] + || !(_nc_idcok && has_ic()))) { + GoTo(lineno, firstChar); + if ((oLastChar - nLastChar) > SP->_el_cost) { + if (PutRange(oldLine, newLine, lineno, firstChar, nLastChar)) + GoTo(lineno, nLastChar + 1); + ClrToEOL(blank, FALSE); + } else { + n = max(nLastChar, oLastChar); + PutRange(oldLine, newLine, lineno, firstChar, n); + } + } else { + int nLastNonblank = nLastChar; + int oLastNonblank = oLastChar; + + /* find the last characters that really differ */ + while (newLine[nLastChar] == oldLine[oLastChar]) { + if (nLastChar != 0 + && oLastChar != 0) { + nLastChar--; + oLastChar--; } else { - int nLastNonblank = nLastChar; - int oLastNonblank = oLastChar; - - /* find the last characters that really differ */ - while (newLine[nLastChar] == oldLine[oLastChar]) { - if (nLastChar != 0 - && oLastChar != 0) { - nLastChar--; - oLastChar--; - } else { - break; - } - } + break; + } + } - n = min(oLastChar, nLastChar); - if (n >= firstChar) { - GoTo(lineno, firstChar); - PutRange(oldLine, newLine, lineno, firstChar, n); - } + n = min(oLastChar, nLastChar); + if (n >= firstChar) { + GoTo(lineno, firstChar); + PutRange(oldLine, newLine, lineno, firstChar, n); + } - if (oLastChar < nLastChar) { - int m = max(nLastNonblank, oLastNonblank); - GoTo(lineno, n+1); - if (InsCharCost(nLastChar - oLastChar) - > (m - n)) { - PutRange(oldLine, newLine, lineno, n+1, m); - } else { - InsStr(&newLine[n+1], nLastChar - oLastChar); - } - } else if (oLastChar > nLastChar ) { - GoTo(lineno, n+1); - if (DelCharCost(oLastChar - nLastChar) - > SP->_el_cost + nLastNonblank - (n+1)) { - if(PutRange(oldLine, newLine, lineno, - n+1, nLastNonblank)) - GoTo(lineno, nLastNonblank+1); - ClrToEOL(blank); - } else { - /* - * The delete-char sequence will - * effectively shift in blanks from the - * right margin of the screen. Ensure - * that they are the right color by - * setting the video attributes from - * the last character on the row. - */ - UpdateAttrs(blank); - DelChar(oLastChar - nLastChar); - } - } + if (oLastChar < nLastChar) { + int m = max(nLastNonblank, oLastNonblank); + GoTo(lineno, n + 1); + if (InsCharCost(nLastChar - oLastChar) + > (m - n)) { + PutRange(oldLine, newLine, lineno, n + 1, m); + } else { + InsStr(&newLine[n + 1], nLastChar - oLastChar); + } + } else if (oLastChar > nLastChar) { + GoTo(lineno, n + 1); + if (DelCharCost(oLastChar - nLastChar) + > SP->_el_cost + nLastNonblank - (n + 1)) { + if (PutRange(oldLine, newLine, lineno, + n + 1, nLastNonblank)) + GoTo(lineno, nLastNonblank + 1); + ClrToEOL(blank, FALSE); + } else { + /* + * The delete-char sequence will + * effectively shift in blanks from the + * right margin of the screen. Ensure + * that they are the right color by + * setting the video attributes from + * the last character on the row. + */ + UpdateAttrs(blank); + DelChar(oLastChar - nLastChar); } + } } + } - /* update the code's internal representation */ - if (screen_columns > firstChar) - memcpy( oldLine + firstChar, - newLine + firstChar, - (screen_columns - firstChar) * sizeof(chtype)); + /* update the code's internal representation */ + if (screen_columns > firstChar) + memcpy(oldLine + firstChar, + newLine + firstChar, + (screen_columns - firstChar) * sizeof(chtype)); } /* @@ -1230,46 +1267,65 @@ bool attrchanged = FALSE; ** */ -static void ClearScreen(chtype blank) +static void +ClearScreen(chtype blank) { - int i, j; + int i, j; + bool fast_clear = (clear_screen || clr_eos || clr_eol); + + T(("ClearScreen() called")); - T(("ClearScreen() called")); +#ifdef NCURSES_EXT_FUNCS + if (SP->_coloron + && !SP->_default_color) { + _nc_do_color(COLOR_PAIR(SP->_current_attr), 0, FALSE, _nc_outch); + if (!back_color_erase) { + fast_clear = FALSE; + } + } +#endif + if (fast_clear) { if (clear_screen) { - UpdateAttrs(blank); - TPUTS_TRACE("clear_screen"); - putp(clear_screen); - SP->_cursrow = SP->_curscol = 0; - position_check(SP->_cursrow, SP->_curscol, "ClearScreen"); + UpdateAttrs(blank); + TPUTS_TRACE("clear_screen"); + putp(clear_screen); + SP->_cursrow = SP->_curscol = 0; + position_check(SP->_cursrow, SP->_curscol, "ClearScreen"); } else if (clr_eos) { - SP->_cursrow = SP->_curscol = -1; - GoTo(0,0); + SP->_cursrow = SP->_curscol = -1; + GoTo(0, 0); - UpdateAttrs(blank); - TPUTS_TRACE("clr_eos"); - putp(clr_eos); + UpdateAttrs(blank); + TPUTS_TRACE("clr_eos"); + putp(clr_eos); } else if (clr_eol) { - SP->_cursrow = SP->_curscol = -1; + SP->_cursrow = SP->_curscol = -1; - for (i = 0; i < screen_lines; i++) { - GoTo(i, 0); - UpdateAttrs(blank); - TPUTS_TRACE("clr_eol"); - putp(clr_eol); - } - GoTo(0,0); - } else { - T(("cannot clear screen")); - return; + for (i = 0; i < screen_lines; i++) { + GoTo(i, 0); + UpdateAttrs(blank); + TPUTS_TRACE("clr_eol"); + putp(clr_eol); + } + GoTo(0, 0); } - + } else { for (i = 0; i < screen_lines; i++) { - for (j = 0; j < screen_columns; j++) - curscr->_line[i].text[j] = blank; + GoTo(i, 0); + UpdateAttrs(blank); + for (j = 0; j < screen_columns; j++) + PutChar(blank); } + GoTo(0, 0); + } - T(("screen cleared")); + for (i = 0; i < screen_lines; i++) { + for (j = 0; j < screen_columns; j++) + curscr->_line[i].text[j] = blank; + } + + T(("screen cleared")); } /* @@ -1279,51 +1335,50 @@ static void ClearScreen(chtype blank) ** */ -static void InsStr(chtype *line, int count) +static void +InsStr(chtype * line, int count) { - T(("InsStr(%p,%d) called", line, count)); - - /* Prefer parm_ich as it has the smallest cost - no need to shift - * the whole line on each character. */ - /* The order must match that of InsCharCost. */ - if (parm_ich) { - TPUTS_TRACE("parm_ich"); - tputs(tparm(parm_ich, count), count, _nc_outch); - while (count) { - PutAttrChar(*line); - line++; - count--; - } - } else if (enter_insert_mode && exit_insert_mode) { - TPUTS_TRACE("enter_insert_mode"); - putp(enter_insert_mode); - while (count) { - PutAttrChar(*line); - if (insert_padding) - { - TPUTS_TRACE("insert_padding"); - putp(insert_padding); - } - line++; - count--; - } - TPUTS_TRACE("exit_insert_mode"); - putp(exit_insert_mode); - } else { - while (count) { - TPUTS_TRACE("insert_character"); - putp(insert_character); - PutAttrChar(*line); - if (insert_padding) - { - TPUTS_TRACE("insert_padding"); - putp(insert_padding); - } - line++; - count--; - } + T(("InsStr(%p,%d) called", line, count)); + + /* Prefer parm_ich as it has the smallest cost - no need to shift + * the whole line on each character. */ + /* The order must match that of InsCharCost. */ + if (parm_ich) { + TPUTS_TRACE("parm_ich"); + tputs(tparm(parm_ich, count), count, _nc_outch); + while (count) { + PutAttrChar(*line); + line++; + count--; + } + } else if (enter_insert_mode && exit_insert_mode) { + TPUTS_TRACE("enter_insert_mode"); + putp(enter_insert_mode); + while (count) { + PutAttrChar(*line); + if (insert_padding) { + TPUTS_TRACE("insert_padding"); + putp(insert_padding); + } + line++; + count--; + } + TPUTS_TRACE("exit_insert_mode"); + putp(exit_insert_mode); + } else { + while (count) { + TPUTS_TRACE("insert_character"); + putp(insert_character); + PutAttrChar(*line); + if (insert_padding) { + TPUTS_TRACE("insert_padding"); + putp(insert_padding); + } + line++; + count--; } - position_check(SP->_cursrow, SP->_curscol, "InsStr"); + } + position_check(SP->_cursrow, SP->_curscol, "InsStr"); } /* @@ -1333,20 +1388,22 @@ static void InsStr(chtype *line, int count) ** */ -static void DelChar(int count) +static void +DelChar(int count) { - T(("DelChar(%d) called, position = (%d,%d)", count, newscr->_cury, newscr->_curx)); + int n; - if (parm_dch) { - TPUTS_TRACE("parm_dch"); - tputs(tparm(parm_dch, count), count, _nc_outch); - } else { - while (count--) - { - TPUTS_TRACE("delete_character"); - putp(delete_character); - } + T(("DelChar(%d) called, position = (%d,%d)", count, newscr->_cury, newscr->_curx)); + + if (parm_dch) { + TPUTS_TRACE("parm_dch"); + tputs(tparm(parm_dch, count), count, _nc_outch); + } else { + for (n = 0; n < count; n++) { + TPUTS_TRACE("delete_character"); + putp(delete_character); } + } } /* @@ -1355,7 +1412,8 @@ static void DelChar(int count) ** Emit a string without waiting for update. */ -void _nc_outstr(const char *str) +void +_nc_outstr(const char *str) { (void) putp(str); _nc_flush(); @@ -1394,149 +1452,136 @@ void _nc_outstr(const char *str) */ /* Try to scroll up assuming given csr (miny, maxy). Returns ERR on failure */ -static int scroll_csr_forward(int n, int top, int bot, int miny, int maxy, chtype blank) +static int +scroll_csr_forward(int n, int top, int bot, int miny, int maxy, chtype blank) { - int i; + int i, j; - if (n == 1 && scroll_forward && top == miny && bot == maxy) - { + if (n == 1 && scroll_forward && top == miny && bot == maxy) { GoTo(bot, 0); UpdateAttrs(blank); TPUTS_TRACE("scroll_forward"); tputs(scroll_forward, 0, _nc_outch); - } - else if (n == 1 && delete_line && bot == maxy) - { + } else if (n == 1 && delete_line && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); TPUTS_TRACE("delete_line"); tputs(delete_line, 0, _nc_outch); - } - else if (parm_index && top == miny && bot == maxy) - { + } else if (parm_index && top == miny && bot == maxy) { GoTo(bot, 0); UpdateAttrs(blank); TPUTS_TRACE("parm_index"); tputs(tparm(parm_index, n, 0), n, _nc_outch); - } - else if (parm_delete_line && bot == maxy) - { + } else if (parm_delete_line && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); TPUTS_TRACE("parm_delete_line"); tputs(tparm(parm_delete_line, n, 0), n, _nc_outch); - } - else if (scroll_forward && top == miny && bot == maxy) - { + } else if (scroll_forward && top == miny && bot == maxy) { GoTo(bot, 0); UpdateAttrs(blank); - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { TPUTS_TRACE("scroll_forward"); tputs(scroll_forward, 0, _nc_outch); } - } - else if (delete_line && bot == maxy) - { + } else if (delete_line && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { TPUTS_TRACE("delete_line"); tputs(delete_line, 0, _nc_outch); } - } - else + } else return ERR; +#ifdef NCURSES_EXT_FUNCS + if (FILL_BCE()) { + for (i = 0; i < n; i++) { + GoTo(bot - i, 0); + for (j = 0; j < screen_columns; j++) + PutChar(blank); + } + } +#endif return OK; } /* Try to scroll down assuming given csr (miny, maxy). Returns ERR on failure */ /* n > 0 */ -static int scroll_csr_backward(int n, int top, int bot, int miny, int maxy, chtype blank) +static int +scroll_csr_backward(int n, int top, int bot, int miny, int maxy, chtype blank) { - int i; + int i, j; - if (n == 1 && scroll_reverse && top == miny && bot == maxy) - { + if (n == 1 && scroll_reverse && top == miny && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); TPUTS_TRACE("scroll_reverse"); tputs(scroll_reverse, 0, _nc_outch); - } - else if (n == 1 && insert_line && bot == maxy) - { + } else if (n == 1 && insert_line && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); TPUTS_TRACE("insert_line"); tputs(insert_line, 0, _nc_outch); - } - else if (parm_rindex && top == miny && bot == maxy) - { + } else if (parm_rindex && top == miny && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); TPUTS_TRACE("parm_rindex"); tputs(tparm(parm_rindex, n, 0), n, _nc_outch); - } - else if (parm_insert_line && bot == maxy) - { + } else if (parm_insert_line && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); TPUTS_TRACE("parm_insert_line"); tputs(tparm(parm_insert_line, n, 0), n, _nc_outch); - } - else if (scroll_reverse && top == miny && bot == maxy) - { + } else if (scroll_reverse && top == miny && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { TPUTS_TRACE("scroll_reverse"); tputs(scroll_reverse, 0, _nc_outch); } - } - else if (insert_line && bot == maxy) - { + } else if (insert_line && bot == maxy) { GoTo(top, 0); UpdateAttrs(blank); - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { TPUTS_TRACE("insert_line"); tputs(insert_line, 0, _nc_outch); } - } - else + } else return ERR; +#ifdef NCURSES_EXT_FUNCS + if (FILL_BCE()) { + for (i = 0; i < n; i++) { + GoTo(top + i, 0); + for (j = 0; j < screen_columns; j++) + PutChar(blank); + } + } +#endif return OK; } /* scroll by using delete_line at del and insert_line at ins */ /* n > 0 */ -static int scroll_idl(int n, int del, int ins, chtype blank) +static int +scroll_idl(int n, int del, int ins, chtype blank) { int i; - if(!((parm_delete_line || delete_line) && (parm_insert_line || insert_line))) + if (!((parm_delete_line || delete_line) && (parm_insert_line || insert_line))) return ERR; GoTo(del, 0); UpdateAttrs(blank); - if (n == 1 && delete_line) - { + if (n == 1 && delete_line) { TPUTS_TRACE("delete_line"); tputs(delete_line, 0, _nc_outch); - } - else if (parm_delete_line) - { + } else if (parm_delete_line) { TPUTS_TRACE("parm_delete_line"); tputs(tparm(parm_delete_line, n, 0), n, _nc_outch); - } - else /* if (delete_line) */ - { - for (i = 0; i < n; i++) - { + } else { /* if (delete_line) */ + for (i = 0; i < n; i++) { TPUTS_TRACE("delete_line"); tputs(delete_line, 0, _nc_outch); } @@ -1544,20 +1589,14 @@ static int scroll_idl(int n, int del, int ins, chtype blank) GoTo(ins, 0); UpdateAttrs(blank); - if (n == 1 && insert_line) - { + if (n == 1 && insert_line) { TPUTS_TRACE("insert_line"); tputs(insert_line, 0, _nc_outch); - } - else if (parm_insert_line) - { + } else if (parm_insert_line) { TPUTS_TRACE("parm_insert_line"); tputs(tparm(parm_insert_line, n, 0), n, _nc_outch); - } - else /* if (insert_line) */ - { - for (i = 0; i < n; i++) - { + } else { /* if (insert_line) */ + for (i = 0; i < n; i++) { TPUTS_TRACE("insert_line"); tputs(insert_line, 0, _nc_outch); } @@ -1566,12 +1605,13 @@ static int scroll_idl(int n, int del, int ins, chtype blank) return OK; } -int _nc_scrolln(int n, int top, int bot, int maxy) +int +_nc_scrolln(int n, int top, int bot, int maxy) /* scroll region from top to bot by n lines */ { - chtype blank=ClrBlank(stdscr); + chtype blank = ClrBlank(stdscr); int i; - bool cursor_saved=FALSE; + bool cursor_saved = FALSE; int res; TR(TRACE_MOVE, ("mvcur_scrolln(%d, %d, %d, %d)", n, top, bot, maxy)); @@ -1585,41 +1625,34 @@ int _nc_scrolln(int n, int top, int bot, int maxy) } #endif - if (n > 0) /* scroll up (forward) */ - { + if (n > 0) { /* scroll up (forward) */ /* * Explicitly clear if stuff pushed off top of region might * be saved by the terminal. */ if (non_dest_scroll_region || (memory_above && top == 0)) { - for (i = 0; i < n; i++) - { + for (i = 0; i < n; i++) { GoTo(i, 0); - ClrToEOL(BLANK); + ClrToEOL(BLANK, FALSE); } } res = scroll_csr_forward(n, top, bot, 0, maxy, blank); - if (res == ERR && change_scroll_region) - { - if ((((n==1 && scroll_forward) || parm_index) - && (SP->_cursrow == bot || SP->_cursrow == bot-1)) - && save_cursor && restore_cursor) - { - cursor_saved=TRUE; + if (res == ERR && change_scroll_region) { + if ((((n == 1 && scroll_forward) || parm_index) + && (SP->_cursrow == bot || SP->_cursrow == bot - 1)) + && save_cursor && restore_cursor) { + cursor_saved = TRUE; TPUTS_TRACE("save_cursor"); tputs(save_cursor, 0, _nc_outch); } TPUTS_TRACE("change_scroll_region"); tputs(tparm(change_scroll_region, top, bot), 0, _nc_outch); - if (cursor_saved) - { + if (cursor_saved) { TPUTS_TRACE("restore_cursor"); tputs(restore_cursor, 0, _nc_outch); - } - else - { + } else { SP->_cursrow = SP->_curscol = -1; } @@ -1631,51 +1664,39 @@ int _nc_scrolln(int n, int top, int bot, int maxy) } if (res == ERR && _nc_idlok) - res = scroll_idl(n, top, bot-n+1, blank); - } - else /* (n < 0) - scroll down (backward) */ - { + res = scroll_idl(n, top, bot - n + 1, blank); + } else { /* (n < 0) - scroll down (backward) */ /* * Do explicit clear to end of region if it's possible that the * terminal might hold on to stuff we push off the end. */ - if (non_dest_scroll_region || (memory_below && bot == maxy)) - { - if (bot == maxy && clr_eos) - { + if (non_dest_scroll_region || (memory_below && bot == maxy)) { + if (bot == maxy && clr_eos) { GoTo(maxy + n, 0); ClrToEOS(BLANK); - } - else if (clr_eol) - { - for (i = 0; i < -n; i++) - { + } else if (clr_eol) { + for (i = 0; i < -n; i++) { GoTo(maxy + n + i, 0); - ClrToEOL(BLANK); + ClrToEOL(BLANK, FALSE); } } } res = scroll_csr_backward(-n, top, bot, 0, maxy, blank); - if (res == ERR && change_scroll_region) - { - if (top != 0 && (SP->_cursrow == top || SP->_cursrow == top-1) - && save_cursor && restore_cursor) - { - cursor_saved=TRUE; + if (res == ERR && change_scroll_region) { + if (top != 0 && (SP->_cursrow == top || SP->_cursrow == top - 1) + && save_cursor && restore_cursor) { + cursor_saved = TRUE; TPUTS_TRACE("save_cursor"); tputs(save_cursor, 0, _nc_outch); } TPUTS_TRACE("change_scroll_region"); tputs(tparm(change_scroll_region, top, bot), 0, _nc_outch); - if (cursor_saved) - { + if (cursor_saved) { TPUTS_TRACE("restore_cursor"); tputs(restore_cursor, 0, _nc_outch); - } - else - { + } else { SP->_cursrow = SP->_curscol = -1; } @@ -1687,22 +1708,22 @@ int _nc_scrolln(int n, int top, int bot, int maxy) } if (res == ERR && _nc_idlok) - res = scroll_idl(-n, bot+n+1, top, blank); + res = scroll_idl(-n, bot + n + 1, top, blank); } if (res == ERR) - return(ERR); + return (ERR); _nc_scroll_window(curscr, n, top, bot, blank); /* shift hash values too - they can be reused */ _nc_scroll_oldhash(n, top, bot); - return(OK); + return (OK); } - -void _nc_screen_resume() +void +_nc_screen_resume(void) { /* make sure terminal is in a sane known state */ SP->_current_attr = A_NORMAL; @@ -1712,8 +1733,7 @@ void _nc_screen_resume() putp(orig_pair); if (exit_attribute_mode) putp(exit_attribute_mode); - else - { + else { /* turn off attributes */ if (exit_alt_charset_mode) putp(exit_alt_charset_mode); @@ -1728,30 +1748,47 @@ void _nc_screen_resume() putp(auto_right_margin ? enter_am_mode : exit_am_mode); } -void _nc_screen_init() +void +_nc_screen_init(void) { _nc_screen_resume(); } /* wrap up screen handling */ -void _nc_screen_wrap() +void +_nc_screen_wrap(void) { UpdateAttrs(A_NORMAL); +#ifdef NCURSES_EXT_FUNCS + if (SP->_coloron + && !SP->_default_color) { + SP->_default_color = TRUE; + _nc_do_color(-1, 0, FALSE, _nc_outch); + SP->_default_color = FALSE; + + mvcur(SP->_cursrow, SP->_curscol, screen_lines - 1, 0); + SP->_cursrow = screen_lines - 1; + SP->_curscol = 0; + + ClrToEOL(BLANK, TRUE); + } +#endif } #if USE_XMC_SUPPORT -void _nc_do_xmc_glitch(attr_t previous) +void +_nc_do_xmc_glitch(attr_t previous) { - attr_t chg = XMC_CHANGES(previous ^ SP->_current_attr); - - while (chg != 0) { - if (chg & 1) { - SP->_curscol += magic_cookie_glitch; - if (SP->_curscol >= SP->_columns) - wrap_cursor(); - T(("bumped to %d,%d after cookie", SP->_cursrow, SP->_curscol)); - } - chg >>= 1; + attr_t chg = XMC_CHANGES(previous ^ SP->_current_attr); + + while (chg != 0) { + if (chg & 1) { + SP->_curscol += magic_cookie_glitch; + if (SP->_curscol >= SP->_columns) + wrap_cursor(); + T(("bumped to %d,%d after cookie", SP->_cursrow, SP->_curscol)); } + chg >>= 1; + } } #endif /* USE_XMC_SUPPORT */ |