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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.41 by pcg, Sun Feb 29 15:31:56 2004 UTC vs.
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC

       // 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)
+        {
-        do
+          do
-          {
+            {
-            stp[screen.cur.col] = c;
+              stp[screen.cur.col] = c;
-            srp[screen.cur.col] = rend;
+              srp[screen.cur.col] = rend;
-            if (screen.cur.col < last_col - 1)
+              if (screen.cur.col < last_col - 1)
-              screen.cur.col++;
+                screen.cur.col++;
-            else
+              else
-              {
+                {
-                screen.tlen[row] = last_col;
+                  screen.tlen[row] = last_col;
-                if (screen.flags & Screen_Autowrap)
+                  if (screen.flags & Screen_Autowrap)
-                  screen.flags |= Screen_WrapNext;
+                    screen.flags |= Screen_WrapNext;
-                break;
+                  break;
-              }
+                }
-            c = NOCHAR;
+              c = NOCHAR;
-          }
+            }
-        while (--width > 0);
+          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++)
+            {
+              stp[c] = ' ';
+              srp[c] = rend;
+            }
+        }
       else
         (void)0; /* handle combining character etc. here. */
     }
   if (screen.tlen[row] != -1)      /* XXX: think about this */
       else
         screen.cur.row = row;
     }
   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--;
 }
 /* ------------------------------------------------------------------------- */
 /*
  * direction  should be UP or DN
       int ypixel = (int)Row2Pixel (row);
       for (col = 0; col < TermWin.ncol; col++)
         {
           /* compare new text with old - if exactly the same then continue */
+          if (stp[col] == dtp[col]    /* Must match characters to skip. */
+              && (srp[col] == drp[col]    /* Either rendition the same or   */
+                  || (stp[col] == ' ' /* space w/ no background change  */
+                      && 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) */
-          if (stp[col] == dtp[col]    /* Must match characters to skip. */
-              && (rend == drp[col]    /* Either rendition the same or   */
-                  || (stp[col] == ' ' /* space w/ no background change  */
-                      && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
-            continue;
           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
           // and cleaned a bit by you?
           else
             font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
           if ((rend & RS_Uline) && (font->descent > 1))
             XDrawLine (display->display, drawBuffer, TermWin.gc,
-                      xpixel, ypixel + font->ascent + 1,
+                       xpixel, ypixel + font->ascent + 1,
-                      xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
+                       xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
         }                     /* for (col....) */
     }                         /* for (row....) */
   /*
    * G: cleanup cursor and display outline cursor if necessary
           while (oldcursor.col + cursorwidth < TermWin.ncol
                  && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
             cursorwidth++;
           XDrawRectangle (display->display, drawBuffer, TermWin.gc,
-                         Col2Pixel (oldcursor.col),
+                          Col2Pixel (oldcursor.col),
-                         Row2Pixel (oldcursor.row),
+                          Row2Pixel (oldcursor.row),
-                         (unsigned int) (Width2Pixel (cursorwidth) - 1),
+                          (unsigned int) (Width2Pixel (cursorwidth) - 1),
-                         (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
+                          (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
         }
     }
   /*
    * H: cleanup selection
     /*
      * clear the whole screen height, note that width == 0 is treated
      * specially by XClearArea
      */
     XClearArea (display->display, TermWin.vt, 0, 0,
-               (unsigned int)TermWin.int_bwidth,
+                (unsigned int)TermWin.int_bwidth,
-               (unsigned int)TermWin_TotalHeight (), False);
+                (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,
+                TermWin.width + TermWin.int_bwidth, 0,
-               (unsigned int)TermWin.int_bwidth,
+                (unsigned int)TermWin.int_bwidth,
-               (unsigned int)TermWin_TotalHeight (), False);
+                (unsigned int)TermWin_TotalHeight (), False);
   if (refresh_type & SMOOTH_REFRESH)
     XSync (display->display, False);
   num_scr = 0;
   num_scr_allow = 1;
     }
 }
 /* ------------------------------------------------------------------------- */
 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))
     {
       int i;
         if (TermWin.parent[i] != None)
           XClearWindow (display->display, TermWin.parent[i]);
     }
 #endif
+  if (really)
-  XClearWindow (display->display, TermWin.vt);
+    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;
+      int end_row = TermWin.saveLines - TermWin.view_start;
-      i = selection.beg.row + TermWin.saveLines;
+      int i = selection.beg.row + TermWin.saveLines;
-      row = selection.end.row + TermWin.saveLines;
+      int col, row = selection.end.row + TermWin.saveLines;
+      rend_t *srp;
       if (i >= end_row)
         col = selection.beg.col;
       else
         {
           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;
     }
 }
  * EXT: button 1 or 3 release
  */
 void
 rxvt_term::selection_make (Time tm)
 {
-  int             i, col, end_col, row, end_row;
+  int i, col, end_col, row, end_row;
-  unsigned char  *new_selection_text;
+  unsigned char *new_selection_text;
-  char           *str;
+  char *str;
-  text_t         *t;
+  text_t *t;
-#ifdef ACS_ASCII
-  rend_t         *re;
-#endif
   D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
   switch (selection.op)
     {
       case SELECTION_CONT:
   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);
+  str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1);
   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;
   for (; row <= end_row; row++, col = 0)
     {
       t = & (screen.text[row][col]);
       for (; col < end_col; col++)
         if (*t == NOCHAR)
           t++;
         else
           {
-            int len = wctomb (str, *t++);
+            int len = wcrtomb (str, *t++, mbs);
             if (len > 0)
               str += len;
           }
       if (screen.tlen[row] != -1 && row != end_row)

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.41 by pcg, Sun Feb 29 15:31:56 2004 UTC vs. Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.41 by pcg, Sun Feb 29 15:31:56 2004 UTC vs.
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC