--- rxvt-unicode/src/screen.C	2004/02/25 10:26:50	1.38
+++ rxvt-unicode/src/screen.C	2004/03/28 02:07:08	1.66
@@ -441,15 +441,6 @@
 
   total_rows = TermWin.nrow + TermWin.saveLines;
 
-#ifdef DEBUG_STRICT
-  for (i = 0; i < total_rows; i++)
-    {
-      if (screen.text[i])
-        /* then so is screen.rend[i] */
-        assert (screen.rend[i]);
-    }
-#endif
-
   delete talloc; talloc = 0;
   delete ralloc; ralloc = 0;
 
@@ -502,16 +493,17 @@
 void
 rxvt_term::scr_cursor (int mode)
 {
-  screen_t       *s;
+  screen_t *s;
 
   D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
 
 #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
   if (current_screen == SECONDARY)
-    s = & (swap);
+    s = &swap;
   else
 #endif
-    s = & (screen);
+    s = &screen;
+
   switch (mode)
     {
       case SAVE:
@@ -532,6 +524,7 @@
         set_font_style ();
         break;
     }
+
   /* boundary check in case screen size changed between SAVE and RESTORE */
   MIN_IT (s->cur.row, TermWin.nrow - 1);
   MIN_IT (s->cur.col, TermWin.ncol - 1);
@@ -553,9 +546,9 @@
 int
 rxvt_term::scr_change_screen (int scrn)
 {
-  int             i;
+  int i;
 #if NSCREENS
-  int             offset;
+  int offset;
 #endif
 
   want_refresh = 1;
@@ -764,13 +757,13 @@
  * Add text given in <str> of length <len> to screen struct
  */
 void
-rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
+rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
 {
-  unsigned char   checksel, clearsel;
-  uint32_t        c;
-  int             i, row, last_col;
-  text_t         *stp;
-  rend_t         *srp;
+  unsigned char checksel, clearsel;
+  unicode_t c;
+  int i, row, last_col;
+  text_t *stp;
+  rend_t *srp;
 
   if (len <= 0)               /* sanity */
     return;
@@ -803,43 +796,46 @@
 #endif
   row = screen.cur.row + TermWin.saveLines;
 
-  checksel = (selection.op
-              && current_screen == selection.screen) ? 1 : 0;
+  checksel = selection.op && current_screen == selection.screen ? 1 : 0;
   clearsel = 0;
 
   stp = screen.text[row];
   srp = screen.rend[row];
 
-  for (i = 0; i < len;)
+  while (len--)
     {
-      c = str[i++];
-      switch (c)
-        {
-          case '\t':
-            scr_tab (1);
-            continue;
-          case '\n':
-            if (screen.tlen[row] != -1)      /* XXX: think about this */
-              MAX_IT (screen.tlen[row], screen.cur.col);
-            screen.flags &= ~Screen_WrapNext;
-            if (screen.cur.row == screen.bscroll)
-              scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
-            else if (screen.cur.row < (TermWin.nrow - 1))
-              row = (++screen.cur.row) + TermWin.saveLines;
-            stp = screen.text[row];  /* _must_ refresh */
-            srp = screen.rend[row];  /* _must_ refresh */
-            continue;
-          case '\r':
-            if (screen.tlen[row] != -1)      /* XXX: think about this */
-              MAX_IT (screen.tlen[row], screen.cur.col);
-            screen.flags &= ~Screen_WrapNext;
-            screen.cur.col = 0;
-            continue;
-          default:
-            if (c == 127)
-              continue;       /* yummmm..... */
-            break;
-        }
+      c = *str++;
+
+      if (c < 0x20)
+        switch (c)
+          {
+            case '\t':
+              scr_tab (1);
+              continue;
+
+            case '\n':
+              if (screen.tlen[row] != -1)      /* XXX: think about this */
+                MAX_IT (screen.tlen[row], screen.cur.col);
+
+              screen.flags &= ~Screen_WrapNext;
+
+              if (screen.cur.row == screen.bscroll)
+                scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
+              else if (screen.cur.row < (TermWin.nrow - 1))
+                row = (++screen.cur.row) + TermWin.saveLines;
+
+              stp = screen.text[row];  /* _must_ refresh */
+              srp = screen.rend[row];  /* _must_ refresh */
+              continue;
+
+            case '\r':
+              if (screen.tlen[row] != -1)      /* XXX: think about this */
+                MAX_IT (screen.tlen[row], screen.cur.col);
+
+              screen.flags &= ~Screen_WrapNext;
+              screen.cur.col = 0;
+              continue;
+          }
 
       if (checksel            /* see if we're writing within selection */
           && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
@@ -848,6 +844,7 @@
           checksel = 0;
           clearsel = 1;
         }
+
       if (screen.flags & Screen_WrapNext)
         {
           screen.tlen[row] = -1;
@@ -855,62 +852,111 @@
             scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
           else if (screen.cur.row < (TermWin.nrow - 1))
             row = (++screen.cur.row) + TermWin.saveLines;
+
           stp = screen.text[row];  /* _must_ refresh */
           srp = screen.rend[row];  /* _must_ refresh */
           screen.cur.col = 0;
           screen.flags &= ~Screen_WrapNext;
         }
+
       if (screen.flags & Screen_Insert)
         scr_insdel_chars (1, INSERT);
 
+      // rely on wcwidth to tell us the character width, at least for non-latin1
+      // do wcwidth before further replacements, as wcwidth says that line-drawing
+      // characters have width -1 (DOH!) on GNU/Linux sometimes.
+      int width = c < 256 ? 1 : wcwidth (c);
+
       if (charsets[screen.charset] == '0') // DEC SPECIAL
-        switch (c)
-          {
-            // dunno where these come from
-#if 0
-            case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
-            case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
-#endif
-            // vt100 special graphics and line drawing
-            case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
-            case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
-            case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
-            case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
-            case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
-            case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
-            case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
-            case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
-            case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
-            case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
-            case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
-          }
+        {
+          // vt100 special graphics and line drawing
+          static uint16_t vt100_0[32] = { // 5f .. 7e
+            0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
+            0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
+            0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
+            0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
+          };
 
-      rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
-      // rely on wcwidth to tell us the character width, at least for non-ascii
-      int width = c <= 128 ? 1 : wcwidth (c);
+          if (c >= 0x5f && c <= 0x7e)
+            {
+              c = vt100_0[c - 0x5f];
+              width = 1;
+            }
+        }
 
-      // width -1 characters (e.g. combining chars) are ignored currently.
       if (width > 0)
-        do
-          {
-            stp[screen.cur.col] = c;
-            srp[screen.cur.col] = rend;
+        {
+#if !UNICODE_3 && ENABLE_COMBINING
+          // trim characters we can't store directly :(
+          if (c >= 0x10000)
+            c = rxvt_composite.compose (c); // map to lower 16 bits
+#endif
+          rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
 
-            if (screen.cur.col < last_col - 1)
-              screen.cur.col++;
-            else
-              {
-                screen.tlen[row] = last_col;
-                if (screen.flags & Screen_Autowrap)
-                  screen.flags |= Screen_WrapNext;
-                break;
-              }
+          do
+            {
+              stp[screen.cur.col] = c;
+              srp[screen.cur.col] = rend;
 
-            c = NOCHAR;
-          }
-        while (--width > 0);
-      else
-        (void)0; /* handle combining character etc. here. */
+              if (screen.cur.col < last_col - 1)
+                screen.cur.col++;
+              else
+                {
+                  screen.tlen[row] = last_col;
+                  if (screen.flags & Screen_Autowrap)
+                    screen.flags |= Screen_WrapNext;
+                  break;
+                }
+
+              c = NOCHAR;
+            }
+          while (--width > 0);
+
+          // pad with spaces when overwriting wide character with smaller one
+          for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
+            {
+              stp[c] = ' ';
+              srp[c] = rend;
+            }
+        }
+      else if (width == 0)
+        {
+#if ENABLE_COMBINING
+          // handle combining characters
+          // we just tag the accent on the previous on-screen character.
+          // this is arguably not correct, but also arguably not wrong.
+          // we don't handle double-width characters nicely yet.
+
+          text_t *tp;
+          rend_t *rp;
+
+          if (screen.cur.col > 0)
+            {
+              tp = stp + screen.cur.col - 1;
+              rp = srp + screen.cur.col - 1;
+            }
+          else if (screen.cur.row > 0
+                   && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
+            {
+              tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
+              rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
+            }
+          else
+            continue;
+
+          // handle double-width-chars by making them look extremely ugly
+          if (*tp == NOCHAR)
+            *tp = ' '; // hack //D //TODO //--tp, --rp;
+
+          // first try to find a precomposed character
+          unicode_t n = rxvt_compose (*tp, c);
+          if (n == NOCHAR)
+            n = rxvt_composite.compose (*tp, c);
+
+          *tp = n;
+          *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
+#endif
+        }
     }
 
   if (screen.tlen[row] != -1)      /* XXX: think about this */
@@ -966,11 +1012,12 @@
 void
 rxvt_term::scr_tab (int count)
 {
-  int             i, x;
+  int i, x;
 
   D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
   want_refresh = 1;
   i = x = screen.cur.col;
+
   if (count == 0)
     return;
   else if (count > 0)
@@ -982,6 +1029,7 @@
             if (!--count)
               break;
           }
+
       if (count)
         x = TermWin.ncol - 1;
     }
@@ -994,9 +1042,11 @@
             if (!++count)
               break;
           }
+
       if (count)
         x = 0;
     }
+
   if (x != screen.cur.col)
     scr_gotorc (0, x, R_RELATIVE);
 }
