Permalink
Browse files

Bump shlib version.

  • Loading branch information...
blymn
blymn committed May 28, 2007
1 parent e1e8f75 commit e6ed49b633f57ec3667fb09293686bf5b5bb7d26
Showing with 8 additions and 13 deletions.
  1. +6 −11 lib/libcurses/attributes.c
  2. +2 −2 lib/libcurses/shlib_version
View
@@ -1,4 +1,4 @@
-/* $NetBSD: attributes.c,v 1.13.18.3 2007/01/29 11:12:26 blymn Exp $ */
+/* $NetBSD: attributes.c,v 1.13.18.4 2007/05/28 14:17:55 blymn Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: attributes.c,v 1.13.18.3 2007/01/29 11:12:26 blymn Exp $");
+__RCSID("$NetBSD: attributes.c,v 1.13.18.4 2007/05/28 14:17:55 blymn Exp $");
#endif /* not lint */
#include "curses.h"
@@ -268,30 +268,27 @@ wattr_off(WINDOW *win, attr_t attr, void *opt)
* wattr_set --
* Set attributes and color pair on stdscr
*/
-/* ARGSUSED */
int
wattr_set(WINDOW *win, attr_t attr, short pair, void *opt)
{
#ifdef DEBUG
__CTRACE(__CTRACE_ATTR, "wattr_set: win %p, attr %08x, pair %d\n",
win, attr, pair);
#endif
- wattr_on(win, attr, NULL);
- wattr_off(win, (~attr & ~__COLOR) | ((attr & __COLOR) ? 0 : __COLOR),
- NULL);
+ wattr_off(win, __ATTRIBUTES, opt);
/*
* This overwrites any colour setting from the attributes
* and is compatible with ncurses.
*/
- __wcolor_set(win, (attr_t) COLOR_PAIR(pair));
+ attr = (attr & ~__COLOR) | COLOR_PAIR(pair);
+ wattr_on(win, attr, opt);
return OK;
}
/*
* wattron --
* Test and set attributes.
*/
-
int
wattron(WINDOW *win, int attr)
{
@@ -325,10 +322,8 @@ wattrset(WINDOW *win, int attr)
#ifdef DEBUG
__CTRACE(__CTRACE_ATTR, "wattrset: win %p, attr %08x\n", win, attr);
#endif
+ wattr_off(win, __ATTRIBUTES, NULL);
wattr_on(win, (attr_t) attr, NULL);
- wattr_off(win,
- (attr_t) (~attr & ~__COLOR) | ((attr & __COLOR) ? 0 : __COLOR),
- NULL);
return OK;
}
@@ -1,7 +1,7 @@
-# $NetBSD: shlib_version,v 1.36 2004/03/28 08:59:15 jdc Exp $
+# $NetBSD: shlib_version,v 1.36.18.1 2007/05/28 14:17:55 blymn Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
# Remember to increment the major numbers of both libform and libmenu
# when the libcurses major number increments.
#
major=6
-minor=1
+minor=2

0 comments on commit e6ed49b

Please sign in to comment.