Changeset 7659079

Timestamp:

Feb 26, 2011, 12:57:17 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

237d02c

Parents:

fb6e8e3

git-author:

David Benjamin <davidben@mit.edu> (02/25/11 15:14:41)

git-committer:

David Benjamin <davidben@mit.edu> (02/26/11 00:57:17)

Message:

Don't precompute UTF-8 encodings of format characters

GString can append gunichar just fine.

Files:

• fmtext.c (modified) (2 diffs)
• owl.h (modified) (1 diff)

fmtext.c

@@ -50 +50 @@
 
   /* Reset attributes */
-  if (bg) g_string_append(f->buff, OWL_FMTEXT_UTF8_BGDEFAULT);
-  if (fg) g_string_append(f->buff, OWL_FMTEXT_UTF8_FGDEFAULT);
-  if (a)  g_string_append(f->buff, OWL_FMTEXT_UTF8_ATTR_NONE);
+  if (bg) g_string_append_unichar(f->buff, OWL_FMTEXT_UC_BGDEFAULT);
+  if (fg) g_string_append_unichar(f->buff, OWL_FMTEXT_UC_FGDEFAULT);
+  if (a)  g_string_append_unichar(f->buff, OWL_FMTEXT_UC_ATTR | OWL_FMTEXT_UC_ATTR);
 }
 
@@ -180 +180 @@
 
   /* Reset attributes */
-  g_string_append(f->buff, OWL_FMTEXT_UTF8_BGDEFAULT);
-  g_string_append(f->buff, OWL_FMTEXT_UTF8_FGDEFAULT);
-  g_string_append(f->buff, OWL_FMTEXT_UTF8_ATTR_NONE);
+  g_string_append_unichar(f->buff, OWL_FMTEXT_UC_BGDEFAULT);
+  g_string_append_unichar(f->buff, OWL_FMTEXT_UC_FGDEFAULT);
+  g_string_append_unichar(f->buff, OWL_FMTEXT_UC_ATTR | OWL_FMTEXT_UC_ATTR);
 }
 

owl.h

@@ -101 +101 @@
 #define OWL_FMTEXT_UC_ALLCOLOR_MASK ( OWL_FMTEXT_UC_COLOR_MASK | OWL_FMTEXT_UC_DEFAULT_COLOR | 0x200)
 #define OWL_FMTEXT_UC_STARTBYTE_UTF8 '\xf4'
-
-#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\x9C\x80"
 
 #define OWL_COLOR_BLACK     0