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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.314 by root, Tue Nov 4 14:34:13 2008 UTC

  * Insert/Delete <count> characters from the current position
  */
 void
 rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
 {
-  int col, row;
-  rend_t tr;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
   if (count <= 0)
     return;
   scr_do_wrap ();
   selection_check (1);
   min_it (count, ncol - screen.cur.col);
-  row = screen.cur.row;
+  int row = screen.cur.row;
   line_t *line = &ROW(row);
   line->touch ();
   line->is_longer (0);
   switch (insdel)
     {
       case INSERT:
-        for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
+        line->l = min (line->l + count, ncol);
+        for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
           {
             line->t[col] = line->t[col - count];
             line->r[col] = line->r[col - count];
           }
-        line->l = min (line->l + count, ncol);
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
             if (selection.end.row != screen.cur.row
         scr_blank_line (*line, screen.cur.col, count, rstyle);
         break;
       case DELETE:
+        {
+          line->l = max (line->l - count, 0);
-        tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
+          rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
-        for (col = screen.cur.col; (col + count) < ncol; col++)
+          for (int col = screen.cur.col; (col + count) < ncol; col++)
-          {
+            {
-            line->t[col] = line->t[col + count];
+              line->t[col] = line->t[col + count];
-            line->r[col] = line->r[col + count];
+              line->r[col] = line->r[col + count];
-          }
+            }
-        line->l = max (line->l - count, 0);
+          // nuke wide char at the end
+          if (line->t[screen.cur.col] == NOCHAR)
+            scr_kill_char (*line, screen.cur.col);
-        scr_blank_line (*line, ncol - count, count, tr);
+          scr_blank_line (*line, ncol - count, count, tr);
-        if (selection.op && current_screen == selection.screen
+          if (selection.op && current_screen == selection.screen
-            && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
+              && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
-          {
+            {
-            if (selection.end.row != screen.cur.row
+              if (selection.end.row != screen.cur.row
-                || (screen.cur.col >= selection.beg.col - count)
+                  || (screen.cur.col >= selection.beg.col - count)
-                || selection.end.col >= ncol)
+                  || selection.end.col >= ncol)
-              CLEAR_SELECTION ();
+                CLEAR_SELECTION ();
-            else
+              else
-              {
+                {
-                /* shift selection */
+                  /* shift selection */
-                selection.beg.col  -= count;
+                  selection.beg.col  -= count;
-                selection.mark.col -= count; /* XXX: yes? */
+                  selection.mark.col -= count; /* XXX: yes? */
-                selection.end.col  -= count;
+                  selection.end.col  -= count;
-              }
+                }
+            }
           }
         break;
     }
 }

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC vs. Revision 1.314 by root, Tue Nov 4 14:34:13 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.314 by root, Tue Nov 4 14:34:13 2008 UTC