X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fustring.hh;h=0031e1c5b888db645c7ee397038f3f62d8ade854;hb=e9a7fc91bc4485a7fc3f9542dbba86b8d3823c7d;hp=02111a3379e89dde26e1a90b444226d6a6435cda;hpb=4947902d269213edee40f3f31f97721fa0dd3877;p=chaz%2Fopenbox

diff --git a/otk/ustring.hh b/otk/ustring.hh
index 02111a33..0031e1c5 100644
--- a/otk/ustring.hh
+++ b/otk/ustring.hh
@@ -7,6 +7,7 @@
 */
 
 extern "C" {
+
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
 #else
@@ -14,31 +15,26 @@ extern "C" {
 #    include <sys/types.h>
 #  endif
 #endif
+
 }
 
 #include <string>
 
 namespace otk {
 
+
 #ifdef HAVE_STDINT_H
 typedef uint32_t unichar;
 #else
 typedef u_int32_t unichar;
 #endif
 
+
 #ifndef DOXYGEN_IGNORE
 
-//! The number of bytes to skip to find the next character in the string
-const char g_utf8_skip[256] = {
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
-};
+unichar utf8_get_char(const char *p);
+
+#endif // DOXYGEN_IGNORE
 
 //! The iterator type for ustring
 /*!
@@ -51,6 +47,7 @@ const char g_utf8_skip[256] = {
   write operation would invalidate all other iterators pointing into the same
   string.
 */
+
 template <class T>
 class ustring_Iterator
 {
@@ -58,36 +55,21 @@ public:
   typedef std::bidirectional_iterator_tag   iterator_category;
   typedef unichar                           value_type;
   typedef std::string::difference_type      difference_type;
-  typedef value_type                        reference;
+  //typedef value_type                        reference;
   typedef void                              pointer;
-
+  
   inline ustring_Iterator() {}
   inline ustring_Iterator(const ustring_Iterator<std::string::iterator>&
 			  other) : _pos(other.base()) {}
 
-  inline value_type operator*() const {
-    // get a unicode character from the iterator's position
 
+  inline value_type operator*() const {
     // get an iterator to the internal string
     std::string::const_iterator pos = _pos;
-    
-    unichar result = static_cast<unsigned char>(*pos);
-
-    // if its not a 7-bit ascii character
-    if((result & 0x80) != 0) {
-      // len is the number of bytes this character takes up in the string
-      unsigned char len = g_utf8_skip[result];
-      result &= 0x7F >> len;
-      
-      while(--len != 0) {
-	result <<= 6;
-	result |= static_cast<unsigned char>(*++pos) & 0x3F;
-      }
-    }
-    
-    return result;
+    return utf8_get_char(&(*pos));
   }
 
+  
   inline ustring_Iterator<T> &     operator++() {
     pos_ += g_utf8_skip[static_cast<unsigned char>(*pos_)];
     return *this;
@@ -104,7 +86,6 @@ private:
   T _pos;
 };
 
-#endif // DOXYGEN_IGNORE
 
 //! This class provides a simple wrapper to a std::string that can be encoded
 //! as UTF-8. The ustring::utf() member specifies if the given string is UTF-8
@@ -128,23 +109,23 @@ public:
   typedef std::string::difference_type                  difference_type;
 
   typedef unichar                                       value_type;
-  typedef unichar &                                     reference;
-  typedef const unichar &                               const_reference;
+  //typedef unichar &                                     reference;
+  //typedef const unichar &                               const_reference;
 
-  typedef ustring_Iterator<std::string::iterator>       iterator;
-  typedef ustring_Iterator<std::string::const_iterator> const_iterator;
+  //typedef ustring_Iterator<std::string::iterator>       iterator;
+  //typedef ustring_Iterator<std::string::const_iterator> const_iterator;
 
   static const size_type npos = std::string::npos;
 
-  ustring();
+  ustring(bool utf8 = true);
   ~ustring();
 
   // make new strings
   
   ustring(const ustring& other);
   ustring& operator=(const ustring& other);
-  ustring(const std::string& src);
-  ustring::ustring(const char* src);
+  ustring(const std::string& src, bool utf8 = true);
+  ustring(const char* src, bool utf8 = true);
 
   // append to the string
 
@@ -158,6 +139,27 @@ public:
   ustring::size_type bytes() const;
   ustring::size_type capacity() const;
   ustring::size_type max_size() const;
+  bool empty() const;
+
+  // erase substrings
+
+  void clear();
+  ustring& erase(size_type i, size_type n=npos);
+
+  // change the string's size
+
+  void resize(size_type n, char c='\0');
+
+  // extract characters
+  
+  // No reference return; use replace() to write characters.
+  value_type operator[](size_type i) const;
+
+  // compare strings
+
+  bool operator==(const ustring &other) const;
+  bool operator==(const std::string &other) const;
+  bool operator==(const char *other) const;
 
   // internal data