X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftty%2Flib_vidattr.c;h=4e2184bc86826c85629b8d87822b4c85cabeb408;hp=83b6dbdf86115027e327537ce8e372dac5e6df18;hb=d1a026123ac051716cdc16278345c1fb5c843b79;hpb=d998cb49bfb53bd99900fd4ed94519579bea99de diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c index 83b6dbdf..4e2184bc 100644 --- a/ncurses/tty/lib_vidattr.c +++ b/ncurses/tty/lib_vidattr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2011 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,11 +64,16 @@ */ #include -#include -MODULE_ID("$Id: lib_vidattr.c,v 1.53 2009/05/02 22:35:03 tom Exp $") +#ifndef CUR +#define CUR SP_TERMTYPE +#endif + +MODULE_ID("$Id: lib_vidattr.c,v 1.62 2011/05/28 21:22:04 tom Exp $") -#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) +#define doPut(mode) \ + TPUTS_TRACE(#mode); \ + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc) #define TurnOn(mask,mode) \ if ((turn_on & mask) && mode) { doPut(mode); } @@ -79,12 +84,15 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.53 2009/05/02 22:35:03 tom Exp $") /* if there is no current screen, assume we *can* do color */ #define SetColorsIf(why,old_attr) \ if (can_color && (why)) { \ - int old_pair = PAIR_NUMBER(old_attr); \ + int old_pair = PairNumber(old_attr); \ TR(TRACE_ATTRS, ("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(old_pair, pair, reverse, outc); \ + NCURSES_SP_NAME(_nc_do_color)(NCURSES_SP_ARGx \ + (short) old_pair, \ + (short) pair, \ + reverse, outc); \ } \ } @@ -93,7 +101,7 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.53 2009/05/02 22:35:03 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx chtype newmode, - int (*outc) (int)) + NCURSES_SP_OUTC outc) { attr_t turn_on, turn_off; int pair; @@ -106,7 +114,11 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx #endif newmode &= A_ATTRIBUTES; - T((T_CALLED("vidputs(%s)"), _traceattr(newmode))); + + T((T_CALLED("vidputs(%p,%s)"), (void *) SP_PARM, _traceattr(newmode))); + + if (!IsTermInfo(SP_PARM)) + returnCode(ERR); /* this allows us to go on whether or not newterm() has been called */ if (SP_PARM) @@ -175,7 +187,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx * A_ALTCHARSET (256) down 2 to line up. We use the NCURSES_BITS * macro so this will work properly for the wide-character layout. */ - unsigned value = no_color_video; + unsigned value = (unsigned) no_color_video; attr_t mask = NCURSES_BITS((value & 63) | ((value & 192) << 1) | ((value & 256) >> 2), 8); @@ -191,7 +203,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx if (newmode == PreviousAttr) returnCode(OK); - pair = PAIR_NUMBER(newmode); + pair = PairNumber(newmode); if (reverse) { newmode &= ~A_REVERSE; @@ -225,16 +237,18 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx } else if (set_attributes) { 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); + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx + 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); PreviousAttr &= ALL_BUT_COLOR; } SetColorsIf((pair != 0) || fix_pair0, PreviousAttr); @@ -293,26 +307,31 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx returnCode(OK); } +#if NCURSES_SP_FUNCS NCURSES_EXPORT(int) -NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx - chtype newmode) +vidputs(chtype newmode, NCURSES_OUTC outc) { - return NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx newmode, _nc_outch); + SetSafeOutcWrapper(outc); + return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN, + newmode, + _nc_outc_wrapper); } +#endif -#if NCURSES_SP_FUNCS NCURSES_EXPORT(int) -vidputs(chtype newmode, int (*outc) (int)) +NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx chtype newmode) { - return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN, newmode, outc); + T((T_CALLED("vidattr(%p,%s)"), (void *) SP_PARM, _traceattr(newmode))); + returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx + newmode, + NCURSES_SP_NAME(_nc_outch))); } +#if NCURSES_SP_FUNCS NCURSES_EXPORT(int) vidattr(chtype newmode) { - T((T_CALLED("vidattr(%s)"), _traceattr(newmode))); - - returnCode(vidputs(newmode, _nc_outch)); + return NCURSES_SP_NAME(vidattr) (CURRENT_SCREEN, newmode); } #endif @@ -321,37 +340,45 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0) { chtype attrs = A_NORMAL; - T((T_CALLED("termattrs()"))); - if (enter_alt_charset_mode) - attrs |= A_ALTCHARSET; + T((T_CALLED("termattrs(%p)"), (void *) SP_PARM)); + + if (HasTerminal(SP_PARM)) { +#ifdef USE_TERM_DRIVER + attrs = CallDriver(SP_PARM, conattr); +#else - if (enter_blink_mode) - attrs |= A_BLINK; + if (enter_alt_charset_mode) + attrs |= A_ALTCHARSET; - if (enter_bold_mode) - attrs |= A_BOLD; + if (enter_blink_mode) + attrs |= A_BLINK; - if (enter_dim_mode) - attrs |= A_DIM; + if (enter_bold_mode) + attrs |= A_BOLD; - if (enter_reverse_mode) - attrs |= A_REVERSE; + if (enter_dim_mode) + attrs |= A_DIM; - if (enter_standout_mode) - attrs |= A_STANDOUT; + if (enter_reverse_mode) + attrs |= A_REVERSE; - if (enter_protected_mode) - attrs |= A_PROTECT; + if (enter_standout_mode) + attrs |= A_STANDOUT; - if (enter_secure_mode) - attrs |= A_INVIS; + if (enter_protected_mode) + attrs |= A_PROTECT; - if (enter_underline_mode) - attrs |= A_UNDERLINE; + if (enter_secure_mode) + attrs |= A_INVIS; - if (SP_PARM->_coloron) - attrs |= A_COLOR; + if (enter_underline_mode) + attrs |= A_UNDERLINE; + if (SP_PARM->_coloron) + attrs |= A_COLOR; + +#endif + } returnChtype(attrs); }