Changeset 7abfcf2 for fmtext.c

Timestamp:

Jul 24, 2011, 2:32:14 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

15a7aee, 40de7394, 2994ca2

Parents:

3234121

git-author:

David Benjamin <davidben@mit.edu> (07/16/11 22:33:34)

git-committer:

David Benjamin <davidben@mit.edu> (07/24/11 14:32:14)

Message:

Use wbkgrndset instead of wbkgdset in _owl_fmtext_wcolor_set

This allows color pairs past 255 in an ext-color-enabled build to work.
In theory anyway. Turns out ncurses is buggy and setcchar doesn't work,
but when the patch is accepted upstream we can update the ncurses in the
locker.

File:

• fmtext.c (modified) (1 diff)

fmtext.c

@@ -186 +186 @@
 static void _owl_fmtext_wcolor_set(WINDOW *w, short pair)
 {
+  cchar_t background;
+  wchar_t blank[2] = { ' ', 0 };
   if (has_colors()) {
-      wcolor_set(w,pair,NULL);
-      wbkgdset(w, COLOR_PAIR(pair));
+      wcolor_set(w, pair, NULL);
+      /* Set the background with wbkgrndset so that we can handle color-pairs
+       * past 256 on ncurses ABI 6 and later. */
+      setcchar(&background, blank, 0, pair, NULL);
+      wbkgrndset(w, &background);
   }
 }