ncurses 6.1 - patch 20190406

[ncurses.git] / ncurses / new_pair.h

diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index 4df40c6fcd14aa99eabacae7c7b91627f4d4c5c3..49828d4a7725010d92935841baf5d064383f520e 100644 (file)
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2017,2018 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            *


@@ -33,25 +33,27 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *

- * $Id: new_pair.h,v 1.5 2017/04/02 14:46:34 tom Exp $
+ * $Id: new_pair.h,v 1.9 2018/03/01 15:02:12 tom Exp $

  */
 
 #ifndef NEW_PAIR_H
 #define NEW_PAIR_H 1
 /* *INDENT-OFF* */
 
  */
 
 #ifndef NEW_PAIR_H
 #define NEW_PAIR_H 1
 /* *INDENT-OFF* */
 

-#define USE_NEW_PAIR NCURSES_EXT_COLORS
-
-#define LIMIT_TYPED(n,t) (t)(((t)(n) < 0) ? MAX_OF_TYPE(t) : (n))
+#define LIMIT_TYPED(n,t) \
+       (t)(((n) > MAX_OF_TYPE(t)) \
+           ? MAX_OF_TYPE(t) \
+           : ((n) < -MAX_OF_TYPE(t)) \
+              ? -MAX_OF_TYPE(t) \
+              : (n))

 
 #define limit_COLOR(n) LIMIT_TYPED(n,NCURSES_COLOR_T)
 #define limit_PAIRS(n) LIMIT_TYPED(n,NCURSES_PAIRS_T)
 
 #define MAX_XCURSES_PAIR MAX_OF_TYPE(NCURSES_PAIRS_T)
 
 
 #define limit_COLOR(n) LIMIT_TYPED(n,NCURSES_COLOR_T)
 #define limit_PAIRS(n) LIMIT_TYPED(n,NCURSES_PAIRS_T)
 
 #define MAX_XCURSES_PAIR MAX_OF_TYPE(NCURSES_PAIRS_T)
 

-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS

 #define OPTIONAL_PAIR  GCC_UNUSED
 #define OPTIONAL_PAIR  GCC_UNUSED

-#define USE_NEW_PAIR NCURSES_EXT_COLORS

 #define get_extended_pair(opts, color_pair) \
        if ((opts) != NULL) { \
            *(int*)(opts) = color_pair; \
 #define get_extended_pair(opts, color_pair) \
        if ((opts) != NULL) { \
            *(int*)(opts) = color_pair; \


@@ -62,7 +64,6 @@
        }
 #else
 #define OPTIONAL_PAIR  /* nothing */
        }
 #else
 #define OPTIONAL_PAIR  /* nothing */

-#define USE_NEW_PAIR NCURSES_EXT_COLORS

 #define get_extended_pair(opts, color_pair) /* nothing */
 #define set_extended_pair(opts, color_pair) \
        if ((opts) != NULL) { \
 #define get_extended_pair(opts, color_pair) /* nothing */
 #define set_extended_pair(opts, color_pair) \
        if ((opts) != NULL) { \


@@ -83,7 +84,7 @@ typedef struct _color_pairs
 {
     int fg;
     int bg;
 {
     int fg;
     int bg;

-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS

     int mode;                  /* tells if the entry is allocated or free */
     int prev;                  /* index of previous item */
     int next;                  /* index of next item */
     int mode;                  /* tells if the entry is allocated or free */
     int prev;                  /* index of previous item */
     int next;                  /* index of next item */


@@ -103,12 +104,15 @@ colorpair_t;
 #define ValidPair(sp,pair) \
     ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
 
 #define ValidPair(sp,pair) \
     ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
 

-#if USE_NEW_PAIR
-extern NCURSES_EXPORT(void)     _nc_set_color_pair(SCREEN*, int, int);
+#if NCURSES_EXT_COLORS
+extern NCURSES_EXPORT(void)     _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int);
+extern NCURSES_EXPORT(void)     _nc_free_ordered_pairs(SCREEN*);

 extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, colorpair_t*);
 extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, colorpair_t*);

+extern NCURSES_EXPORT(void)     _nc_set_color_pair(SCREEN*, int, int);

 #else
 #else

-#define _nc_set_color_pair(sp, pair, mode) /* nothing */
+#define _nc_free_ordered_pairs(sp) /* nothing */

 #define _nc_reset_color_pair(sp, pair, data) /* nothing */
 #define _nc_reset_color_pair(sp, pair, data) /* nothing */

+#define _nc_set_color_pair(sp, pair, mode) /* nothing */

 #endif
 
 #else
 #endif
 
 #else