Changeset d98e501

Timestamp:

Jul 24, 2011, 3:42:52 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

release-1.8

Children:

efef058

Parents:

a71b4e0

git-author:

David Benjamin <davidben@mit.edu> (07/24/11 15:37:54)

git-committer:

David Benjamin <davidben@mit.edu> (07/24/11 15:42:52)

Message:

Workaround color-pairs and broken build on Solaris locker build

This reverts commit a71b4e049b7d1a44ddd3f918e67c45e2f8bbef2f. Really
should have verified the Solaris build first. Everything is ready for us
to not need this change, but the locker build of ncurses needs to be
updated. In the meantime, hack around the bug by clamping color pairs.

Also revert wbkgrndset because it requires cchar_t. That gets defined on
_XOPEN_SOURCE_EXTENDED or _XOPEN_SOURCE>=500. Unfortunately, the check
for the latter was added after the locker version, and Solaris is a
stickler about flags so _XOPEN_SOURCE>=500 and _XOPEN_SOURCE_EXTENDED
conflict.

Revert this change when we bundle a newer ncurses.

Files:

• fmtext.c (modified) (1 diff)
• util.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);
-      /* 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);
+      wcolor_set(w,pair,NULL);
+      wbkgdset(w, COLOR_PAIR(pair));
   }
 }

util.c

@@ -732 +732 @@
   return MIN(COLOR_PAIRS, 256);
 #else
-  return COLOR_PAIRS;
+  /* In theory ext-color support should allow for 256 color pairs, but there's
+   * a bug in ncurses. The fix is now upstreamed. The commit which introduced
+   * this change (and simultaneously reverted the wbkgrndset change to fix the
+   * build on Solaris) should be reverted when we ship a new locker ncurses. */
+  return MIN(COLOR_PAIRS, 256);
 #endif
 }