Changeset 8fa9562 for mainwin.c

Timestamp:

Jan 20, 2007, 9:49:55 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

575877f

Parents:

212764e

Message:

Added background color support to owl.

If we run out of color pairs during a painting of the screen, further
background colors will be silently dropped. I'm hoping this doesn't
happen often. The used pair list is reset with each draw, so only
what's actually on screen matters.

File:

• mainwin.c (modified) (6 diffs)

mainwin.c

@@ -14 +14 @@
   int i, p, q, lines, isfull, viewsize;
   int x, y, savey, recwinlines, start;
-  int topmsg, curmsg, color;
+  int topmsg, curmsg, fgcolor, bgcolor;
   WINDOW *recwin;
   owl_view *v;
@@ -24 +24 @@
   curmsg=owl_global_get_curmsg(&g);
   v=owl_global_get_current_view(&g);
+  owl_fmtext_reset_colorpairs();
 
   if (v==NULL) {
@@ -72 +73 @@
 
     /* if we match filters set the color */
-    color=OWL_COLOR_DEFAULT;
+    fgcolor=OWL_COLOR_DEFAULT;
+    bgcolor=OWL_COLOR_DEFAULT;
     filtlist=owl_global_get_filterlist(&g);
     q=owl_list_get_size(filtlist);
@@ -78 +80 @@
       f=owl_list_get_element(filtlist, p);
       if (owl_filter_message_match(f, m)) {
-        if (owl_filter_get_color(f)!=OWL_COLOR_DEFAULT) color=owl_filter_get_color(f);
+        if (owl_filter_get_fgcolor(f)!=OWL_COLOR_DEFAULT) fgcolor=owl_filter_get_fgcolor(f);
+        if (owl_filter_get_bgcolor(f)!=OWL_COLOR_DEFAULT) bgcolor=owl_filter_get_bgcolor(f);
       }
     }
@@ -92 +95 @@
                                owl_global_get_rightshift(&g),
                                owl_global_get_cols(&g)+owl_global_get_rightshift(&g)-1,
-                               color);
+                               fgcolor, bgcolor);
     } else {
       /* otherwise print the whole thing */
@@ -100 +103 @@
                                owl_global_get_rightshift(&g),
                                owl_global_get_cols(&g)+owl_global_get_rightshift(&g)-1,
-                               color);
+                               fgcolor, bgcolor);
     }