diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:18:07 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:18:07 +0000 |
| commit | a0044ffc69cfe39a3b0b2d208e0952254555afc6 (patch) | |
| tree | 7b2d708d03277cdd2560e9ce6572bdafc2e58bab /ncurses/base/lib_slkattr.c | |
| parent | 4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (diff) | |
| download | src-a0044ffc69cfe39a3b0b2d208e0952254555afc6.tar.gz src-a0044ffc69cfe39a3b0b2d208e0952254555afc6.zip | |
Redo import of ncurses 5.9 (stripped).vendor/ncurses/5.9-20110404_stripped
Notes
Notes:
svn path=/vendor/ncurses/dist/; revision=262617
svn path=/vendor/ncurses/5.9-20110404_stripped/; revision=262631; tag=vendor/ncurses/5.9-20110404_stripped
Diffstat (limited to 'ncurses/base/lib_slkattr.c')
| -rw-r--r-- | ncurses/base/lib_slkattr.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c index da82ee5b623e..bec11e84c667 100644 --- a/ncurses/base/lib_slkattr.c +++ b/ncurses/base/lib_slkattr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2010 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 * @@ -38,19 +38,27 @@ */ #include <curses.priv.h> -MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $") +MODULE_ID("$Id: lib_slkattr.c,v 1.11 2010/12/20 01:41:25 tom Exp $") NCURSES_EXPORT(attr_t) -slk_attr(void) +NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0) { - T((T_CALLED("slk_attr()"))); + T((T_CALLED("slk_attr(%p)"), (void *) SP_PARM)); - if (SP != 0 && SP->_slk != 0) { - attr_t result = AttrOf(SP->_slk->attr) & ALL_BUT_COLOR; - int pair = GetPair(SP->_slk->attr); + if (SP_PARM != 0 && SP_PARM->_slk != 0) { + attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR; + int pair = GetPair(SP_PARM->_slk->attr); - result |= COLOR_PAIR(pair); + result |= (attr_t) ColorPair(pair); returnAttr(result); } else returnAttr(0); } + +#if NCURSES_SP_FUNCS +NCURSES_EXPORT(attr_t) +slk_attr(void) +{ + return NCURSES_SP_NAME(slk_attr) (CURRENT_SCREEN); +} +#endif |