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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

       if (nsaved)
         {
           // re-wrap lines, this is rather ugly, possibly because I am too dumb
           // to come up with a lean and mean algorithm.
-          while (p != pend && q > 0)
+          row_col_t ocur = screen.cur;
+          ocur.row = MOD (term_start + ocur.row, prev_total_rows);
+          do
             {
               p = MOD (p - 1, prev_total_rows);
 #ifdef DEBUG_STRICT
               assert (old_buf [MOD (p, prev_total_rows)].t);
 #endif
+              int plines = 1;
               int llen = old_buf [MOD (p, prev_total_rows)].l;
               while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
                 {
                   p = MOD (p - 1, prev_total_rows);
+                  plines++;
                   llen += prev_ncol;
                 }
               int qlines = max (0, (llen - 1) / ncol) + 1;
                   while (lofs < llen && qcol < ncol)
                     {
                       int prow = lofs / prev_ncol;
                       int pcol = lofs % prev_ncol;
-                      line_t &pline = old_buf [MOD (p + prow, prev_total_rows)];
+                      prow = MOD (p + prow, prev_total_rows);
+                      // we only adjust the cursor _row_ and put it into
+                      // the topmost line of "long line" it was in, as
+                      // this seems to upset applications/shells/readline
+                      // least.
+                      if (prow == ocur.row)
+                        screen.cur.row = q - (total_rows - nrow);
+                      line_t &pline = old_buf [prow];
                       int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
                       assert (len);
                       assert (pline.t);
                 }
               qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
               scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
             }
+          while (p != pend && q > 0);
           term_start = total_rows - nrow;
-          view_start = 0;
           nsaved = term_start - q;
           // make sure all terminal lines exist
           while (nsaved < 0)
             scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
             {
               row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
             }
           term_start = 0;
-          view_start = 0;
         }
-#ifdef DEBUG_STRICT
+#ifdef DEBUG_STRICT //TODO: remove
       for (int i = -nsaved; i < nrow; i++)
         assert (ROW (i).t);
 #endif
       free (old_buf);
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
           selection.mark.row -= count;
-          selection_check (0);
+          if (selection.beg.row < -nsaved
+              || selection.end.row < -nsaved
+              || selection.mark.row < -nsaved)
+            {
+              CLEAR_ALL_SELECTION ();
+              selection.op = SELECTION_CLEAR;
+            }
         }
       for (int i = count; i--; )
         scr_blank_screen_mem (ROW(row2 - i), rstyle);
     }
   else
     {
       if (selection.op && current_screen == selection.screen)
         {
-          int i = selection.beg.row;
+          if ((selection.beg.row < row1 && selection.end.row > row1)
-          int j = selection.end.row;
+              || (selection.beg.row < row2 && selection.end.row > row2)
-          if ((i < row1 && j > row1)
-              || (i < row2 && j > row2)
-              || (i - count < row1 && i >= row1)
+              || (selection.beg.row - count < row1 && selection.beg.row >= row1)
-              || (i - count > row2 && i <= row2)
+              || (selection.beg.row - count > row2 && selection.beg.row <= row2)
-              || (j - count < row1 && j >= row1)
+              || (selection.end.row - count < row1 && selection.end.row >= row1)
-              || (j - count > row2 && j <= row2))
+              || (selection.end.row - count > row2 && selection.end.row <= row2))
             {
               CLEAR_ALL_SELECTION ();
-              selection.op = SELECTION_CLEAR;  /* XXX: too aggressive? */
+              selection.op = SELECTION_CLEAR;
             }
-          else if (j >= row1 && j <= row2)
+          else if (selection.end.row >= row1 && selection.end.row <= row2)
             {
               /* move selected region too */
               selection.beg.row  -= count;
               selection.end.row  -= count;
               selection.mark.row -= count;
   if (len <= 0)               /* sanity */
     return;
   unsigned char checksel;
   unicode_t c;
-  int row, last_col;
+  int last_col;
   const unicode_t *strend = str + len;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
   last_col = ncol;
 #ifdef DEBUG_STRICT
   assert (screen.cur.col < last_col);
   assert (screen.cur.row < nrow
           && screen.cur.row >= -nsaved);
 #endif
-  row = screen.cur.row;
+  int row = screen.cur.row;
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
   line_t *line = &ROW(row);
   if (count == 0)
     return;
   else if (count > 0)
     {
-      int row = screen.cur.row;
-      line_t &l = ROW(row);
+      line_t &l = ROW(screen.cur.row);
       rend_t base_rend = l.r[i];
       ht &= l.t[i] == ' ';
       for (; ++i < ncol; )
         if (tabs[i])
  */
 #if ENABLE_FRILLS
 void
 rxvt_term::scr_forwardindex ()
 {
-  int row;
   if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
   else
     {
-      row = screen.cur.row;
-      if (ROW(row).is_longer ()) //TODO//FIXME//LEN
+      if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
-        ROW(row).l = ncol;
+        ROW(screen.cur.row).l = ncol;
       scr_gotorc (0, 0, R_RELATIVE);
       scr_insdel_chars (1, DELETE);
       scr_gotorc (0, ncol - 1, R_RELATIVE);
     }
  * XTERM_SEQ: Clear whole line   : ESC [ 2 K
  */
 void
 rxvt_term::scr_erase_line (int mode)
 {
-  unsigned int row, col, num;
+  unsigned int col, num;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
   selection_check (1);
-  row = screen.cur.row;
+  line_t &line = ROW(screen.cur.row);
   switch (mode)
     {
       case 0:                     /* erase to end of line */
         col = screen.cur.col;
         num = ncol - col;
-        min_it (ROW(row).l, col);
+        min_it (line.l, col);
         if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
             || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
           CLEAR_SELECTION ();
         break;
       case 1:                     /* erase to beginning of line */
           CLEAR_SELECTION ();
         break;
       case 2:                     /* erase whole line */
         col = 0;
         num = ncol;
-        ROW(row).l = 0;
+        line.l = 0;
         if (selection.beg.row <= screen.cur.row
             && selection.end.row >= screen.cur.row)
           CLEAR_SELECTION ();
         break;
       default:
         return;
     }
-  scr_blank_line (ROW(row), col, num, rstyle);
+  scr_blank_line (line, col, num, rstyle);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Erase part of whole of the screen

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.189 by root, Thu Dec 22 15:28:15 2005 UTC vs. Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC