Changeset d754b0a

Timestamp:

Apr 19, 2007, 12:06:43 AM (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:

4099cf8

Parents:

85d1795

Message:

Fix a bug reported by ike (among others) about colors leaking past
@()'s.  Color is now contained by any currently recognized non-color
zephyr formatting command (b, bold, i, italic), as well as a noop
formatting command @().

File:

• fmtext.c (modified) (6 diffs)

fmtext.c

@@ -453 +453 @@
   int stacksize, curattrs, curcolor;
   char *ptr, *txtptr, *buff, *tmpptr;
-  int attrstack[32], chrstack[32];
+  int attrstack[32], chrstack[32], colorstack[32];
 
   curattrs=OWL_FMTEXT_ATTR_NONE;
@@ -508 +508 @@
         attrstack[stacksize]=OWL_FMTEXT_ATTR_BOLD;
         chrstack[stacksize]=tmpptr[0];
+        colorstack[stacksize]=curcolor;
         stacksize++;
         curattrs|=OWL_FMTEXT_ATTR_BOLD;
@@ -516 +517 @@
         attrstack[stacksize]=OWL_FMTEXT_ATTR_BOLD;
         chrstack[stacksize]=tmpptr[0];
+        colorstack[stacksize]=curcolor;
         stacksize++;
         curattrs|=OWL_FMTEXT_ATTR_BOLD;
@@ -524 +526 @@
         attrstack[stacksize]=OWL_FMTEXT_ATTR_UNDERLINE;
         chrstack[stacksize]=tmpptr[0];
+        colorstack[stacksize]=curcolor;
         stacksize++;
         curattrs|=OWL_FMTEXT_ATTR_UNDERLINE;
@@ -532 +535 @@
         attrstack[stacksize]=OWL_FMTEXT_ATTR_UNDERLINE;
         chrstack[stacksize]=tmpptr[0];
+        colorstack[stacksize]=curcolor;
         stacksize++;
         curattrs|=OWL_FMTEXT_ATTR_UNDERLINE;
         txtptr+=8;
+        owl_free(buff);
+        continue;
+      } else if (!strcasecmp(buff, "@")) {
+        attrstack[stacksize]=OWL_FMTEXT_ATTR_NONE;
+        chrstack[stacksize]=tmpptr[0];
+        colorstack[stacksize]=curcolor;
+        stacksize++;
+        txtptr+=2;
         owl_free(buff);
         continue;
@@ -608 +620 @@
         stacksize--;
         curattrs=OWL_FMTEXT_ATTR_NONE;
+        curcolor = colorstack[stacksize];
         for (i=0; i<stacksize; i++) {
           curattrs|=attrstack[i];