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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC

 #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y)                                \
     ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
 #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y)                               \
     ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
-#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
-#define ROW(n) (save [LINENO (n)])
 /*
  * CLEAR_ROWS : clear <num> rows starting from row <row>
  * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
  * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
  */
       if (nrow < prev_nrow)
         {
           /* delete rows */
           k = min (nsaved, prev_nrow - nrow);
           // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
-          scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
+          scr_scroll_text (0, (int)prev_nrow - 1, k);
           for (p = nrow; p < prev_nrow; p++)
             {
               lfree (ROW(p));
               lfree (swap_save[p]);
               drawn[p].clear ();     scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
             }
           if (k > 0)
             {
-              scr_scroll_text (0, (int)nrow - 1, -k, 1);
+              scr_scroll_text (0, (int)nrow - 1, -k);
               screen.cur.row += k;
               screen.s_cur.row += k;
               nsaved -= k;
             }
  * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
  */
 int
 rxvt_term::scr_change_screen (int scrn)
 {
-  int i;
-#if NSCREENS
-  int offset;
-#endif
   want_refresh = 1;
   view_start = 0;
   if (current_screen == scrn)
     return scrn;
   selection_check (2);        /* check for boundary cross */
-  i = current_screen; current_screen = scrn; scrn = i;
+  SWAP_IT (scrn, current_screen, int);
   SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
   SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
   MAX_IT (screen.cur.row, 0);
   MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
 #if NSCREENS
   if (options & Opt_secondaryScreen)
     {
       num_scr = 0;
-      offset = saveLines;
-      for (i = prev_nrow; i--;)
+      for (int i = nrow; i--; )
         SWAP_IT (ROW(i), swap_save[i], line_t);
       SWAP_IT (screen.charset, swap.charset, int16_t);
       SWAP_IT (screen.flags, swap.flags, int);
       screen.flags |= Screen_VisibleCursor;
       swap.flags |= Screen_VisibleCursor;
     }
   else
 #endif
     if (options & Opt_secondaryScroll)
-      scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
+      scr_scroll_text (0, prev_nrow - 1, prev_nrow);
   return scrn;
 }
 // clear WrapNext indicator, solidifying position on next line
   screen.flags &= ~Screen_WrapNext;
   screen.cur.col = 0;
   if (screen.cur.row == screen.bscroll)
-    scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
+    scr_scroll_text (screen.tscroll, screen.bscroll, 1);
   else if (screen.cur.row < nrow - 1)
     screen.cur.row++;
 }
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 /*
  * Scroll text between <row1> and <row2> inclusive, by <count> lines
  * count positive ==> scroll up
  * count negative ==> scroll down
- * spec == 0 for normal routines
  */
 int
-rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
+rxvt_term::scr_scroll_text (int row1, int row2, int count)
 {
-  int i, j;
   if (count == 0 || (row1 > row2))
     return 0;
   want_refresh = 1;
+  num_scr += count;
-  if (row1 == 0 && count > 0
+  if (count > 0
+      && row1 == 0
+      && row2 == nrow - 1
       && (current_screen == PRIMARY || options & Opt_secondaryScroll))
     {
       nsaved = min (nsaved + count, saveLines);
       term_start = (term_start + count) % total_rows;
       if (selection.op && current_screen == selection.screen)
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
           selection.mark.row -= count;
+          selection_check (0);
         }
       for (int i = count; i--; )
         scr_blank_screen_mem (ROW(row2 - i), rstyle);
           && view_start != saveLines)
         scr_page (UP, count);
     }
   else
     {
-      if (!spec)
-        row1 += saveLines;
-      row2 += saveLines;
       if (selection.op && current_screen == selection.screen)
         {
-          i = selection.beg.row + saveLines;
+          int i = selection.beg.row;
-          j = selection.end.row + saveLines;
+          int j = selection.end.row;
           if ((i < row1 && j > row1)
               || (i < row2 && j > row2)
               || (i - count < row1 && i >= row1)
               || (i - count > row2 && i <= row2)
             {
               /* move selected region too */
               selection.beg.row  -= count;
               selection.end.row  -= count;
               selection.mark.row -= count;
+              selection_check (0);
             }
         }
-      selection_check (0);        /* _after_ nsaved update */
+      // use a simple and robust scrolling algorithm, this
+      // part of scr_scroll_text is not time-critical.
-      num_scr += count;
-      j = count;
-      if (count < 0)
-        count = -count;
-      i = row2 - row1 + 1;
+      int rows = row2 - row1 + 1;
-      MIN_IT (count, i);
-      if (j > 0)
+      for (int row = 0; row < rows; row++)
-        {
-          /* scroll up */
-          /* Copy lines that will get clobbered by the rotation */
-          memcpy (buf, save + row1, count * sizeof (line_t));
-          /* Rotate lines */
-          i = row2 - row1 - count + 1;
-          memmove (save + row1, save + row1 + count, i * sizeof (line_t));
-          j = row2 - count + 1, i = count;
-        }
+        {
-      else /* if (j < 0) */
+          buf [row] = ROW(row1 + (row + count + rows) % rows);
+          if (!IN_RANGE_EXC (row + count, 0, rows))
+            scr_blank_screen_mem (buf [row], rstyle);
-        {
+        }
-          /* scroll down */
-          /* Copy lines that will get clobbered by the rotation */
+      for (int row = 0; row < rows; row++)
-          for (i = 0, j = row2; i < count; i++, j--)
+        ROW(row1 + row) = buf [row];
-            buf[i] = save[j];
-          /* Rotate lines */
-          for (j = row2, i = j - count; i >= row1; i--, j--)
-            save[j] = save[i];
-          j = row1, i = count;
-          count = -count;
-        }
-      /* Resurrect lines */
-      memcpy (save + j, buf, i * sizeof (line_t));
-      if (!spec) /* line length may not equal ncol */
-        for (; i--; j++)
-          scr_blank_screen_mem (save[j], rstyle);
     }
   return count;
 }
       if ((nlines > 0)
           && (screen.tscroll == 0)
           && (screen.bscroll == (nrow - 1)))
         {
           /* _at least_ this many lines need to be scrolled */
-          scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
+          scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
           screen.cur.row -= nlines;
         }
     }
 #ifdef DEBUG_STRICT
               MAX_IT (line->l, screen.cur.col);
             screen.flags &= ~Screen_WrapNext;
             if (screen.cur.row == screen.bscroll)
-              scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
+              scr_scroll_text (screen.tscroll, screen.bscroll, 1);
             else if (screen.cur.row < (nrow - 1))
               row = ++screen.cur.row;
             line = &ROW(row);  /* _must_ refresh */
             continue;
   screen.flags &= ~Screen_WrapNext;
   if ((screen.cur.row == screen.bscroll && direction == UP)
       || (screen.cur.row == screen.tscroll && direction == DN))
-    scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
+    scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
   else
     screen.cur.row += dirn;
   MAX_IT (screen.cur.row, 0);
   MIN_IT (screen.cur.row, (int32_t)nrow - 1);
  */
 void
 rxvt_term::scr_erase_screen (int mode)
 {
   int num;
-  int32_t row, row_offset;
+  int32_t row;
   rend_t ren;
   XGCValues gcvalue;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
-  row_offset = (int32_t)saveLines;
   switch (mode)
     {
       case 0:                     /* erase to end of screen */
         selection_check (1);
       XChangeGC (display->display, gc, GCForeground, &gcvalue);
     }
   for (; num--; row++)
     {
-      scr_blank_screen_mem (save[row + row_offset], rstyle);
+      scr_blank_screen_mem (ROW (row), rstyle);
-      save[row + row_offset].l = 0;
+      ROW (row).l = 0;
       scr_blank_line (drawn[row], 0, ncol, ren);
     }
 }
 #if ENABLE_FRILLS
  * XTERM_SEQ: Screen Alignment Test: ESC # 8
  */
 void
 rxvt_term::scr_E ()
 {
-  int i, j, k;
-  rend_t *r1, fs;
+  rend_t fs;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
   num_scr_allow = 0;
   selection_check (3);
   fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
-  for (k = saveLines, i = nrow; i--; k++)
+  for (int row = nrow; row--; )
     {
-      line_t &line = save[k];
+      line_t &line = ROW(row);
       fill_text (line.t, 'E', ncol);
+      rend_t *r1 = line.r;
-      for (r1 = line.r, j = ncol; j--; )
+      for (int j = ncol; j--; )
         *r1++ = fs;
       line.l = ncol;    /* make the `E's selectable */
     }
 }
         count = end;
     }
   scr_do_wrap ();
