Changeset 6f6330b for fmtext.c

Timestamp:

Feb 4, 2008, 8:17:18 PM (16 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:

1ba81e3

Parents:

99219ed

Message:

* fix a typo in OWL_FMTEXT_UTF8_BGDEFAULT
* fix a parsing issue for attributes

File:

• fmtext.c (modified) (1 diff)

fmtext.c

@@ -143 +143 @@
     *attr = c & OWL_FMTEXT_UC_ATTR_MASK;
   }
-  else if ((c & OWL_FMTEXT_UC_FGCOLOR) == OWL_FMTEXT_UC_FGCOLOR) {
-    *fgcolor = (c == OWL_FMTEXT_UC_FGDEFAULT
-                ? OWL_COLOR_DEFAULT
-                : c & OWL_FMTEXT_UC_COLOR_MASK);
-  }
-  else if ((c & OWL_FMTEXT_UC_BGCOLOR) == OWL_FMTEXT_UC_BGCOLOR) {
-    *bgcolor = (c == OWL_FMTEXT_UC_BGDEFAULT
-                ? OWL_COLOR_DEFAULT
-                : c & OWL_FMTEXT_UC_COLOR_MASK);
+  else if ((c & OWL_FMTEXT_UC_COLOR_BASE) == OWL_FMTEXT_UC_COLOR_BASE) {
+    if ((c & OWL_FMTEXT_UC_BGCOLOR) == OWL_FMTEXT_UC_BGCOLOR) {
+      *bgcolor = (c == OWL_FMTEXT_UC_BGDEFAULT
+                  ? OWL_COLOR_DEFAULT
+                  : c & OWL_FMTEXT_UC_COLOR_MASK);
+    }
+    else if ((c & OWL_FMTEXT_UC_FGCOLOR) == OWL_FMTEXT_UC_FGCOLOR) {
+      *fgcolor = (c == OWL_FMTEXT_UC_FGDEFAULT
+                  ? OWL_COLOR_DEFAULT
+                  : c & OWL_FMTEXT_UC_COLOR_MASK);
+    }
   }
 }