/****************************************************************************
- * Copyright (c) 2017 Free Software Foundation, Inc. *
+ * Copyright 2018-2019,2020 Thomas E. Dickey *
+ * Copyright 2017 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 *
#define MaxColors max_colors
#endif
-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS
/* fix redefinition versys tic.h */
#undef entry
#endif
-MODULE_ID("$Id: new_pair.c,v 1.8 2017/03/10 09:22:50 tom Exp $")
+MODULE_ID("$Id: new_pair.c,v 1.20 2020/04/11 16:06:56 tom Exp $")
-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS
#ifdef NEW_PAIR_DEBUG
char bigbuf[256 * 20];
char *p = bigbuf;
int n;
- sprintf(p, "%s", tag);
- p += strlen(p);
+ size_t have = sizeof(bigbuf);
+
+ _nc_STRCPY(p, tag, have);
for (n = 0; n < sp->_pair_limit; ++n) {
if (list[n].mode != cpFREE) {
- sprintf(p, " %d%c(%d,%d)",
- n, n == pair ? '@' : ':', list[n].next, list[n].prev);
p += strlen(p);
+ if ((size_t) (p - bigbuf) + 50 > have)
+ break;
+ _nc_SPRINTF(p, _nc_SLIMIT(have - (p - bigbuf))
+ " %d%c(%d,%d)",
+ n, n == pair ? '@' : ':', list[n].next, list[n].prev);
}
}
T(("(%d/%d) %ld - %s",
if (next_len(sp, 0) != prev_len(sp, 0)) {
endwin();
- exit(1);
+ ExitProgram(EXIT_FAILURE);
}
}
#else
_nc_find_color_pair(SCREEN *sp, int fg, int bg)
{
colorpair_t find;
- int result;
+ int result = -1;
void *pp;
find.fg = fg;
find.bg = bg;
- if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
- colorpair_t *temp = *(colorpair_t **) pp;
- result = (int) (temp - sp->_color_pairs);
- } else {
- result = -1;
+ if (sp != 0) {
+ if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
+ colorpair_t *temp = *(colorpair_t **) pp;
+ result = (int) (temp - sp->_color_pairs);
+ }
}
return result;
}
}
}
+/*
+ * Discard all nodes in the fast-index.
+ */
+NCURSES_EXPORT(void)
+_nc_free_ordered_pairs(SCREEN *sp)
+{
+ if (sp && sp->_ordered_pairs && sp->_pair_alloc) {
+ int n;
+ for (n = 0; n < sp->_pair_alloc; ++n) {
+ tdelete(&sp->_color_pairs[n], &sp->_ordered_pairs, compare_data);
+ }
+ }
+}
+
/*
* Use this call to update the fast-index when modifying an entry in the color
* pair table.
NCURSES_EXPORT(void)
_nc_reset_color_pair(SCREEN *sp, int pair, colorpair_t * next)
{
+ colorpair_t *last;
+
if (ValidPair(sp, pair)) {
- colorpair_t *last = &(sp->_color_pairs[pair]);
+ bool used;
+
+ ReservePairs(sp, pair);
+ last = &(sp->_color_pairs[pair]);
delink_color_pair(sp, pair);
if (last->mode > cpFREE &&
(last->fg != next->fg || last->bg != next->bg)) {
/* remove the old entry from fast index */
tdelete(last, &sp->_ordered_pairs, compare_data);
+ used = FALSE;
+ } else {
+ used = (last->mode != cpFREE);
+ }
+ if (!used) {
/* create a new entry in fast index */
*last = *next;
tsearch(last, &sp->_ordered_pairs, compare_data);
}
}
+/*
+ * If we reallocate the color-pair array, we have to adjust the fast-index.
+ */
+NCURSES_EXPORT(void)
+_nc_copy_pairs(SCREEN *sp, colorpair_t * target, colorpair_t * source, int length)
+{
+ int n;
+ for (n = 0; n < length; ++n) {
+ void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
+ if (find != 0) {
+ tdelete(source + n, &sp->_ordered_pairs, compare_data);
+ tsearch(target + n, &sp->_ordered_pairs, compare_data);
+ }
+ }
+}
+
NCURSES_EXPORT(int)
NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg)
{
int pair;
T((T_CALLED("alloc_pair(%d,%d)"), fg, bg));
- if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) {
+ if (SP_PARM == 0) {
+ pair = -1;
+ } else if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) {
/*
* Check if all of the slots have been used. If not, find one and
* use that.
* The linear search is done to allow mixing calls to init_pair()
* and alloc_pair(). The former can make gaps...
*/
- for (pair = hint + 1; pair < SP_PARM->_pair_limit; pair++) {
+ for (pair = hint + 1; pair < SP_PARM->_pair_alloc; pair++) {
if (SP_PARM->_color_pairs[pair].mode == cpFREE) {
T(("found gap %d", pair));
found = TRUE;
break;
}
}
+ if (!found && (SP_PARM->_pair_alloc < SP_PARM->_pair_limit)) {
+ pair = SP_PARM->_pair_alloc;
+ ReservePairs(SP_PARM, pair);
+ if (SP_PARM->_color_pairs == 0) {
+ pair = -1;
+ } else {
+ found = TRUE;
+ }
+ }
if (!found) {
for (pair = 1; pair <= hint; pair++) {
if (SP_PARM->_color_pairs[pair].mode == cpFREE) {
T(("reusing %d", pair));
}
- if (pair > 0 && pair <= MAX_XCURSES_PAIR) {
- IGNORE_RC(init_pair((short)pair, (short)fg, (short)bg));
- } else {
+ if (_nc_init_pair(SP_PARM, pair, fg, bg) == ERR)
pair = ERR;
- }
}
returnCode(pair);
}
{
int result = ERR;
T((T_CALLED("free_pair(%d)"), pair));
- if (ValidPair(SP_PARM, pair)) {
+ if (ValidPair(SP_PARM, pair) && pair < SP_PARM->_pair_alloc) {
colorpair_t *cp = &(SP_PARM->_color_pairs[pair]);
if (pair != 0) {
_nc_change_pair(SP_PARM, pair);
void
_nc_new_pair(void)
{
-};
-#endif /* USE_NEW_PAIR */
+}
+#endif /* NCURSES_EXT_COLORS */