@@ -1100,6 +1150,10 @@
     }
   MAX_IT (screen.cur.row, 0);
   MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
+
+  while (screen.cur.col > 0
+         && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
+    screen.cur.col--;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1195,10 +1249,10 @@
 void
 rxvt_term::scr_erase_screen (int mode)
 {
-  int             num;
-  int32_t         row, row_offset;
-  rend_t          ren;
-  XGCValues       gcvalue;
+  int num;
+  int32_t row, row_offset;
+  rend_t ren;
+  XGCValues gcvalue;
 
   want_refresh = 1;
   D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
@@ -1227,15 +1281,20 @@
       default:
         return;
     }
+
   refresh_type |= REFRESH_BOUNDS;
+
   if (selection.op && current_screen == selection.screen
       && ((selection.beg.row >= row && selection.beg.row <= row + num)
           || (selection.end.row >= row
               && selection.end.row <= row + num)))
     CLEAR_SELECTION ();
+
   if (row >= TermWin.nrow) /* Out Of Bounds */
     return;
+
   MIN_IT (num, (TermWin.nrow - row));
+
   if (rstyle & (RS_RVid | RS_Uline))
     ren = (rend_t) ~RS_None;
   else if (GET_BASEBG (rstyle) == Color_bg)
@@ -1252,6 +1311,7 @@
       gcvalue.foreground = PixColors[Color_fg];
       XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
     }
+
   for (; num--; row++)
     {
       scr_blank_screen_mem (screen.text, screen.rend,
@@ -1295,7 +1355,7 @@
 void
 rxvt_term::scr_insdel_lines (int count, int insdel)
 {
-  int             end;
+  int end;
 
   ZERO_SCROLLBACK ();
 
@@ -1324,11 +1384,11 @@
 void
 rxvt_term::scr_insdel_chars (int count, int insdel)
 {
-  int             col, row;
-  rend_t          tr;
-  text_t         *stp;
-  rend_t         *srp;
-  int16_t        *slp;
+  int col, row;
+  rend_t tr;
+  text_t *stp;
+  rend_t *srp;
+  int16_t *slp;
 
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1345,6 +1405,7 @@
   stp = screen.text[row];
   srp = screen.rend[row];
   slp = & (screen.tlen[row]);
+
   switch (insdel)
     {
       case INSERT:
@@ -1354,11 +1415,13 @@
             stp[col] = stp[col - count];
             srp[col] = srp[col - count];
           }
+
         if (*slp != -1)
           {
             *slp += count;
             MIN_IT (*slp, TermWin.ncol);
           }
+
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
@@ -1372,9 +1435,11 @@
                 selection.end.col += count;
               }
           }
+
         scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
                         (unsigned int)count, rstyle);
         break;
+
       case ERASE:
         screen.cur.col += count;     /* don't worry if > TermWin.ncol */
         selection_check (1);
@@ -1382,21 +1447,26 @@
         scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
                         (unsigned int)count, rstyle);
         break;
+
       case DELETE:
-        tr = srp[TermWin.ncol - 1]
-             & (RS_fgMask | RS_bgMask | RS_baseattrMask);
+        tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
+
         for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
           {
             stp[col] = stp[col + count];
             srp[col] = srp[col + count];
           }
+
         scr_blank_line (& (stp[TermWin.ncol - count]),
                         & (srp[TermWin.ncol - count]),
                         (unsigned int)count, tr);
+
         if (*slp == -1) /* break line continuation */
           *slp = TermWin.ncol;
+        
         *slp -= count;
         MAX_IT (*slp, 0);
+
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
@@ -1412,6 +1482,7 @@
                 selection.end.col -= count;
               }
           }
+
         break;
     }
 }
@@ -1426,8 +1497,10 @@
 {
   MAX_IT (top, 0);
   MIN_IT (bot, (int)TermWin.nrow - 1);
+
   if (top > bot)
     return;
+
   screen.tscroll = top;
   screen.bscroll = bot;
   scr_gotorc (0, 0, 0);
@@ -1895,9 +1968,9 @@
    * C: set the cursor character (s)
    */
   {
-    unsigned char   setoldcursor;
-    rend_t          ccol1,  /* Cursor colour       */
-    ccol2;  /* Cursor colour2      */
+    unsigned char setoldcursor;
+    rend_t ccol1,  /* Cursor colour       */
+           ccol2;  /* Cursor colour2      */
 
     showcursor = (screen.flags & Screen_VisibleCursor);
 #ifdef CURSOR_BLINK
@@ -1907,8 +1980,7 @@
 
     if (showcursor)
       {
-        srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
-                [screen.cur.col]);
+        srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
 
         if (showcursor && TermWin.focus)
           {
@@ -1946,9 +2018,8 @@
           {
             if (ocrow < TermWin.nrow
                 && oldcursor.col < TermWin.ncol)
-              {
-                drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
-              }
+              drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
+
             if (TermWin.focus || !showcursor)
               oldcursor.row = -1;
             else
@@ -1957,6 +2028,7 @@
       }
     else if (!TermWin.focus)
       setoldcursor = 1;
+
     if (setoldcursor)
       {
         if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
@@ -1978,11 +2050,11 @@
   if (refresh_type == FAST_REFRESH && num_scr_allow && i
       && abs (i) < TermWin.nrow && !must_clear)
     {
-      int16_t         nits;
-      int             j;
-      rend_t         *drp2;
-      text_t         *dtp2;
-      int             len, wlen;
+      int16_t nits;
+      int j;
+      rend_t *drp2;
+      text_t *dtp2;
+      int len, wlen;
 
       j = TermWin.nrow;
       wlen = len = -1;
@@ -2056,25 +2128,25 @@
       for (col = 0; col < TermWin.ncol; col++)
         {
           /* compare new text with old - if exactly the same then continue */
-          rend_t rend = srp[col];     /* screen rendition (target rendtion) */
-
           if (stp[col] == dtp[col]    /* Must match characters to skip. */
-              && (rend == drp[col]    /* Either rendition the same or   */
+              && (srp[col] == drp[col]    /* Either rendition the same or   */
                   || (stp[col] == ' ' /* space w/ no background change  */
-                      && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
+                      && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
             continue;
 
+          // redraw one or more characters
+
+          // seek to the beginning if wide characters
+          while (stp[col] == NOCHAR && col > 0)
+            --col;
+
+          rend_t rend = srp[col];     /* screen rendition (target rendtion) */
           text_t *text = stp + col;
           int count = 1;
 
-          /* redraw one or more characters */
-
           dtp[col] = stp[col];
           drp[col] = rend;
 
-          if (*text == NOCHAR) // never start redrawing at invisible characters. */
-            continue;
-
           int xpixel = Col2Pixel (col);
 
           // this loop looks very messy, it can probably be optimized
@@ -2136,10 +2208,8 @@
             }
 
           if (rend & RS_Uline)
-            {
-              if (ISSET_PIXCOLOR (Color_UL))
-                fore = Color_UL;
-            }
+            if (ISSET_PIXCOLOR (Color_UL))
+              fore = Color_UL;
 #endif
 
           if (rvid)
@@ -2157,7 +2227,7 @@
             }
 
 #ifdef TEXT_BLINK
-          if (rend & RS_Blink)
+          if (rend & RS_Blink && back == Color_bg)
             {
               if (!text_blink_ev.active)
                 {
@@ -2199,8 +2269,8 @@
 
           if ((rend & RS_Uline) && (font->descent > 1))
             XDrawLine (display->display, drawBuffer, TermWin.gc,
-                      xpixel, ypixel + font->ascent + 1,
-                      xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
+                       xpixel, ypixel + font->ascent + 1,
+                       xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
         }                     /* for (col....) */
     }                         /* for (row....) */
 
@@ -2230,10 +2300,10 @@
             cursorwidth++;
 
           XDrawRectangle (display->display, drawBuffer, TermWin.gc,
-                         Col2Pixel (oldcursor.col),
-                         Row2Pixel (oldcursor.row),
-                         (unsigned int) (Width2Pixel (cursorwidth) - 1),
-                         (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
+                          Col2Pixel (oldcursor.col),
+                          Row2Pixel (oldcursor.row),
+                          (unsigned int) (Width2Pixel (cursorwidth) - 1),
+                          (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
         }
     }
 
@@ -2251,17 +2321,19 @@
      * specially by XClearArea
      */
     XClearArea (display->display, TermWin.vt, 0, 0,
-               (unsigned int)TermWin.int_bwidth,
-               (unsigned int)TermWin_TotalHeight (), False);
+                (unsigned int)TermWin.int_bwidth,
+                (unsigned int)TermWin_TotalHeight (), False);
+
   if (clearlast && TermWin.int_bwidth)
     /*
      * clear the whole screen height, note that width == 0 is treated
      * specially by XClearArea
      */
     XClearArea (display->display, TermWin.vt,
-               TermWin.width + TermWin.int_bwidth, 0,
-               (unsigned int)TermWin.int_bwidth,
-               (unsigned int)TermWin_TotalHeight (), False);
+                TermWin.width + TermWin.int_bwidth, 0,
+                (unsigned int)TermWin.int_bwidth,
+                (unsigned int)TermWin_TotalHeight (), False);
+
   if (refresh_type & SMOOTH_REFRESH)
     XSync (display->display, False);
 
@@ -2295,13 +2367,14 @@
 
 /* ------------------------------------------------------------------------- */
 void
-rxvt_term::scr_clear ()
+rxvt_term::scr_clear (bool really)
 {
   if (!TermWin.mapped)
     return;
 
   num_scr_allow = 0;
   want_refresh = 1;
+
 #ifdef TRANSPARENT
   if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
     {
@@ -2318,21 +2391,21 @@
     }
 #endif
 
-  XClearWindow (display->display, TermWin.vt);
+  if (really)
+    XClearWindow (display->display, TermWin.vt);
 }
 
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_reverse_selection ()
 {
-  int             i, col, row, end_row;
-  rend_t         *srp;
-
   if (selection.op && current_screen == selection.screen)
     {
-      end_row = TermWin.saveLines - TermWin.view_start;
-      i = selection.beg.row + TermWin.saveLines;
-      row = selection.end.row + TermWin.saveLines;
+      int end_row = TermWin.saveLines - TermWin.view_start;
+      int i = selection.beg.row + TermWin.saveLines;
+      int col, row = selection.end.row + TermWin.saveLines;
+      rend_t *srp;
+
       if (i >= end_row)
         col = selection.beg.col;
       else
@@ -2340,10 +2413,12 @@
           col = 0;
           i = end_row;
         }
+
       end_row += TermWin.nrow;
       for (; i < row && i < end_row; i++, col = 0)
         for (srp = screen.rend[i]; col < TermWin.ncol; col++)
           srp[col] ^= RS_RVid;
+
       if (i == row && i < end_row)
         for (srp = screen.rend[i]; col < selection.end.col; col++)
           srp[col] ^= RS_RVid;
@@ -2513,6 +2588,7 @@
       if (ct.nitems == 0)
         {
           D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
+
           if (selection_wait == Sel_normal && nread == 0
               && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
             {
@@ -2564,7 +2640,7 @@
 {
   selection_wait = Sel_none;
 
-  rxvt_print_error ("data loss: timeout on INCR selection paste");
+  rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
 }
 
 /*
@@ -2577,13 +2653,14 @@
 
   if (prop == None)
     return;
+
   D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
   if (selection_wait == Sel_normal)
     {
-      int             a, afmt;
-      Atom            atype;
-      unsigned long   bytes_after, nitems;
-      unsigned char  *s = NULL;
+      int a, afmt;
+      Atom atype;
+      unsigned long bytes_after, nitems;
+      unsigned char *s = NULL;
 
       a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
                              xa[XA_INCR], &atype, &afmt, &nitems,
@@ -2592,6 +2669,7 @@
         XFree (s);
       if (a != Success)
         return;
+
 #ifndef __CYGWIN32__
       if (atype == xa[XA_INCR])
         {  /* start an INCR transfer */
@@ -2607,6 +2685,7 @@
   else if (selection_wait == Sel_incr)
     {
       reget_time = 1;
+
       if (selection_paste (win, prop, True) == -1)
         {
           D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
@@ -2617,6 +2696,7 @@
   if (reget_time) /* received more data so reget time */
     incr_ev.start (NOW + 10);
 }
+
 /* ------------------------------------------------------------------------- */
 /*
  * Request the current selection: 
@@ -2631,21 +2711,25 @@
 rxvt_term::selection_request (Time tm, int x, int y)
 {
   D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
+
   if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
     return;                 /* outside window */
 
-  if (selection.text != NULL)
-    {    /* internal selection */
+  if (selection.text)
+    { /* internal selection */
       D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
-      paste (selection.text, selection.len);
+      char *str = rxvt_wcstombs (selection.text, selection.len);
+      paste ((unsigned char *)str, strlen (str));
+      free (str);
       return;
     }
   else
     {
-      int             i;
+      int i;
 
       selection_request_time = tm;
       selection_wait = Sel_normal;
+
       for (i = Sel_Primary; i <= Sel_Clipboard; i++)
         {
 #if X_HAVE_UTF8_STRING
@@ -2660,6 +2744,7 @@
 
         }
     }
+
   selection_wait = Sel_none;       /* don't loop in rxvt_selection_paste () */
   D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
   selection_paste (display->root, XA_CUT_BUFFER0, False);
@@ -2668,25 +2753,28 @@
 int
 rxvt_term::selection_request_other (Atom target, int selnum)
 {
-  Atom            sel;
+  Atom sel;
 #ifdef DEBUG_SELECT
-  char           *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
+  char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
 #endif
 
   selection_type |= selnum;
+
   if (selnum == Sel_Primary)
     sel = XA_PRIMARY;
   else if (selnum == Sel_Secondary)
     sel = XA_SECONDARY;
   else
     sel = xa[XA_CLIPBOARD];
+
   if (XGetSelectionOwner (display->display, sel) != None)
     {
       D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
       XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
-                        TermWin.vt, selection_request_time);
+                         TermWin.vt, selection_request_time);
       return 1;
     }
+
   return 0;
 }
 
@@ -2705,6 +2793,9 @@
   selection.text = NULL;
   selection.len = 0;
   CLEAR_SELECTION ();
+
+  if (display->selection_owner == this)
+    display->selection_owner = 0;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2715,13 +2806,9 @@
 void
 rxvt_term::selection_make (Time tm)
 {
-  int             i, col, end_col, row, end_row;
-  unsigned char  *new_selection_text;
-  char           *str;
-  text_t         *t;
-#ifdef ACS_ASCII
-  rend_t         *re;
-#endif
+  int i, col, end_col, row, end_row;
+  wchar_t *new_selection_text;
+  text_t *t;
 
   D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
   switch (selection.op)
@@ -2737,24 +2824,25 @@
       default:
         return;
     }
+
   selection.op = SELECTION_DONE;
 
   if (selection.clicks == 4)
     return;                 /* nothing selected, go away */
 
-  i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1;
-  str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1);
-
-  new_selection_text = (unsigned char *)str;
+  i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
+  new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
 
   col = selection.beg.col;
   MAX_IT (col, 0);
   row = selection.beg.row + TermWin.saveLines;
   end_row = selection.end.row + TermWin.saveLines;
+  int ofs = 0;
+  int extra = 0;
 
   for (; row <= end_row; row++, col = 0)
     {
-      t = & (screen.text[row][col]);
+      t = &(screen.text[row][col]);
 
       end_col = screen.tlen[row];
 
@@ -2765,69 +2853,67 @@
         MIN_IT (end_col, selection.end.col);
 
       for (; col < end_col; col++)
-        if (*t == NOCHAR)
-          t++;
-        else
-          {
-            int len = wctomb (str, *t++);
-            if (len > 0)
-              str += len;
-          }
+        {
+          if (*t == NOCHAR)
+            t++;
+#if ENABLE_COMBINING
+          else if (IS_COMPOSE (*t))
+            {
+              int len = rxvt_composite.expand (*t, 0);
+
+              extra -= (len - 1);
+
+              if (extra < 0)
+                {
+                  extra += i;
+                  i += i;
+                  new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
+                }
+
+              ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
+            }
+#endif
+          else
+            new_selection_text[ofs++] = *t++;
+        }
 
       if (screen.tlen[row] != -1 && row != end_row)
-        *str++ = '\n';
+        new_selection_text[ofs++] = L'\n';
     }
 
-#ifndef NO_OLD_SELECTION
-  if (selection_style == OLD_SELECT)
-    if (end_col == TermWin.ncol)
-      *str++ = '\n';
-#endif
-#ifndef NO_NEW_SELECTION
-  if (selection_style != OLD_SELECT)
-    if (end_col != selection.end.col)
-      *str++ = '\n';
-#endif
-  *str = '\0';
+  if (end_col != selection.end.col)
+    new_selection_text[ofs++] = L'\n';
+
+  new_selection_text[ofs] = 0;
 
-  i = str - (char *)new_selection_text;
-  if (i == 0)
+  if (ofs == 0)
     {
       free (new_selection_text);
       return;
     }
 
-  // due to MB_MAX_CUR, selection wastage is usually high, so realloc
-  if (str - (char *)new_selection_text > 1024)
-    new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
-
-  selection.len = i;
-
-  if (selection.text)
-    free (selection.text);
+  free (selection.text);
 
-  selection.text = new_selection_text;
+  // we usually allocate much more than necessary, so realloc it smaller again
+  selection.len = ofs;
+  selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
 
   XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
   if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
     display->set_selection_owner (this);
   else
-    rxvt_print_error ("can't get primary selection");
+    rxvt_warn ("can't get primary selection, ignoring.\n");
 
-  {
-    XTextProperty ct;
-    char *cl = (char *)selection.text;
+#if 0
+  XTextProperty ct;
 
-    if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0)
-      {
-        XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
-                        PropModeReplace, ct.value, ct.nitems);
-        XFree (ct.value);
-      }
-    else
+  if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
+    {
       XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
-                      PropModeReplace, selection.text, (int)selection.len);
-  }
+                       PropModeReplace, ct.value, ct.nitems);
+      XFree (ct.value);
+    }
+#endif
 
   selection_time = tm;
   D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
@@ -2866,16 +2952,22 @@
   want_refresh = 1;
   selection.mark.col = col;
   selection.mark.row = row - TermWin.view_start;
+
   MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
   MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
   MAX_IT (selection.mark.col, 0);
   MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
 
+  while (selection.mark.col > 0
+         && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
+    --selection.mark.col;
+  
   if (selection.op)
     {      /* clear the old selection */
       selection.beg.row = selection.end.row = selection.mark.row;
       selection.beg.col = selection.end.col = selection.mark.col;
     }
+
   selection.op = SELECTION_INIT;
   selection.screen = current_screen;
 }
@@ -2887,17 +2979,17 @@
  */
 
 /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
-#define DELIMIT_TEXT(x) \
-    (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL))
+#define DELIMIT_TEXT(x) 		\
+    (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
 #define DELIMIT_REND(x)        1
 
 void
 rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
 {
-  int             col, row, dirnadd, tcol, trow, w1, w2;
-  row_col_t       bound;
-  text_t         *stp;
-  rend_t         *srp;
+  int col, row, dirnadd, tcol, trow, w1, w2;
+  row_col_t bound;
+  text_t *stp;
+  rend_t *srp;
 
   if (dirn == UP)
     {
@@ -2911,6 +3003,7 @@
       bound.col = TermWin.ncol - 1;
       dirnadd = 1;
     }
+
   row = mark->row + TermWin.saveLines;
   col = mark->col;
   MAX_IT (col, 0);
@@ -2918,17 +3011,6 @@
   stp = & (screen.text[row][col]);
   w1 = DELIMIT_TEXT (*stp);
 
-  if (selection_style != NEW_SELECT)
-    {
-      if (w1 == 1)
-        {
-          stp += dirnadd;
-          if (DELIMIT_TEXT (*stp) == 1)
-            goto Old_Word_Selection_You_Die;
-          col += dirnadd;
-        }
-      w1 = 0;
-    }
   srp = (&screen.rend[row][col]);
   w2 = DELIMIT_REND (*srp);
 
@@ -2937,24 +3019,33 @@
       for (; col != bound.col; col += dirnadd)
         {
           stp += dirnadd;
+          srp += dirnadd;
+
+          if (*stp == NOCHAR)
+            continue;
+
           if (DELIMIT_TEXT (*stp) != w1)
             break;
-          srp += dirnadd;
           if (DELIMIT_REND (*srp) != w2)
             break;
         }
+
       if ((col == bound.col) && (row != bound.row))
         {
           if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
             {
               trow = row + dirnadd;
               tcol = dirn == UP ? TermWin.ncol - 1 : 0;
+
               if (screen.text[trow] == NULL)
                 break;
+
               stp = & (screen.text[trow][tcol]);
               srp = & (screen.rend[trow][tcol]);
+
               if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
                 break;
+
               row = trow;
               col = tcol;
               continue;
@@ -2962,6 +3053,7 @@
         }
       break;
     }
+
 Old_Word_Selection_You_Die:
   D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up     " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
 
@@ -2993,29 +3085,25 @@
   MAX_IT (col, 0);
   MIN_IT (col, (int)TermWin.ncol);
 
-#ifndef NO_NEW_SELECTION
   /*
   * If we're selecting characters (single click) then we must check first
   * if we are at the same place as the original mark.  If we are then
   * select nothing.  Otherwise, if we're to the right of the mark, you have to
   * be _past_ a character for it to be selected.
   */
-  if (selection_style != OLD_SELECT)
-    {
-      if (((selection.clicks % 3) == 1) && !flag
-          && (col == selection.mark.col
-              && (row == selection.mark.row + TermWin.view_start)))
-        {
-          /* select nothing */
-          selection.beg.row = selection.end.row = 0;
-          selection.beg.col = selection.end.col = 0;
-          selection.clicks = 4;
-          want_refresh = 1;
-          D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
-          return;
-        }
+  if (((selection.clicks % 3) == 1) && !flag
+      && (col == selection.mark.col
+          && (row == selection.mark.row + TermWin.view_start)))
+    {
+      /* select nothing */
+      selection.beg.row = selection.end.row = 0;
+      selection.beg.col = selection.end.col = 0;
+      selection.clicks = 4;
+      want_refresh = 1;
+      D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
+      return;
     }
-#endif
+
   if (selection.clicks == 4)
     selection.clicks = 1;
 
@@ -3079,67 +3167,6 @@
 
   pos.row -= TermWin.view_start;   /* adjust for scroll */
 
-#ifndef NO_OLD_SELECTION
-  /*
-   * This mimics some of the selection behaviour of version 2.20 and before.
-   * There are no ``selection modes'', button3 is always character extension.
-   * Note: button3 drag is always available, c.f. v2.20
-   * Selection always terminates (left or right as appropriate) at the mark.
-   */
-  if (selection_style == OLD_SELECT)
-    {
-      if (selection.clicks == 1 || button3)
-        {
-          if (hate_those_clicks)
-            {
-              hate_those_clicks = 0;
-              if (selection.clicks == 1)
-                {
-                  selection.beg.row = selection.mark.row;
-                  selection.beg.col = selection.mark.col;
-                }
-              else
-                {
-                  selection.mark.row = selection.beg.row;
-                  selection.mark.col = selection.beg.col;
-                }
-            }
-          if (ROWCOL_IS_BEFORE (pos, selection.mark))
-            {
-              selection.end.row = selection.mark.row;
-              selection.end.col = selection.mark.col + 1;
-              selection.beg.row = pos.row;
-              selection.beg.col = pos.col;
-            }
-          else
-            {
-              selection.beg.row = selection.mark.row;
-              selection.beg.col = selection.mark.col;
-              selection.end.row = pos.row;
-              selection.end.col = pos.col + 1;
-            }
-        }
-      else if (selection.clicks == 2)
-        {
-          selection_delimit_word (UP, & (selection.mark),
-                                  & (selection.beg));
-          selection_delimit_word (DN, & (selection.mark),
-                                  & (selection.end));
-          hate_those_clicks = 1;
-        }
-      else if (selection.clicks == 3)
-        {
-          selection.beg.row = selection.end.row = selection.mark.row;
-          selection.beg.col = 0;
-          selection.end.col = ncol;
-          hate_those_clicks = 1;
-        }
-      D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
-      return;
-    }
-#endif                          /* ! NO_OLD_SELECTION */
-#ifndef NO_NEW_SELECTION
-  /* selection_style must not be OLD_SELECT to get here */
   /*
    * This is mainly xterm style selection with a couple of differences, mainly
    * in the way button3 drag extension works.
@@ -3154,7 +3181,7 @@
    *     time of the most recent button3 press
    */
   if (button3 && buttonpress)
-    {       /* button3 press */
+    { /* button3 press */
       /*
        * first determine which edge of the selection we are closest to
        */
@@ -3165,13 +3192,13 @@
                   < ((selection.end.col - pos.col)
                      + ((selection.end.row - pos.row) * ncol)))))
         closeto = LEFT;
+
       if (closeto == LEFT)
         {
           selection.beg.row = pos.row;
           selection.beg.col = pos.col;
           selection.mark.row = selection.end.row;
-          selection.mark.col = selection.end.col
-                               - (selection.clicks == 2);
+          selection.mark.col = selection.end.col - (selection.clicks == 2);
         }
       else
         {
@@ -3182,18 +3209,18 @@
         }
     }
   else
-    {                    /* button1 drag or button3 drag */
+    { /* button1 drag or button3 drag */
       if (ROWCOL_IS_AFTER (selection.mark, pos))
         {
           if ((selection.mark.row == selection.end.row)
               && (selection.mark.col == selection.end.col)
               && clickchange && selection.clicks == 2)
             selection.mark.col--;
+
           selection.beg.row = pos.row;
           selection.beg.col = pos.col;
           selection.end.row = selection.mark.row;
-          selection.end.col = selection.mark.col
-                              + (selection.clicks == 2);
+          selection.end.col = selection.mark.col + (selection.clicks == 2);
         }
       else
         {
@@ -3207,6 +3234,7 @@
   if (selection.clicks == 1)
     {
       end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
+
       if (end_col != -1 && selection.beg.col > end_col)
         {
 #if 1
@@ -3217,37 +3245,35 @@
           else
             selection.beg.col = selection.mark.col;
 #endif
-
         }
+
       end_col = screen.tlen[selection.end.row + TermWin.saveLines];
+
       if (end_col != -1 && selection.end.col > end_col)
         selection.end.col = ncol;
-
     }
   else if (selection.clicks == 2)
     {
       if (ROWCOL_IS_AFTER (selection.end, selection.beg))
         selection.end.col--;
-      selection_delimit_word (UP, & (selection.beg),
-                              & (selection.beg));
-      selection_delimit_word (DN, & (selection.end),
-                              & (selection.end));
+
+      selection_delimit_word (UP, & (selection.beg), & (selection.beg));
+      selection_delimit_word (DN, & (selection.end), & (selection.end));
     }
   else if (selection.clicks == 3)
     {
 #ifndef NO_FRILLS
       if ((Options & Opt_tripleclickwords))
         {
-          int             end_row;
+          int end_row;
+
+          selection_delimit_word (UP, & (selection.beg), & (selection.beg));
+          end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
 
-          selection_delimit_word (UP, & (selection.beg),
-                                  & (selection.beg));
-          end_row = screen.tlen[selection.mark.row
-                                + TermWin.saveLines];
-          for (end_row = selection.mark.row; end_row < TermWin.nrow;
-               end_row++)
+          for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
             {
               end_col = screen.tlen[end_row + TermWin.saveLines];
+
               if (end_col != -1)
                 {
                   selection.end.row = end_row;
@@ -3259,7 +3285,6 @@
         }
       else
 #endif
-
         {
           if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
             selection.mark.col++;
@@ -3267,8 +3292,9 @@
           selection.end.col = ncol;
         }
     }
+
   if (button3 && buttonpress)
-    {       /* mark may need to be changed */
+    { /* mark may need to be changed */
       if (closeto == LEFT)
         {
           selection.mark.row = selection.end.row;
@@ -3282,7 +3308,6 @@
         }
     }
   D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
-#endif                          /* ! NO_NEW_SELECTION */
 }
 
 #ifndef NO_FRILLS
@@ -3366,20 +3391,22 @@
 
   if (rq.target == xa[XA_TARGETS])
     {
-      Atom32 target_list[5];
+      Atom32 target_list[6];
       Atom32 *target = target_list;
 
       *target++ = (Atom32) xa[XA_TARGETS];
+      *target++ = (Atom32) xa[XA_TIMESTAMP];
       *target++ = (Atom32) XA_STRING;
       *target++ = (Atom32) xa[XA_TEXT];
       *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
 #if X_HAVE_UTF8_STRING
       *target++ = (Atom32) xa[XA_UTF8_STRING];
 #endif
+
       XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
-                      (8 * sizeof (target_list[0])), PropModeReplace,
-                      (unsigned char *)target_list,
-                      target - target_list);
+                       (8 * sizeof (target_list[0])), PropModeReplace,
+                       (unsigned char *)target_list,
+                       target - target_list);
       ev.property = rq.property;
     }
   else if (rq.target == xa[XA_MULTIPLE])
@@ -3389,8 +3416,8 @@
   else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
     {
       XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
-                      (8 * sizeof (Time)), PropModeReplace,
-                      (unsigned char *)&selection_time, 1);
+                       (8 * sizeof (Time)), PropModeReplace,
+                       (unsigned char *)&selection_time, 1);
       ev.property = rq.property;
     }
   else if (rq.target == XA_STRING
@@ -3401,7 +3428,7 @@
     {
       short freect = 0;
       int selectlen;
-      char *cl;
+      wchar_t *cl;
 
       target = rq.target;
 
@@ -3410,7 +3437,7 @@
         // will ask for another format anyways.
         style = XStringStyle;
       else if (target == xa[XA_TEXT])
-        style = XTextStyle;
+        style = XStdICCTextStyle;
       else if (target == xa[XA_COMPOUND_TEXT])
         style = XCompoundTextStyle;
 #if X_HAVE_UTF8_STRING
@@ -3425,16 +3452,18 @@
 
       if (selection.text)
         {
-          cl = (char *)selection.text;
+          cl = selection.text;
           selectlen = selection.len;
         }
       else
         {
-          cl = "";
+          cl = L"";
           selectlen = 0;
         }
 
-      if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
+      // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
+      // manually for XUTF8StringStyle.
+      if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
         freect = 1;
       else
         {
@@ -3451,6 +3480,7 @@
       if (freect)
         XFree (ct.value);
     }
+
   XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
 }