Changeset 0331c8f

Timestamp:

Jan 24, 2007, 2:23:32 AM (18 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:

99c7549

Parents:

eeeef20

Message:

Further simplifications.

File:

• fmtext.c (modified) (3 diffs)

fmtext.c

@@ -663 +663 @@
   // This could be a bitarray if we wanted to save memory.
   int i, j, colors;
-  cpmgr->used = owl_malloc(COLOR_PAIRS * sizeof(char));
-  memset(cpmgr->used, 0, COLOR_PAIRS * sizeof(char));
+  cpmgr->next = COLORS;
 
   colors = COLORS + 1; // 1 to account for "default".
@@ -683 +682 @@
   int i, j, colors;
   owl_colorpair_mgr *cpmgr = owl_global_get_colorpair_mgr(&g);
-  memset(cpmgr->used, 0, COLOR_PAIRS * sizeof(char));  
+  cpmgr->next = COLORS;
 
   colors = COLORS + 1; // 1 to account for "default".
@@ -715 +714 @@
     cpmgr = owl_global_get_colorpair_mgr(&g);
     pair = cpmgr->pairs[fg+1][bg];
-    if (!(pair != -1 && cpmgr->used[pair])) {
+    if (!(pair != -1 && pair < cpmgr->next)) {
       // If we didn't find a pair, search for a free one to assign.
       // Skip the first COLORS, since they're static.
       // If we ever get 256 color curses, this will need more thought.
-      for(i = COLORS; i < COLOR_PAIRS; i++) {
-        if (!cpmgr->used[i]) {
-          // Found a free pair
-          pair = i;
-          break;
-        }
-      }
+      pair = (cpmgr->next < COLOR_PAIRS) ? cpmgr->next : -1;
       if (pair != -1) {
         // We found a free pair, initialize it.
         init_pair(pair, fg, bg);
         cpmgr->pairs[fg+1][bg] = pair;
-        cpmgr->used[pair] = 1;
+        cpmgr->next++;
       } else {
         // We still don't have a pair, drop the background color. Too bad.