Changeset e062f97

Timestamp:

Feb 4, 2011, 5:32:37 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

099597c

Parents:

4d24650

git-author:

David Benjamin <davidben@mit.edu> (01/25/11 16:58:31)

git-committer:

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

Message:

Refactor some common code in colorpair_mgr

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

Files:

• fmtext.c (modified) (2 diffs)
• mainwin.c (modified) (1 diff)

fmtext.c

@@ -862 +862 @@
 {
   /* This could be a bitarray if we wanted to save memory. */
-  short i, j;
-  cpmgr->next = 8;
-  
+  short i;
   /* The test is <= because we allocate COLORS+1 entries. */
   cpmgr->pairs = owl_malloc((COLORS+1) * sizeof(short*));
   for(i = 0; i <= COLORS; i++) {
     cpmgr->pairs[i] = owl_malloc((COLORS+1) * sizeof(short));
+  }
+  owl_fmtext_reset_colorpairs(cpmgr);
+}
+
+/* Reset used list */
+void owl_fmtext_reset_colorpairs(owl_colorpair_mgr *cpmgr)
+{
+  short i, j;
+
+  cpmgr->next = 8;
+    /* The test is <= because we allocated COLORS+1 entries. */
+  for(i = 0; i <= COLORS; i++) {
     for(j = 0; j <= COLORS; j++) {
       cpmgr->pairs[i][j] = -1;
@@ -874 +884 @@
   }
   if (owl_global_get_hascolors(&g)) {
-    for(i = 0; i < 8; i++) {
-      short fg, bg;
-      if (i >= COLORS) continue;
-      pair_content(i, &fg, &bg);
-      cpmgr->pairs[fg+1][bg+1] = i;
-    }
-  }
-}
-
-/* Reset used list */
-void owl_fmtext_reset_colorpairs(void)
-{
-  if (owl_global_get_hascolors(&g)) {
-    short i, j;
-    owl_colorpair_mgr *cpmgr = owl_global_get_colorpair_mgr(&g);
-    cpmgr->next = 8;
-    
-    /* The test is <= because we allocated COLORS+1 entries. */
-    for(i = 0; i <= COLORS; i++) {
-      for(j = 0; j <= COLORS; j++) {
-        cpmgr->pairs[i][j] = -1;
-      }
-    }
     for(i = 0; i < 8; i++) {
       short fg, bg;

mainwin.c

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