Changes in / [3fa0181:4fd211f]

Files:

• fmtext.c (modified) (7 diffs)
• functions.c (modified) (2 diffs)
• global.c (modified) (2 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• util.c (modified) (1 diff)

fmtext.c

@@ -184 +184 @@
 }
 
+static void _owl_fmtext_update_colorpair(short fg, short bg, short *pair)
+{
+  if (owl_global_get_hascolors(&g)) {
+    *pair = owl_fmtext_get_colorpair(fg, bg);
+  }
+}
+
 static void _owl_fmtext_wcolor_set(WINDOW *w, short pair)
 {
-  if (has_colors()) {
+  if (owl_global_get_hascolors(&g)) {
       wcolor_set(w,pair,NULL);
       wbkgdset(w, COLOR_PAIR(pair));
@@ -214 +221 @@
   bg = default_bgcolor;
   _owl_fmtext_wattrset(w, attr);
-  pair = owl_fmtext_get_colorpair(fg, bg);
+  _owl_fmtext_update_colorpair(fg, bg, &pair);
   _owl_fmtext_wcolor_set(w, pair);
 
@@ -263 +270 @@
       if (bg == OWL_COLOR_DEFAULT) bg = default_bgcolor;
       _owl_fmtext_wattrset(w, attr);
-      pair = owl_fmtext_get_colorpair(fg, bg);
+      _owl_fmtext_update_colorpair(fg, bg, &pair);
       _owl_fmtext_wcolor_set(w, pair);
 
@@ -655 +662 @@
            continue */
       } else if (!strcasecmp(buff, "@color") 
+                 && owl_global_get_hascolors(&g)
                  && owl_global_is_colorztext(&g)) {
         g_free(buff);
@@ -812 +820 @@
     }
   }
-  if (has_colors()) {
+  if (owl_global_get_hascolors(&g)) {
     for(i = 0; i < 8; i++) {
       short fg, bg;
@@ -827 +835 @@
   owl_colorpair_mgr *cpmgr;
   short pair;
-
-  if (!has_colors())
-    return 0;
 
   /* Sanity (Bounds) Check */
@@ -847 +852 @@
   if (!(pair != -1 && pair < cpmgr->next)) {
     /* If we didn't find a pair, search for a free one to assign. */
-    pair = (cpmgr->next < owl_util_get_colorpairs()) ? cpmgr->next : -1;
+    pair = (cpmgr->next < COLOR_PAIRS) ? cpmgr->next : -1;
     if (pair != -1) {
       /* We found a free pair, initialize it. */

functions.c

@@ -1817 +1817 @@
           owl_global_get_cols(&g));
 
-  if (has_colors()) {
+  if (owl_global_get_hascolors(&g)) {
     owl_fmtext_append_normal(&fm, "Color: Yes\n");
-    owl_fmtext_appendf_normal(&fm, "Number of color pairs: %i\n", owl_util_get_colorpairs());
+    owl_fmtext_appendf_normal(&fm, "Number of color pairs: %i\n", owl_global_get_colorpairs(&g));
     owl_fmtext_appendf_normal(&fm, "Can change colors: %s\n", can_change_color() ? "yes" : "no");
   } else {
@@ -2226 +2226 @@
     f = fl->data;
     owl_fmtext_append_normal(&fm, "   ");
-    owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f),
-                                   owl_filter_get_fgcolor(f),
-                                   owl_filter_get_bgcolor(f));
+    if (owl_global_get_hascolors(&g)) {
+      owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_fgcolor(f), owl_filter_get_bgcolor(f));
+    } else {
+      owl_fmtext_append_normal(&fm, owl_filter_get_name(f));
+    }
     owl_fmtext_append_normal(&fm, "\n");
   }

global.c

@@ -51 +51 @@
   g->direction=OWL_DIRECTION_DOWNWARDS;
   g->zaway=0;
+  if (has_colors()) {
+    g->hascolors=1;
+  }
+  g->colorpairs=COLOR_PAIRS;
   owl_fmtext_init_colorpair_mgr(&(g->cpmgr));
   g->debug=OWL_DEBUG;
@@ -570 +574 @@
 owl_view *owl_global_get_current_view(owl_global *g) {
   return(&(g->current_view));
+}
+
+/* has colors */
+
+int owl_global_get_hascolors(const owl_global *g) {
+  if (g->hascolors) return(1);
+  return(0);
+}
+
+/* color pairs */
+
+int owl_global_get_colorpairs(const owl_global *g) {
+  return(g->colorpairs);
 }
 

owl.c

@@ -444 +444 @@
   /* update the terminal if we need to */
   owl_window_redraw_scheduled();
-  /* On colorpair shortage, reset and redraw /everything/. NOTE: if we
-   * still overflow, this be useless work. With 8-colors, we get 64
-   * pairs. With 256-colors, we get 32768 pairs with ext-colors
-   * support and 256 otherwise. */
+  /* On colorpair shortage, reset and redraw /everything/. NOTE: if
+   * the current screen uses too many colorpairs, this draws
+   * everything twice. But this is unlikely; COLOR_PAIRS is 64 with
+   * 8+1 colors, and 256^2 with 256+1 colors. (+1 for default.) */
   cpmgr = owl_global_get_colorpair_mgr(&g);
   if (cpmgr->overflow) {
-    owl_function_debugmsg("colorpairs: used all %d pairs; reset pairs and redraw.",
-                          owl_util_get_colorpairs());
+    owl_function_debugmsg("colorpairs: color shortage; reset pairs and redraw. COLOR_PAIRS = %d", COLOR_PAIRS);
     owl_fmtext_reset_colorpairs(cpmgr);
     owl_function_full_redisplay();

owl.h

@@ -610 +610 @@
   char *startupargs;
   int nextmsgid;
+  int hascolors;
+  int colorpairs;
   owl_colorpair_mgr cpmgr;
   pid_t newmsgproc_pid;

util.c

@@ -715 +715 @@
 }
 
-int owl_util_get_colorpairs(void) {
-#ifndef NCURSES_EXT_COLORS
-  /* Without ext-color support (an ABI change), ncurses only supports 256
-   * different color pairs. However, it gives us a larger number even if your
-   * ncurses is compiled without ext-color. */
-  return MIN(COLOR_PAIRS, 256);
-#else
-  return COLOR_PAIRS;
-#endif
-}
-
 gulong owl_dirty_window_on_signal(owl_window *w, gpointer sender, const gchar *detailed_signal)
 {