-  scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
+  scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Insert/Delete <count> characters from the current position
   scr_do_wrap ();
   selection_check (1);
   MIN_IT (count, (ncol - screen.cur.col));
-  row = screen.cur.row + saveLines;
+  row = screen.cur.row;
-  line_t *line = save + row;
+  line_t *line = &ROW(row);
   switch (insdel)
     {
       case INSERT:
         for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
                 selection.mark.col += count; /* XXX: yes? */
                 selection.end.col  += count;
               }
           }
-        scr_blank_line (save[row], screen.cur.col, count, rstyle);
+        scr_blank_line (*line, screen.cur.col, count, rstyle);
         break;
       case ERASE:
         screen.cur.col += count;     /* don't worry if > ncol */
         selection_check (1);
         screen.cur.col -= count;
-        scr_blank_line (save[row], screen.cur.col, count, rstyle);
+        scr_blank_line (*line, screen.cur.col, count, rstyle);
         break;
       case DELETE:
         tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
         scr_blank_line (*line, ncol - count, count, tr);
         if (line->is_longer ()) /* break line continuation */
           line->l = ncol;
-        line->l -= count;
+        line->l = max (line->l - count, 0);
-        MAX_IT (line->l, 0);
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
             if (selection.end.row != screen.cur.row
 /* ARGSUSED */
 void
 rxvt_term::scr_printscreen (int fullhist)
 {
 #ifdef PRINTPIPE
-  int i, r1, nrows, row_offset;
+  int nrows, row_start;
   FILE *fd;
   if ((fd = popen_printer ()) == NULL)
     return;
-  nrows = nrow;
-  row_offset = saveLines;
-  if (!fullhist)
+  if (fullhist)
-    row_offset -= view_start;
+    {
+      nrows = nrow + nsaved;
+      row_start = -nsaved;
+    }
   else
     {
-      nrows += nsaved;
+      nrows = nrow;
-      row_offset -= nsaved;
+      row_start = -view_start;
     }
   wctomb (0, 0);
-  for (r1 = 0; r1 < nrows; r1++)
+  for (int r1 = 0; r1 < nrows; r1++)
     {
-      text_t *tp = save[r1 + row_offset].t;
+      text_t *tp = ROW(r1).t;
-      int len    = save[r1 + row_offset].l;
+      int len    = ROW(r1).l;
-      for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
+      for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
         {
           char mb[MB_LEN_MAX];
           text_t t = *tp++;
           if (t == NOCHAR)
             continue;
    * D: CopyArea pass - very useful for slower links
    *    This has been deliberately kept simple.
    */
   i = num_scr;
   if (!display->is_local
-      && refresh_type == FAST_REFRESH && num_scr_allow && i
+      && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
-      && abs (i) < nrow && !must_clear)
+      && abs (num_scr) < nrow && !must_clear)
     {
       int16_t nits;
       int j;
       int len, wlen;
       row = i > 0 ? 0 : j - 1;
       for (; j-- >= 0; row += (i > 0 ? 1 : -1))
         {
           if (row + i >= 0 && row + i < nrow && row + i != ocrow)
             {
-              line_t s  = save[(row + row_offset) % nlines];
+              line_t s  = save[(row + row_offset) % total_rows];
               line_t d  = drawn[row];
               line_t d2 = drawn[row + i];
               for (nits = 0, col = ncol; col--; )
                 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
  * flag == 2 ==> button 3 motion
  */
 void
 rxvt_term::selection_extend (int x, int y, int flag)
 {
-  int col = min (max (Pixel2Col (x), 0), nrow - 1);
+  int col = min (max (Pixel2Col (x), 0), ncol);
-  int row = min (max (Pixel2Row (y), 0), ncol);
+  int row = min (max (Pixel2Row (y), 0), nrow - 1);
   /*
   * 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
           for (int end_row = selection.mark.row; end_row < nrow; end_row++)
             {
               if (!ROW(end_row).is_longer ())
                 {
                   selection.end.row = end_row;
-                  selection.end.col = save[end_row + saveLines].l;
+                  selection.end.col = ROW(end_row).l;
                   selection_remove_trailing_spaces ();
                   break;
                 }
             }
         }

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs. Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC