X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fbase%2Flib_color.c;h=f0d2006b71ab9ce2a79849fc029a92a10ad4ac46;hb=b9cd971c38eeeb2394d3da08edfd3c5dfc71694e;hp=a5c181c8b4b140e60e492d00370d9b455fc5237a;hpb=11dead39816318fe9601e27756b9497caf7ff490;p=ncurses.git diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c index a5c181c8..f0d2006b 100644 --- a/ncurses/base/lib_color.c +++ b/ncurses/base/lib_color.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 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 * @@ -45,7 +45,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_color.c,v 1.98 2010/04/24 22:57:53 tom Exp $") +MODULE_ID("$Id: lib_color.c,v 1.103 2011/07/23 22:00:34 tom Exp $") #ifdef USE_TERM_DRIVER #define CanChange InfoOf(SP_PARM).canchange @@ -331,6 +331,13 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) default_bg(NCURSES_SP_ARG), NCURSES_SP_NAME(_nc_outch)); } +#if !NCURSES_EXT_COLORS + /* + * Without ext-colors, we cannot represent more than 256 color pairs. + */ + if (maxpairs > 256) + maxpairs = 256; +#endif if (maxpairs > 0 && maxcolors > 0) { SP_PARM->_pair_limit = maxpairs; @@ -439,7 +446,7 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx short pair, short f, short b) previous = SP_PARM->_color_pairs[pair]; #if NCURSES_EXT_FUNCS - if (SP_PARM->_default_color) { + if (SP_PARM->_default_color || SP_PARM->_assumed_color) { bool isDefault = FALSE; bool wasDefault = FALSE; int default_pairs = SP_PARM->_default_pairs; @@ -498,8 +505,9 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx short pair, short f, short b) { if ((f < 0) || !OkColorHi(f) || (b < 0) || !OkColorHi(b) - || (pair < 1)) + || (pair < 1)) { returnCode(ERR); + } } /* @@ -628,8 +636,15 @@ init_color(short color, short r, short g, short b) NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL) { + int result = FALSE; + T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM)); - returnCode((CanChange != 0) ? TRUE : FALSE); + + if (HasTerminal(SP_PARM) && (CanChange != 0)) { + result = TRUE; + } + + returnCode(result); } #if NCURSES_SP_FUNCS @@ -643,20 +658,22 @@ can_change_color(void) NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) { - int code; + int code = FALSE; (void) SP_PARM; T((T_CALLED("has_colors()"))); + if (HasTerminal(SP_PARM)) { #ifdef USE_TERM_DRIVER - code = HasColor; + code = HasColor; #else - code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) - && (((set_foreground != NULL) - && (set_background != NULL)) - || ((set_a_foreground != NULL) - && (set_a_background != NULL)) - || set_color_pair)) ? TRUE : FALSE); + code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) + && (((set_foreground != NULL) + && (set_background != NULL)) + || ((set_a_foreground != NULL) + && (set_a_background != NULL)) + || set_color_pair)) ? TRUE : FALSE); #endif + } returnCode(code); }