ncurses 5.9 - patch 20121026

[ncurses.git] / ncurses / base / lib_color.c

diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index 50d580ec72266561ee4330c020deda58b75e1eae..0a68e309fcfb039eba45da6bc630a050f698cfc7 100644 (file)
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *
  *                                                                          *
  * 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
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_color.c,v 1.101 2011/05/28 21:57:59 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.105 2012/06/09 20:34:11 tom Exp $")

 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
 
 #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));
        }
                                 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;
 
        if (maxpairs > 0 && maxcolors > 0) {
            SP_PARM->_pair_limit = maxpairs;


@@ -383,10 +390,10 @@ start_color(void)
 
 /* This function was originally written by Daniel Weaver <danw@znyx.com> */
 static void
 
 /* This function was originally written by Daniel Weaver <danw@znyx.com> */
 static void

-rgb2hls(short r, short g, short b, short *h, short *l, short *s)
+rgb2hls(int r, int g, int b, short *h, short *l, short *s)

 /* convert RGB to HLS system */
 {
 /* convert RGB to HLS system */
 {

-    short min, max, t;
+    int min, max, t;

 
     if ((min = g < r ? g : r) > b)
        min = b;
 
     if ((min = g < r ? g : r) > b)
        min = b;


@@ -416,7 +423,7 @@ rgb2hls(short r, short g, short b, short *h, short *l, short *s)
     else
        t = (short) (360 + ((r - g) * 60) / (max - min));
 
     else
        t = (short) (360 + ((r - g) * 60) / (max - min));
 

-    *h = t % 360;
+    *h = (short) (t % 360);

 }
 
 /*
 }
 
 /*


@@ -741,8 +748,8 @@ NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx
     if (!ValidPair(pair)) {
        result = ERR;
     } else {
     if (!ValidPair(pair)) {
        result = ERR;
     } else {

-       NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]);
-       NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]);
+       NCURSES_COLOR_T fg = (NCURSES_COLOR_T) FORE_OF(SP_PARM->_color_pairs[pair]);
+       NCURSES_COLOR_T bg = (NCURSES_COLOR_T) BACK_OF(SP_PARM->_color_pairs[pair]);

 
 #if NCURSES_EXT_FUNCS
        if (fg == COLOR_DEFAULT)
 
 #if NCURSES_EXT_FUNCS
        if (fg == COLOR_DEFAULT)


@@ -775,9 +782,9 @@ pair_content(short pair, short *f, short *b)
 
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx

-                              short old_pair,
-                              short pair,
-                              bool reverse,
+                              int old_pair,
+                              int pair,
+                              int reverse,

                               NCURSES_SP_OUTC outc)
 {
 #ifdef USE_TERM_DRIVER
                               NCURSES_SP_OUTC outc)
 {
 #ifdef USE_TERM_DRIVER


@@ -803,7 +810,7 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 
     if (old_pair >= 0
        && SP_PARM != 0
 
     if (old_pair >= 0
        && SP_PARM != 0

-       && pair_content(old_pair, &old_fg, &old_bg) != ERR) {
+       && pair_content((short) old_pair, &old_fg, &old_bg) != ERR) {

        if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
            || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
 #if NCURSES_EXT_FUNCS
        if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
            || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
 #if NCURSES_EXT_FUNCS


@@ -857,7 +864,7 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(void)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(void)

-_nc_do_color(short old_pair, short pair, bool reverse, NCURSES_OUTC outc)
+_nc_do_color(int old_pair, int pair, int reverse, NCURSES_OUTC outc)

 {
     SetSafeOutcWrapper(outc);
     NCURSES_SP_NAME(_nc_do_color) (CURRENT_SCREEN,
 {
     SetSafeOutcWrapper(outc);
     NCURSES_SP_NAME(_nc_do_color) (CURRENT_SCREEN,