[src/trunk]: src/lib/libcurses Use __unsetattr() to unset attributes on 'curs...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/713f72e1b5a1
branches:  trunk
changeset: 485396:713f72e1b5a1
user:      jdc <jdc%NetBSD.org@localhost>
date:      Thu Apr 27 00:27:23 2000 +0000

description:
Use __unsetattr() to unset attributes on 'curscr'.

diffstat:

 lib/libcurses/tstp.c |  47 +++--------------------------------------------
 1 files changed, 3 insertions(+), 44 deletions(-)

diffs (68 lines):

diff -r 1d8a90271682 -r 713f72e1b5a1 lib/libcurses/tstp.c
--- a/lib/libcurses/tstp.c      Thu Apr 27 00:26:57 2000 +0000
+++ b/lib/libcurses/tstp.c      Thu Apr 27 00:27:23 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tstp.c,v 1.17 2000/04/24 14:09:44 blymn Exp $  */
+/*     $NetBSD: tstp.c,v 1.18 2000/04/27 00:27:23 jdc Exp $    */
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tstp.c     8.3 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: tstp.c,v 1.17 2000/04/24 14:09:44 blymn Exp $");
+__RCSID("$NetBSD: tstp.c,v 1.18 2000/04/27 00:27:23 jdc Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -127,48 +127,7 @@
        __restore_stophandler();
 
        if (curscr != NULL) {
-               if (curscr->wattr & __STANDOUT && SE != NULL) {
-                       tputs(SE, 0, __cputchar);
-                       curscr->wattr &= ~__STANDOUT;
-                       if (UE != NULL && !strcmp(SE, UE)) {
-                               curscr->wattr &= ~__UNDERSCORE;
-                       }
-                       if (ME != NULL && !strcmp(SE, ME)) {
-                               curscr->wattr &= ~__ATTRIBUTES | __ALTCHARSET | __COLOR;
-                       }
-                       if (OP != NULL && !strcmp(SE, OP)) {
-                               curscr->wattr &= ~__COLOR;
-                       }
-
-               }
-               if (curscr->wattr & __UNDERSCORE && UE != NULL) {
-                       tputs(UE, 0, __cputchar);
-                       curscr->wattr &= ~__UNDERSCORE;
-                       if (ME != NULL && !strcmp(UE, ME)) {
-                               curscr->wattr &= ~__ATTRIBUTES | __ALTCHARSET | __COLOR;
-                       }
-                       if (OP != NULL && !strcmp(UE, OP)) {
-                               curscr->wattr &= ~__COLOR;
-                       }
-               }
-               if (curscr->wattr & __ATTRIBUTES && ME != NULL) {
-                       tputs(ME, 0, __cputchar);
-                       curscr->wattr &= ~__ATTRIBUTES | __ALTCHARSET | __COLOR;
-                       if (OP != NULL && !strcmp(ME, OP)) {
-                               curscr->wattr &= ~__COLOR;
-                       }
-               }
-               if (curscr->wattr & __ALTCHARSET && AE != NULL) {
-                       tputs(AE, 0, __cputchar);
-                       curscr->wattr &= ~__ALTCHARSET;
-               }
-               if (curscr->wattr & __COLOR) {
-                       if (OC != NULL)
-                               tputs(OC, 0, __cputchar);
-                       if (OP != NULL)
-                               tputs(OP, 0, __cputchar);
-                       curscr->wattr &= ~__COLOR;
-               }
+               __unsetattr(0);
                __mvcur((int) curscr->cury, (int) curscr->curx, (int) curscr->maxy - 1, 0, 0);
        }