[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvt.h

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.556 by sf-exg, Thu May 13 19:40:19 2021 UTC vs.
Revision 1.559 by root, Thu Jun 17 01:44:29 2021 UTC

 /****************************************************************************/
 #define UNICODE_MASK 0x1fffffUL
 #if UNICODE_3
-# define COMPOSE_LO 0x40000000UL
+# define COMPOSE_LO 0x110000UL
-# define COMPOSE_HI 0x400fffffUL
+# define COMPOSE_HI 0x1fffffUL
 # define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
 #else
 # if ENABLE_PERL
 #  define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
 #  define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
 // compose chars are used to represent composite characters
 // that are not representable in unicode, as well as characters
 // not fitting in the BMP.
 struct compose_char
 {
-  unicode_t c1, c2; // any chars != NOCHAR are valid
+  // c1 can be any chaarcter != NOCHAR, including another compose character
+  // c2 must always be a zero-width character or NOCHAR, in case
+  // this just extends beyondthe BMP.
+  unicode_t c1, c2;
   compose_char (unicode_t c1, unicode_t c2)
   : c1(c1), c2(c2)
   { }
 };
 class rxvt_composite_vec
 {
   vector<compose_char> v;
 public:
   text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
-  int expand (unicode_t c, wchar_t *r);
+  template<typename T> int expand (unicode_t c, T *r);
+  int expand (unicode_t c) { return expand (c, (text_t *)0); }
   compose_char *operator [](text_t c)
   {
     return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
            ? &v[c - COMPOSE_LO]
            : 0;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines