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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.57 by pcg, Sun Mar 14 17:33:08 2004 UTC

  * 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)
 {
-  unsigned char   checksel, clearsel;
+  unsigned char checksel, clearsel;
-  uint32_t        c;
+  uint32_t c;
-  int             i, row, last_col;
+  int i, row, last_col;
-  text_t         *stp;
+  text_t *stp;
-  rend_t         *srp;
+  rend_t *srp;
   if (len <= 0)               /* sanity */
     return;
   want_refresh = 1;
           && ROWCOL_IS_BEFORE (screen.cur, selection.end))
         {
           checksel = 0;
           clearsel = 1;
         }
       if (screen.flags & Screen_WrapNext)
         {
           screen.tlen[row] = -1;
           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 */
           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 '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;
           }
-      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);
-      // width -1 characters (e.g. combining chars) are ignored currently.
       if (width > 0)
         {
+#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));
           do
             {
               stp[screen.cur.col] = c;
               srp[screen.cur.col] = rend;
               c = NOCHAR;
             }
           while (--width > 0);
           // pad with spaces when overwriting wide character with smaller one
-          for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++)
+          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
+          else
-        (void)0; /* handle combining character etc. here. */
+            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
+          uint32_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 */
     MAX_IT (screen.tlen[row], screen.cur.col);
               else
                 rvid = !rvid;
             }
           if (rend & RS_Uline)
-            {
-              if (ISSET_PIXCOLOR (Color_UL))
+            if (ISSET_PIXCOLOR (Color_UL))
-                fore = Color_UL;
+              fore = Color_UL;
-            }
 #endif
           if (rvid)
             {
               SWAP_IT (fore, back, int);
         }
       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
             {
               /*
                * pass through again trying CUT_BUFFER0 if we've come from
 {
   int             reget_time = 0;
   if (prop == None)
     return;
   D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
   if (selection_wait == Sel_normal)
     {
-      int             a, afmt;
+      int a, afmt;
-      Atom            atype;
+      Atom atype;
-      unsigned long   bytes_after, nitems;
+      unsigned long bytes_after, nitems;
-      unsigned char  *s = NULL;
+      unsigned char *s = NULL;
       a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
                              xa[XA_INCR], &atype, &afmt, &nitems,
                              &bytes_after, &s);
       if (s)
         XFree (s);
       if (a != Success)
         return;
 #ifndef __CYGWIN32__
       if (atype == xa[XA_INCR])
         {  /* start an INCR transfer */
           D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
           XDeleteProperty (display->display, win, prop);
     }
   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"));
           selection_wait = Sel_none;
           incr_ev.stop ();
         }
     }
   if (reget_time) /* received more data so reget time */
     incr_ev.start (NOW + 10);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Request the current selection:
  * Order: > internal selection if available
  *        > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
  */
 void
 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)
+  if (selection.text)
-    {    /* internal selection */
+    { /* 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++)
         {
             return;
 #endif
         }
     }
   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);
 }
 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;
 }
 /* ------------------------------------------------------------------------- */
 /*
  */
 void
 rxvt_term::selection_make (Time tm)
 {
   int i, col, end_col, row, end_row;
-  unsigned char *new_selection_text;
+  wchar_t *new_selection_text;
-  char *str;
   text_t *t;
   D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
   switch (selection.op)
     {
   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;
+  i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
-  str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1);
+  new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
-  new_selection_text = (unsigned char *)str;
   col = selection.beg.col;
   MAX_IT (col, 0);
   row = selection.beg.row + TermWin.saveLines;
   end_row = selection.end.row + TermWin.saveLines;
-  struct mbstate mbs;
+  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];
       if (end_col == -1)
         end_col = TermWin.ncol;
       if (row == end_row)
         MIN_IT (end_col, selection.end.col);
       for (; col < end_col; col++)
+        {
-        if (*t == NOCHAR)
+          if (*t == NOCHAR)
-          t++;
+            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
+          else
-          {
+            new_selection_text[ofs++] = *t++;
-            int len = wcrtomb (str, *t++, mbs);
-            if (len > 0)
-              str += len;
-          }
+        }
       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';
+      new_selection_text[ofs++] = L'\n';
 #endif
 #ifndef NO_NEW_SELECTION
   if (selection_style != OLD_SELECT)
     if (end_col != selection.end.col)
-      *str++ = '\n';
+      new_selection_text[ofs++] = L'\n';
 #endif
-  *str = '\0';
+  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_CUR_MAX, 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");
-  {
+#if 0
-    XTextProperty ct;
+  XTextProperty ct;
-    char *cl = (char *)selection.text;
-    if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0)
+  if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
-      {
+    {
-        XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
-                         PropModeReplace, ct.value, ct.nitems);
-        XFree (ct.value);
-      }
-    else
       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));
 }
   ev.target = rq.target;
   ev.time = rq.time;
   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,
+                       (8 * sizeof (target_list[0])), PropModeReplace,
-                      (unsigned char *)target_list,
+                       (unsigned char *)target_list,
-                      target - target_list);
+                       target - target_list);
       ev.property = rq.property;
     }
   else if (rq.target == xa[XA_MULTIPLE])
     {
       /* TODO: Handle MULTIPLE */
            || rq.target == xa[XA_UTF8_STRING]
           )
     {
       short freect = 0;
       int selectlen;
-      char *cl;
+      wchar_t *cl;
       target = rq.target;
       if (target == XA_STRING)
         // we actually don't do XA_STRING, but who cares, as i18n clients
         // 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
       else if (target == xa[XA_UTF8_STRING])
         style = XUTF8StringStyle;
           style = XCompoundTextStyle;
         }
       if (selection.text)
         {
-          cl = (char *)selection.text;
+          cl = selection.text;
           selectlen = selection.len;
         }
       else
         {
-          cl = "";
+          cl = L"";
           selectlen = 0;
         }
+      // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
+      // manually for XUTF8StringStyle.
-      if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
+      if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
         freect = 1;
       else
         {
           /* if we failed to convert then send it raw */
           ct.value = (unsigned char *)cl;
       ev.property = rq.property;
       if (freect)
         XFree (ct.value);
     }
   XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 /* ------------------------------------------------------------------------- *
  *                              MOUSE ROUTINES                               *

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs. Revision 1.57 by pcg, Sun Mar 14 17:33:08 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.57 by pcg, Sun Mar 14 17:33:08 2004 UTC