Changeset 22662d7

Timestamp:

Feb 4, 2011, 5:33:22 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

release-1.7

Children:

27705b65

Parents:

b1ed3e2

git-author:

David Benjamin <davidben@mit.edu> (01/25/11 17:27:10)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 17:33:22)

Message:

Don't reset colorpairs in the middle of drawing

Resetting colorpairs while drawing the mainwin causes the existing
contents in a popwin to refer to invalid color pairs. We used to draw
the mainwin first and redraw the contents of each window from scratch.
Moving to libpanel in 1.6 changed this, so background colors
occasionally bled into your popwin.

This changes the colorpair logic to only trigger when we need to, and to
forcibly dirty every window if needed. NOTE: if we don't have enough
color-pairs to draw the current screen, this will draw everything twice.
But it will probably almost never happen.

Reported-by: Alex Dehnert <adehnert@mit.edu>
Reviewed-by: Alejandro R. Sedeño <asedeno@mit.edu>

Files:

• fmtext.c (modified) (3 diffs)
• mainwin.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)

fmtext.c

@@ -925 +925 @@
   short i, j;
 
+  cpmgr->overflow = false;
   cpmgr->next = 8;
-    /* The test is <= because we allocated COLORS+1 entries. */
+  /* The test is <= because we allocated COLORS+1 entries. */
   for(i = 0; i <= COLORS; i++) {
     for(j = 0; j <= COLORS; j++) {
@@ -974 +975 @@
       /* We still don't have a pair, drop the background color. Too bad. */
       owl_function_debugmsg("colorpairs: color shortage - dropping background color.");
+      cpmgr->overflow = true;
       pair = owl_fmtext_get_colorpair(fg, OWL_COLOR_DEFAULT);
     }
@@ -979 +981 @@
       /* We still don't have a pair, defaults all around. */
       owl_function_debugmsg("colorpairs: color shortage - dropping foreground and background color.");
+      cpmgr->overflow = true;
       pair = 0;
     }

mainwin.c

@@ -53 +53 @@
   markedmsgid = owl_global_get_markedmsgid(&g);
   v = owl_global_get_current_view(&g);
-  owl_fmtext_reset_colorpairs(owl_global_get_colorpair_mgr(&g));
 
   if (v==NULL) {

owl.c

@@ -444 +444 @@
 static int owl_refresh_pre_select_action(owl_ps_action *a, void *data)
 {
+  owl_colorpair_mgr *cpmgr;
+
   /* if a resize has been scheduled, deal with it */
   owl_global_check_resize(&g);
   /* update the terminal if we need to */
   owl_window_redraw_scheduled();
+  /* 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: color shortage; reset pairs and redraw. COLOR_PAIRS = %d", COLOR_PAIRS);
+    owl_fmtext_reset_colorpairs(cpmgr);
+    owl_function_full_redisplay();
+    owl_window_redraw_scheduled();
+  }
   return 0;
 }

owl.h

@@ -549 +549 @@
   int next;
   short **pairs;
+  bool overflow;
 } owl_colorpair_mgr;