[943] in BarnOwl Developers
[D-O-H] r929 - branches/barnowl_unicode/owl
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:23 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 4 Feb 2008 20:17:18 -0500 (EST)
Author: asedeno
Date: 2008-02-04 20:17:18 -0500 (Mon, 04 Feb 2008)
New Revision: 929
Modified:
branches/barnowl_unicode/owl/fmtext.c
branches/barnowl_unicode/owl/owl.h
Log:
unicode/glib branch
* fix a typo in OWL_FMTEXT_UTF8_BGDEFAULT
* fix a parsing issue for attributes
Modified: branches/barnowl_unicode/owl/fmtext.c
===================================================================
--- branches/barnowl_unicode/owl/fmtext.c 2008-02-05 01:14:23 UTC (rev 928)
+++ branches/barnowl_unicode/owl/fmtext.c 2008-02-05 01:17:18 UTC (rev 929)
@@ -142,16 +142,18 @@
if ((c & OWL_FMTEXT_UC_ATTR) == OWL_FMTEXT_UC_ATTR) {
*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_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);
+ }
}
- 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);
- }
}
/* Internal function. Scan for attribute characters. */
Modified: branches/barnowl_unicode/owl/owl.h
===================================================================
--- branches/barnowl_unicode/owl/owl.h 2008-02-05 01:14:23 UTC (rev 928)
+++ branches/barnowl_unicode/owl/owl.h 2008-02-05 01:17:18 UTC (rev 929)
@@ -117,11 +117,8 @@
#define OWL_FMTEXT_UTF8_ATTR_NONE "\xf4\x80\xa0\x80"
#define OWL_FMTEXT_UTF8_FGDEFAULT "\xf4\x80\x94\x80"
-#define OWL_FMTEXT_UTF8_BGDEFAULT "\xf4\x80\x96\x80"
+#define OWL_FMTEXT_UTF8_BGDEFAULT "\xf4\x80\x9C\x80"
-
-
-
#define OWL_COLOR_BLACK 0
#define OWL_COLOR_RED 1
#define OWL_COLOR_GREEN 2
