--- rxvt-unicode/src/screen.C	2005/12/19 02:40:14	1.174
+++ rxvt-unicode/src/screen.C	2005/12/26 23:12:59	1.196
@@ -118,6 +118,13 @@
 void
 rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
 {
+  if (!l.t)
+    {
+      lalloc (l);
+      col = 0;
+      width = ncol;
+    }
+
   efs &= ~RS_baseattrMask;
   efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
 
@@ -136,21 +143,16 @@
 void
 rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
 {
-  if (!l.t)
-    lalloc (l);
-
   scr_blank_line (l, 0, ncol, efs);
 }
 
 /* ------------------------------------------------------------------------- *
  *                          SCREEN INITIALISATION                            *
  * ------------------------------------------------------------------------- */
+
 void
 rxvt_term::scr_reset ()
 {
-  unsigned int p, q;
-  int k;
-
 #if ENABLE_OVERLAY
   scr_overlay_off ();
 #endif
@@ -170,46 +172,42 @@
   // we need at least two lines for wrapping to work correctly
   if (nrow + saveLines < 2)
     {
+      //TODO//FIXME
       saveLines++;
       prev_nrow--;
-      nscrolled++;
+      nsaved++;
     }
 
   want_refresh = 1;
 
   int prev_total_rows = prev_nrow + saveLines;
-  int total_rows = nrow + saveLines;
+  total_rows = nrow + saveLines;
 
   screen.tscroll = 0;
   screen.bscroll = nrow - 1;
 
-  if (!save)
+  if (!row_buf)
     {
       /*
        * first time called so just malloc everything: don't rely on realloc
        * Note: this is still needed so that all the scrollback lines are NULL
        */
-      nscrolled = 0;       /* no saved lines */
+      nsaved = 0;       /* no saved lines */
       term_start = 0;
-      nsaved = 0;
 
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
       ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
 
-      save      = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
-      buf       = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
-      drawn     = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
-      swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
-
-      screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
-
-      scr_update_term ();
-
-      for (p = nrow; p--; )
-        {
-          scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE);
-          scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
-          scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
+      row_buf   = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+      temp_buf  = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+      drawn_buf = (line_t *)rxvt_calloc (nrow      , sizeof (line_t));
+      swap_buf  = (line_t *)rxvt_calloc (nrow      , sizeof (line_t));
+
+      for (int row = nrow; row--; )
+        {
+          scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
+          scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
+          scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
         }
 
       memset (charsets, 'B', sizeof (charsets));
@@ -243,184 +241,171 @@
        * add or delete rows as appropriate
        */
 
-      rxvt_salloc *old_ta;
-      rxvt_salloc *old_ra;
+      rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
+      rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
 
+#if 0
       if (nrow < prev_nrow)
         {
-          /* delete rows */
-          k = min (nscrolled, 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);
-
-          for (p = nrow; p < prev_nrow; p++)
+          for (int row = nrow; row < prev_nrow; row++)
             {
-              lfree (save[p + saveLines]);
-              lfree (swap_save[p]);
-              lfree (drawn[p]);
+              lfree (swap_buf [row]);
+              lfree (drawn_buf[row]);
             }
-
-          /* we have fewer rows so fix up cursor position */
-          MIN_IT (screen.cur.row, (int32_t)nrow - 1);
-
-          scr_reset_realloc (); /* realloc _last_ */
         }
-      else if (nrow > prev_nrow)
-        {
-          /* add rows */
-          scr_reset_realloc (); /* realloc _first_ */
-
-          int ocol = ncol;
-          ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
-
-          k = min (nscrolled, nrow - prev_nrow);
-
-          for (p = prev_total_rows; p < total_rows; p++)
-            save[p].clear ();
-
-          for (p = prev_total_rows; p < total_rows - k; p++)
-            scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
-
-          scr_update_term ();
+#endif
 
-          for (p = prev_nrow; p < nrow; p++)
-            {
-              swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
-              drawn[p].clear ();     scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
-            }
+      drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
+      temp_buf  = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
+      swap_buf  = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
 
-          if (k > 0)
-            {
-              scr_scroll_text (0, (int)nrow - 1, -k, 1);
-              screen.cur.row += k;
-              screen.s_cur.row += k;
-              nscrolled -= k;
-            }
-
-#ifdef DEBUG_STRICT
-          assert (screen.cur.row < nrow);
-#else                           /* drive with your eyes closed */
-          MIN_IT (screen.cur.row, nrow - 1);
-#endif
-          ncol =  ocol; // save b/c scr_blank_screen_mem uses this
+      for (int row = min (nrow, prev_nrow); row--; )
+        {
+          lresize (drawn_buf[row]);
+          lresize (swap_buf [row]);
         }
 
-      /* resize columns */
-      if (ncol != prev_ncol)
+      for (int row = prev_nrow; row < nrow; row++)
         {
-          old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
-          old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
-
-          for (p = total_rows; p--; )
-            lresize (save[p]);
-
-          for (p = nrow; p--; )
-            {
-              lresize (drawn[p]);
-              lresize (swap_save[p]);
-            }
-
-          MIN_IT (screen.cur.col, (int16_t)ncol - 1);
-
-          delete old_ta;
-          delete old_ra;
+          swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
+          drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
         }
 
-#if 0
-      // re-wrap lines, this is rather ugly, possibly because I am too dumb
-      // to come up with a lean and mean algorithm.
-      rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
-      rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
-      
-      text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
-      rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
-      tlen_t *tl  = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
-
-      for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
-
-      p = prev_total_rows;
-      q = total_rows;
+      line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+        
+      int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
+      int pend = MOD (term_start - nsaved   , prev_total_rows);
+      int q    = total_rows; // rewrapped row
 
-      while (p > 0 && q > 0)
+      if (nsaved)
         {
-          --p;
+          // re-wrap lines, this is rather ugly, possibly because I am too dumb
+          // to come up with a lean and mean algorithm.
+
+          row_col_t ocur = screen.cur;
+          ocur.row = MOD (term_start + ocur.row, prev_total_rows);
 
-          printf ("pq %d:%d\n", p, q);
-          if (save[p].t)
+          do
             {
-              int llen = save[p].l;
+              p = MOD (p - 1, prev_total_rows);
+#ifdef DEBUG_STRICT
+              assert (old_buf [MOD (p, prev_total_rows)].t);
+#endif
 
-              assert (llen >= 0);
+              int plines = 1;
+              int llen = old_buf [MOD (p, prev_total_rows)].l;
 
-              while (p && save[p - 1].l < 0)
+              while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
                 {
-                  --p;
+                  p = MOD (p - 1, prev_total_rows);
+
+                  plines++;
                   llen += prev_ncol;
                 }
 
-              int qlines = llen / ncol + 1;
-              int lofs = 0;
+              int qlines = max (0, (llen - 1) / ncol) + 1;
+
+              // drop partial lines completely
+              if (q < qlines)
+                break;
 
               q -= qlines;
 
-              int qrow = q;
+              int lofs = 0;
+              line_t *qline;
 
-                 printf ("QL %d llen %d\n", qlines, llen);//D
-              for (; qlines--; qrow++)
+              // re-assemble the full line by destination lines
+              for (int qrow = q; qlines--; qrow++)
                 {
-                  if (qrow >= 0)
-                    {
-                      tp [qrow] = (text_t *)ta->alloc ();
-                      rp [qrow] = (rend_t *)ra->alloc ();
-                      tl [qrow] = LINE_CONT1;
-
-                      int qcol = 0;
-
-                      for (;;)
-                        {
-                          int prow = lofs / prev_ncol + p;
-                          int pcol = lofs % prev_ncol;
+                  qline = row_buf + qrow;
+                  lalloc (*qline);
+                  qline->set_is_longer ();
 
-                          int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
+                  int qcol = 0;
 
-                          printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
+                  // fill a single destination line
+                  while (lofs < llen && qcol < ncol)
+                    {
+                      int prow = lofs / prev_ncol;
+                      int pcol = lofs % prev_ncol;
 
-                          if (len <= 0)
-                            {
-                              tl [qrow] = qcol;
+                      prow = MOD (p + prow, prev_total_rows);
 
-                              TODO
-                              scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
-                                              ncol - qcol, DEFAULT_RSTYLE);
+                      // 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);
 
-                              break;
-                            }
+                      line_t &pline = old_buf [prow];
 
-                          assert (lofs < 1000);
+                      int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
 
-                          memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
-                          memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
+                      assert (len);
+                      assert (pline.t);
 
-                          lofs += len;
-                          qcol += len;
+                      memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
+                      memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
 
-                          if (qcol == ncol)
-                            break;
-                        }
+                      lofs += len;
+                      qcol += len;
                     }
-                  else
-                    lofs += ncol;
                 }
+
+              qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
+#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
+              if (qline->l < 0)
+                {
+                  fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
+                  qline->l = 0;
+                }
+#endif
+              scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
             }
+          while (p != pend && q > 0);
+
+          term_start = total_rows - nrow;
+          nsaved = term_start - q;
+ 
+          // make sure all terminal lines exist
+          while (nsaved < 0)
+            scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
+
         }
+      else
+        {
+          // if no scrollback exists (yet), wing, instead of wrap
+          
+          for (int row = min (nrow, prev_nrow); row--; )
+            {
+              line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
+              line_t &qline = row_buf [row];
+
+              qline = pline;
+              lresize (qline);
+            }
 
-      free (screen.text); screen.text = tp;
-      free (screen.rend); screen.rend = rp;
-      free (screen.tlen); screen.tlen = tl;
+          for (int row = prev_nrow; row < nrow; row++)
+            {
+              row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
+            }
 
-      for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
+          term_start = 0;
+        }
+
+#ifdef DEBUG_STRICT //TODO: remove
+      for (int i = -nsaved; i < nrow; i++)
+        assert (ROW (i).t);
 #endif
 
+      free (old_buf);
+      delete old_ta;
+      delete old_ra;
+
+      clamp_it (screen.cur.row, 0, nrow - 1);
+      clamp_it (screen.cur.col, 0, ncol - 1);
+
       if (tabs)
         free (tabs);
     }
@@ -430,24 +415,12 @@
 
   tabs = (char *)rxvt_malloc (ncol * sizeof (char));
 
-  for (p = 0; p < ncol; p++)
-    tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
+  for (int col = ncol; col--; )
+    tabs [col] = col % TABSIZE == 0;
 
   tt_winch ();
 }
 
-void
-rxvt_term::scr_reset_realloc ()
-{
-  unsigned int total_rows = nrow + saveLines;
-
-  screen.line = (line_t **)rxvt_realloc (screen.line, nrow       * sizeof (line_t *));
-  swap_save   = (line_t *) rxvt_realloc (swap_save  , nrow       * sizeof (line_t));
-  drawn       = (line_t *) rxvt_realloc (drawn      , nrow       * sizeof (line_t));
-  save        = (line_t *) rxvt_realloc (save       , total_rows * sizeof (line_t));
-  buf         = (line_t *) rxvt_realloc (buf        , total_rows * sizeof (line_t));
-}
-
 /* ------------------------------------------------------------------------- */
 /*
  * Free everything.  That way malloc debugging can find leakage.
@@ -455,19 +428,16 @@
 void
 rxvt_term::scr_release ()
 {
-  unsigned int total_rows;
-
-  total_rows = nrow + saveLines;
-
   delete talloc; talloc = 0;
   delete ralloc; ralloc = 0;
 
-  free (screen.line);
-  free (save);
-  free (swap_save);
-  free (drawn);
-  free (buf);
+  free (row_buf);
+  free (swap_buf);
+  free (drawn_buf);
+  free (temp_buf);
   free (tabs);
+
+  row_buf = 0; // signal that we freed all the arrays
 }
 
 /* ------------------------------------------------------------------------- */
@@ -528,14 +498,11 @@
     }
 
   /* boundary check in case screen size changed between SAVE and RESTORE */
-  MIN_IT (s->cur.row, nrow - 1);
-  MIN_IT (s->cur.col, ncol - 1);
+  min_it (s->cur.row, nrow - 1);
+  min_it (s->cur.col, ncol - 1);
 #ifdef DEBUG_STRICT
   assert (s->cur.row >= 0);
   assert (s->cur.col >= 0);
-#else                           /* drive with your eyes closed */
-  MAX_IT (s->cur.row, 0);
-  MAX_IT (s->cur.col, 0);
 #endif
 }
 
@@ -548,13 +515,7 @@
 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)
@@ -562,33 +523,31 @@
 
   selection_check (2);        /* check for boundary cross */
 
-  i = current_screen; current_screen = scrn; scrn = i;
+  int i = current_screen; current_screen = scrn; scrn = i;
+
+  ::swap (screen.cur.row, swap.cur.row);
+  ::swap (screen.cur.col, swap.cur.col);
 
-  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);
-  MAX_IT (screen.cur.col, 0);
-  MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
+  screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
+  screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
 
 #if NSCREENS
   if (options & Opt_secondaryScreen)
     {
       num_scr = 0;
-      offset = saveLines;
 
-      for (i = prev_nrow; i--;)
-        SWAP_IT (*(screen.line[i]), swap_save[i], line_t);
+      for (int i = prev_nrow; i--; )
+        ::swap (ROW(i), swap_buf [i]);
 
-      SWAP_IT (screen.charset, swap.charset, int16_t);
-      SWAP_IT (screen.flags, swap.flags, int);
+      ::swap (screen.charset, swap.charset);
+      ::swap (screen.flags, swap.flags);
       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;
 }
@@ -605,7 +564,7 @@
   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++;
 }
@@ -641,122 +600,99 @@
       rstyle &= ~style;
   }
 
-// set screen.line pointers to the actual lines in the save buffer
-void
-rxvt_term::scr_update_term ()
-{
-  for (int i = nrow; i--; )
-    screen.line[i] = save + saveLines + i;
-}
-
 /* ------------------------------------------------------------------------- */
 /*
  * 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))
     {
-      nscrolled += count;
+      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;
 
-      if (nscrolled > saveLines)
-        nscrolled = saveLines;
+          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--; )
+        {
+          ROW(row2 - i).l = 0;
+          scr_blank_screen_mem (ROW(row2 - i), rstyle);
+        }
+      
       if ((options & Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != saveLines)
         scr_page (UP, count);
     }
-  else if (!spec)
-    row1 += saveLines;
-
-  row2 += saveLines;
-
-  if (selection.op && current_screen == selection.screen)
+  else
     {
-      i = selection.beg.row + saveLines;
-      j = selection.end.row + saveLines;
-
-      if ((i < row1 && j > row1)
-          || (i < row2 && j > row2)
-          || (i - count < row1 && i >= row1)
-          || (i - count > row2 && i <= row2)
-          || (j - count < row1 && j >= row1)
-          || (j - count > row2 && j <= row2))
+      if (selection.op && current_screen == selection.screen)
         {
-          CLEAR_ALL_SELECTION ();
-          selection.op = SELECTION_CLEAR;  /* XXX: too aggressive? */
-        }
-      else if (j >= row1 && j <= row2)
-        {
-          /* move selected region too */
-          selection.beg.row  -= count;
-          selection.end.row  -= count;
-          selection.mark.row -= count;
+          if ((selection.beg.row < row1 && selection.end.row > row1)
+              || (selection.beg.row < row2 && selection.end.row > row2)
+              || (selection.beg.row - count < row1 && selection.beg.row >= row1)
+              || (selection.beg.row - count > row2 && selection.beg.row <= row2)
+              || (selection.end.row - count < row1 && selection.end.row >= row1)
+              || (selection.end.row - count > row2 && selection.end.row <= row2))
+            {
+              CLEAR_ALL_SELECTION ();
+              selection.op = SELECTION_CLEAR;
+            }
+          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;
+              
+              selection_check (0);
+            }
         }
-    }
-
-  selection_check (0);        /* _after_ nscrolled update */
-
-  num_scr += count;
-  j = count;
 
-  if (count < 0)
-    count = -count;
+      // use a simple and robust scrolling algorithm, this
+      // part of scr_scroll_text is not time-critical.
 
-  i = row2 - row1 + 1;
-  MIN_IT (count, i);
+      int rows = row2 - row1 + 1;
 
-  if (j > 0)
-    {
-      /* 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) */
-    {
-      /* scroll down */
+      min_it (count, rows);
 
-      /* Copy lines that will get clobbered by the rotation */
-      for (i = 0, j = row2; i < count; i++, j--)
-        buf[i] = save[j];
+      for (int row = 0; row < rows; row++)
+        {
+          temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
 
-      /* Rotate lines */
-      for (j = row2, i = j - count; i >= row1; i--, j--)
-        save[j] = save[i];
+          if (!IN_RANGE_EXC (row + count, 0, rows))
+            scr_blank_screen_mem (temp_buf [row], rstyle);
+        }
 
-      j = row1, i = count;
-      count = -count;
+      for (int row = 0; row < rows; row++)
+        ROW(row1 + row) = temp_buf [row];
     }
 
-  /* Resurrect lines */
-  memcpy (save + j, buf, i * sizeof (line_t));
-
-  scr_update_term ();
-
-  if (!spec) /* line length may not equal ncol */
-    for (; i--; j++)
-      scr_blank_screen_mem (save[j], rstyle);
-
   return count;
 }
 
@@ -772,7 +708,7 @@
 
   unsigned char checksel;
   unicode_t c;
-  int row, last_col;
+  int last_col;
   const unicode_t *strend = str + len;
 
   want_refresh = 1;
@@ -782,30 +718,26 @@
   if (nlines > 0)
     {
       nlines += screen.cur.row - screen.bscroll;
-      if ((nlines > 0)
-          && (screen.tscroll == 0)
-          && (screen.bscroll == (nrow - 1)))
+      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
   assert (screen.cur.col < last_col);
-  assert ((screen.cur.row < nrow)
-          && (screen.cur.row >= - (int32_t)nscrolled));
-#else                           /* drive with your eyes closed */
-  MIN_IT (screen.cur.col, last_col - 1);
-  MIN_IT (screen.cur.row, (int32_t)nrow - 1);
-  MAX_IT (screen.cur.row, - (int32_t)nscrolled);
+  assert (screen.cur.row < nrow
+          && screen.cur.row >= -nsaved);
 #endif
-  row = screen.cur.row + saveLines;
+  int row = screen.cur.row;
 
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
 
-  line_t *line = save + row;
+  line_t *line = &ROW(row);
 
   while (str < strend)
     {
@@ -813,24 +745,24 @@
 
       if (c < 0x20)
         if (c == C0_LF)
-          {          
+          {
             if (!line->is_longer ())      /* XXX: think about this */
-              MAX_IT (line->l, screen.cur.col);
+              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) + saveLines;
+              row = ++screen.cur.row;
 
-            line = save + row;  /* _must_ refresh */
+            line = &ROW(row);  /* _must_ refresh */
             continue;
           }
         else if (c == C0_CR)
           {
             if (!line->is_longer ())      /* XXX: think about this */
-              MAX_IT (line->l, screen.cur.col);
+              max_it (line->l, screen.cur.col);
 
             screen.flags &= ~Screen_WrapNext;
             screen.cur.col = 0;
@@ -861,12 +793,12 @@
 
           scr_do_wrap ();
           
-          row = screen.cur.row + saveLines;
-          line = save + row;   /* _must_ refresh */
+          row = screen.cur.row;
+          line = &ROW(row);   /* _must_ refresh */
         }
 
       // some utf-8 decoders "decode" surrogate characters: let's fix this.
-      if (IN_RANGE (c, 0xd800, 0xdfff))
+      if (IN_RANGE_INC (c, 0xd800, 0xdfff))
         c = 0xfffd;
 
       // rely on wcwidth to tell us the character width, at least for non-latin1
@@ -991,9 +923,9 @@
                 tp--, rp--;
             }
           else if (screen.cur.row > 0
-                   && save [screen.cur.row - 1 + saveLines].is_longer ())
+                   && ROW(screen.cur.row - 1).is_longer ())
             {
-              line_t *line = save + (screen.cur.row - 1 + saveLines);
+              line_t *line = &ROW(screen.cur.row - 1);
 
               tp = line->t + last_col - 1;
               rp = line->r + last_col - 1;
@@ -1016,12 +948,10 @@
     }
 
   if (!line->is_longer ())      /* XXX: think about this */
-    MAX_IT (line->l, screen.cur.col);
+    max_it (line->l, screen.cur.col);
 
 #ifdef DEBUG_STRICT
   assert (screen.cur.row >= 0);
-#else                           /* drive with your eyes closed */
-  MAX_IT (screen.cur.row, 0);
 #endif
 }
 
@@ -1070,9 +1000,7 @@
     return;
   else if (count > 0)
     {
-      int row = saveLines + screen.cur.row;
-
-      line_t &l = save[row];
+      line_t &l = ROW(screen.cur.row);
       rend_t base_rend = l.r[i];
       ht &= l.t[i] == ' ';
 
@@ -1097,7 +1025,7 @@
           base_rend = SET_FONT (base_rend, 0);
 
           if (!l.is_longer ())      /* XXX: think about this */
-            MAX_IT (l.l, x);
+            max_it (l.l, x);
 
           i = screen.cur.col;
 
@@ -1143,12 +1071,7 @@
   if (screen.cur.col > 0)
     scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
   else
-    {
-      if (!save[screen.cur.row + saveLines].l)
-        return;             /* um, yeah? */
-
-      scr_insdel_chars (1, INSERT);
-    }
+    scr_insdel_chars (1, INSERT);
 }
 #endif
 /* ------------------------------------------------------------------------- */
@@ -1162,19 +1085,12 @@
 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 + saveLines;
-
-      if (!save[row].l)
-        return;             /* um, yeah? */
-
-      if (save[row].is_longer ()) //TODO//FIXME//LEN
-        save[row].l = ncol;
+      if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
+        ROW(screen.cur.row).l = ncol;
 
       scr_gotorc (0, 0, R_RELATIVE);
       scr_insdel_chars (1, DELETE);
@@ -1194,8 +1110,7 @@
   ZERO_SCROLLBACK ();
 
   screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
-  MAX_IT (screen.cur.col, 0);
-  MIN_IT (screen.cur.col, (int32_t)ncol - 1);
+  clamp_it (screen.cur.col, 0, ncol - 1);
 
   screen.flags &= ~Screen_WrapNext;
 
@@ -1223,14 +1138,13 @@
       if (screen.flags & Screen_Relative)
         {        /* relative origin mode */
           screen.cur.row = row + screen.tscroll;
-          MIN_IT (screen.cur.row, screen.bscroll);
+          min_it (screen.cur.row, screen.bscroll);
         }
       else
         screen.cur.row = row;
     }
 
-  MAX_IT (screen.cur.row, 0);
-  MIN_IT (screen.cur.row, (int32_t)nrow - 1);
+  clamp_it (screen.cur.row, 0, nrow - 1);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1251,12 +1165,11 @@
 
   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);
+  clamp_it (screen.cur.row, 0, nrow - 1);
   selection_check (0);
 }
 
@@ -1270,21 +1183,21 @@
 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 = saveLines + 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 (save[row].l, (int16_t)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 ();
@@ -1299,7 +1212,7 @@
       case 2:                     /* erase whole line */
         col = 0;
         num = ncol;
-        save[row].l = 0;
+        line.l = 0;
         if (selection.beg.row <= screen.cur.row
             && selection.end.row >= screen.cur.row)
           CLEAR_SELECTION ();
@@ -1308,10 +1221,7 @@
         return;
     }
 
-  if (save[row].t)
-    scr_blank_line (save[row], col, num, rstyle);
-  else
-    scr_blank_screen_mem (save[row], rstyle);
+  scr_blank_line (line, col, num, rstyle);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1325,15 +1235,13 @@
 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 */
@@ -1366,7 +1274,7 @@
   if (row >= nrow) /* Out Of Bounds */
     return;
 
-  MIN_IT (num, (nrow - row));
+  min_it (num, nrow - row);
 
   if (rstyle & (RS_RVid | RS_Uline))
     ren = (rend_t) ~RS_None;
@@ -1387,9 +1295,9 @@
 
   for (; num--; row++)
     {
-      scr_blank_screen_mem (save[row + row_offset], rstyle);
-      save[row + row_offset].l = 0;
-      scr_blank_line (drawn[row], 0, ncol, ren);
+      ROW (row).l = 0;
+      scr_blank_screen_mem (ROW (row), rstyle);
+      scr_blank_line (drawn_buf [row], 0, ncol, ren);
     }
 }
 
@@ -1400,7 +1308,7 @@
   want_refresh = 1;
   ZERO_SCROLLBACK ();
 
-  nscrolled = 0;
+  nsaved = 0;
 }
 #endif
 
@@ -1412,8 +1320,7 @@
 void
 rxvt_term::scr_E ()
 {
-  int i, j, k;
-  rend_t *r1, fs;
+  rend_t fs;
 
   want_refresh = 1;
   ZERO_SCROLLBACK ();
@@ -1422,13 +1329,14 @@
   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 */
@@ -1462,7 +1370,7 @@
 
   scr_do_wrap ();
 
-  scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
+  scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1484,11 +1392,11 @@
   scr_do_wrap ();
 
   selection_check (1);
-  MIN_IT (count, (ncol - screen.cur.col));
+  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)
     {
@@ -1502,7 +1410,7 @@
         if (!line->is_longer ())
           {
             line->l += count;
-            MIN_IT (line->l, ncol);
+            min_it (line->l, ncol);
           }
 
         if (selection.op && current_screen == selection.screen
@@ -1519,14 +1427,14 @@
               }
           }
 
-        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:
@@ -1543,8 +1451,7 @@
         if (line->is_longer ()) /* break line continuation */
           line->l = ncol;
         
-        line->l -= count;
-        MAX_IT (line->l, 0);
+        line->l = max (line->l - count, 0);
 
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
@@ -1574,8 +1481,8 @@
 void
 rxvt_term::scr_scroll_region (int top, int bot)
 {
-  MAX_IT (top, 0);
-  MIN_IT (bot, (int)nrow - 1);
+  max_it (top, 0);
+  min_it (bot, nrow - 1);
 
   if (top > bot)
     return;
@@ -1683,7 +1590,7 @@
   if (rvideo != mode)
     {
       rvideo = mode;
-      SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
+      ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
 #if XPM_BACKGROUND
       if (bgPixmap.pixmap == None)
 #endif
@@ -1789,7 +1696,7 @@
   for (int i = 0; i < nrow; i++)
     {
       int col = 0;
-      rend_t *drp = drawn[i].r;
+      rend_t *drp = drawn_buf[i].r;
 
       for (; col < ncol; col++, drp++)
         if ((*drp & mask) == value)
@@ -1817,7 +1724,7 @@
   int i;
   row_col_t rc[RC_COUNT];
 
-  if (!drawn)  /* sanity check */
+  if (!drawn_buf)  /* sanity check */
     return;
 
 #ifndef NO_SLOW_LINK_SUPPORT
@@ -1828,13 +1735,6 @@
     }
 #endif
 
-#ifdef DEBUG_STRICT
-  x = max (x, 0);
-  x = min (x, (int)width);
-  y = max (y, 0);
-  y = min (y, (int)height);
-#endif
-
   /* round down */
   rc[PART_BEG].col = Pixel2Col (x);
   rc[PART_BEG].row = Pixel2Row (y);
@@ -1845,12 +1745,12 @@
   /* sanity checks */
   for (i = PART_BEG; i < RC_COUNT; i++)
     {
-      MIN_IT (rc[i].col, ncol - 1);
-      MIN_IT (rc[i].row, nrow - 1);
+      min_it (rc[i].col, ncol - 1);
+      min_it (rc[i].row, nrow - 1);
     }
 
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
-    fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
+    fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
 
   if (refresh)
     scr_refresh (SLOW_REFRESH);
@@ -1881,12 +1781,12 @@
 
   if (y < len)
     {
-      p = (nrow + nscrolled) * (len - y) / len;
+      p = (nrow + nsaved) * (len - y) / len;
       p -= (long) (nrow - 1);
       p = max (p, 0);
     }
 
-  view_start = (unsigned int)min (p, nscrolled);
+  view_start = (unsigned int)min (p, nsaved);
 
   return scr_changeview (oldviewstart);
 }
@@ -1907,7 +1807,7 @@
   if (direction == UP)
     {
       n = view_start + nlines;
-      view_start = min (n, nscrolled);
+      view_start = min (n, nsaved);
     }
   else
     {
@@ -1961,31 +1861,31 @@
 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)
-    row_offset -= view_start;
+  if (fullhist)
+    {
+      nrows = nrow + nsaved;
+      row_start = -nsaved;
+    }
   else
     {
-      nrows += nscrolled;
-      row_offset -= nscrolled;
+      nrows = nrow;
+      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;
-      int len    = save[r1 + row_offset].l;
+      text_t *tp = ROW(r1).t;
+      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++;
@@ -2023,8 +1923,7 @@
                 showcursor; /* show the cursor                           */
   int16_t col, row,   /* column/row we're processing               */
           ocrow;      /* old cursor row                            */
-  int i,              /* tmp                                       */
-  row_offset;         /* basic offset in screen structure          */
+  int i;              /* tmp                                       */
 #ifndef NO_CURSORCOLOR
   rend_t cc1;         /* store colours at cursor position (s)      */
 #endif
@@ -2041,8 +1940,6 @@
   must_clear = 0;
   refresh_count = 0;
 
-  row_offset = saveLines - view_start;
-
 #if XPM_BACKGROUND
   must_clear |= bgPixmap.pixmap != None;
 #endif
@@ -2074,10 +1971,10 @@
       {
         int col = screen.cur.col;
 
-        while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)
+        while (col && ROW(screen.cur.row).t[col] == NOCHAR)
           col--;
 
-        crp = &screen.line[screen.cur.row]->r[col];
+        crp = &ROW(screen.cur.row).r[col];
 
         if (showcursor && focus)
           {
@@ -2121,7 +2018,7 @@
           {
             if (ocrow < nrow
                 && oldcursor.col < ncol)
-              drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
+              drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
 
             if (focus || !showcursor)
               oldcursor.row = -1;
@@ -2155,8 +2052,8 @@
    */
   i = num_scr;
   if (!display->is_local
-      && refresh_type == FAST_REFRESH && num_scr_allow && i
-      && abs (i) < nrow && !must_clear)
+      && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
+      && abs (num_scr) < nrow && !must_clear)
     {
       int16_t nits;
       int j;
@@ -2169,9 +2066,9 @@
         {
           if (row + i >= 0 && row + i < nrow && row + i != ocrow)
             {
-              line_t s  = save[row + row_offset];
-              line_t d  = drawn[row];
-              line_t d2 = drawn[row + i];
+              line_t s  = ROW(row - view_start);
+              line_t d  = drawn_buf[row];
+              line_t d2 = drawn_buf[row + i];
 
               for (nits = 0, col = ncol; col--; )
                 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
@@ -2199,7 +2096,7 @@
             {
               /* also comes here at end if needed because of >= above */
               if (wlen < len)
-                SWAP_IT (wlen, len, int);
+                ::swap (wlen, len);
 
               XCopyArea (display->display, vt, vt,
                          gc, 0, Row2Pixel (len + i),
@@ -2217,10 +2114,10 @@
    */
   for (row = 0; row < nrow; row++)
     {
-      text_t *stp = save[row + row_offset].t;
-      rend_t *srp = save[row + row_offset].r;
-      text_t *dtp = drawn[row].t;
-      rend_t *drp = drawn[row].r;
+      text_t *stp = ROW(row - view_start).t;
+      rend_t *srp = ROW(row - view_start).r;
+      text_t *dtp = drawn_buf[row].t;
+      rend_t *drp = drawn_buf[row].r;
 
       /*
        * E2: OK, now the real pass
@@ -2341,7 +2238,7 @@
 
               if (invert)
                 {
-                  SWAP_IT (fore, back, int);
+                  ::swap (fore, back);
 
 #ifndef NO_BOLD_UNDERLINE_REVERSE
                   if (ISSET_PIXCOLOR (Color_RV))
@@ -2439,11 +2336,11 @@
           int cursorwidth = 1;
           int col = oldcursor.col;
 
-          while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)
+          while (col && ROW(screen.cur.row).t[col] == NOCHAR)
             col--;
 
           while (col + cursorwidth < ncol
-                 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
+                 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
             cursorwidth++;
 
 #ifndef NO_CURSORCOLOR
@@ -2484,13 +2381,13 @@
 void
 rxvt_term::scr_remap_chars ()
 {
-  for (int i = nrow + saveLines; i--; )
-    scr_remap_chars (save[i]);
+  for (int i = total_rows; i--; )
+    scr_remap_chars (row_buf [i]);
 
   for (int i = nrow; i--; )
     {
-      scr_remap_chars (drawn[i]);
-      scr_remap_chars (swap_save[i]);
+      scr_remap_chars (drawn_buf [i]);
+      scr_remap_chars (swap_buf [i]);
     }
 }
 
@@ -2542,41 +2439,40 @@
 void
 rxvt_term::scr_reverse_selection ()
 {
-  if (selection.op && current_screen == selection.screen)
+  if (selection.op
+      && current_screen == selection.screen
+      && selection.end.row >= -view_start)
     {
-      int end_row = saveLines - view_start;
-      int i = selection.beg.row + saveLines;
-      int col, row = selection.end.row + saveLines;
-      rend_t *srp;
+      int view_end = -view_start + nrow;
+      int row, col;
 
 #if ENABLE_FRILLS
       if (selection.rect)
         {
-          end_row += nrow;
-
-          for (; i <= row && i <= end_row; i++)
-            for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
+          for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
+            for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
               srp[col] ^= RS_RVid;
         }
       else
 #endif
         {
-          if (i >= end_row)
-            col = selection.beg.col;
+          if (selection.beg.row >= -view_start)
+            {
+              col = selection.beg.col;
+              row = selection.beg.row;
+            }
           else
             {
               col = 0;
-              i = end_row;
+              row = -view_start;
             }
 
-          end_row += nrow;
-
-          for (; i < row && i < end_row; i++, col = 0)
-            for (srp = save[i].r; col < ncol; col++)
+          for (; row < min (selection.end.row, view_end); row++, col = 0)
+            for (rend_t *srp = ROW(row).r; col < ncol; col++)
               srp[col] ^= RS_RVid;
 
-          if (i == row && i < end_row)
-            for (srp = save[i].r; col < selection.end.col; col++)
+          if (row == selection.end.row)
+            for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
               srp[col] ^= RS_RVid;
         }
     }
@@ -2595,19 +2491,19 @@
   unsigned int    width, towrite;
   char            r1[] = "\n";
 
-  for (row = saveLines - nscrolled;
+  for (row = saveLines - nsaved;
        row < saveLines + nrow - 1; row++)
     {
-      width = save[row].l >= 0 ? save[row].l
+      width = row_buf[row].l >= 0 ? row_buf[row].l
               : ncol;
       for (towrite = width; towrite; towrite -= wrote)
         {
-          wrote = write (fd, & (save[row].t[width - towrite]),
+          wrote = write (fd, & (row_buf[row].t[width - towrite]),
                         towrite);
           if (wrote < 0)
             return;         /* XXX: death, no report */
         }
-      if (save[row].l >= 0)
+      if (row_buf[row].l >= 0)
         if (write (fd, r1, 1) <= 0)
           return; /* XXX: death, no report */
     }
@@ -2617,10 +2513,6 @@
 /* ------------------------------------------------------------------------- *
  *                           CHARACTER SELECTION                             *
  * ------------------------------------------------------------------------- */
-
-/*
- * -nscrolled <= (selection row) <= nrow - 1
- */
 void
 rxvt_term::selection_check (int check_more)
 {
@@ -2630,12 +2522,9 @@
     return;
 
   pos.row = pos.col = 0;
-  if ((selection.beg.row < - (int32_t)nscrolled)
-      || (selection.beg.row >= nrow)
-      || (selection.mark.row < - (int32_t)nscrolled)
-      || (selection.mark.row >= nrow)
-      || (selection.end.row < - (int32_t)nscrolled)
-      || (selection.end.row >= nrow)
+  if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
+      || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
+      || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
       || (check_more == 1
           && current_screen == selection.screen
           && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
@@ -2951,7 +2840,7 @@
 void
 rxvt_term::selection_make (Time tm)
 {
-  int i, col, end_col, row, end_row;
+  int i;
   wchar_t *new_selection_text;
   text_t *t;
 
@@ -2977,13 +2866,15 @@
   i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
   new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
 
-  col = selection.beg.col;
-  row = selection.beg.row + saveLines;
-  end_row = selection.end.row + saveLines;
   int ofs = 0;
   int extra = 0;
 
-  for (; row <= end_row; row++, col = 0)
+  int col = selection.beg.col;
+  int row = selection.beg.row;
+
+  int end_col;
+
+  for (; row <= selection.end.row; row++, col = 0)
     {
 #if ENABLE_FRILLS
       if (selection.rect)
@@ -2993,14 +2884,14 @@
         }
       else
 #endif
-        end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN
+        end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
 
-      MAX_IT (col, 0);
+      col = max (col, 0);
 
-      if (row == end_row || selection.rect)
-        MIN_IT (end_col, selection.end.col);
+      if (row == selection.end.row || selection.rect)
+        end_col = min (end_col, selection.end.col);
 
-      t = save[row].t + col;
+      t = ROW(row).t + col;
       for (; col < end_col; col++)
         {
           if (*t == NOCHAR)
@@ -3026,7 +2917,7 @@
             new_selection_text[ofs++] = *t++;
         }
 
-      if (!save[row].is_longer () && row != end_row)
+      if (!ROW(row).is_longer () && row != selection.end.row)
         new_selection_text[ofs++] = C0_LF;
     }
 
@@ -3095,16 +2986,15 @@
 rxvt_term::selection_start_colrow (int col, int row)
 {
   want_refresh = 1;
-  selection.mark.col = col;
+
   selection.mark.row = row - view_start;
+  selection.mark.col = col;
 
-  MAX_IT (selection.mark.row, - (int32_t)nscrolled);
-  MIN_IT (selection.mark.row, (int32_t)nrow - 1);
-  MAX_IT (selection.mark.col, 0);
-  MIN_IT (selection.mark.col, (int32_t)ncol - 1);
+  selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
+  selection.mark.col = clamp (selection.mark.col,       0, ncol - 1);
 
   while (selection.mark.col > 0
-         && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)
+         && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
     --selection.mark.col;
   
   if (selection.op)
@@ -3138,23 +3028,23 @@
 
   if (dirn == UP)
     {
-      bound.row = saveLines - nscrolled - 1;
+      bound.row = - nsaved - 1;
       bound.col = 0;
       dirnadd = -1;
     }
   else
     {
-      bound.row = saveLines + nrow;
+      bound.row = nrow;
       bound.col = ncol - 1;
       dirnadd = 1;
     }
 
-  row = mark->row + saveLines;
-  col = mark->col;
-  MAX_IT (col, 0);
+  row = mark->row;
+  col = max (mark->col, 0);
+
   /* find the edge of a word */
-  stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp);
-  srp = save[row].r + col; w2 = DELIMIT_REND (*srp);
+  stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
+  srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
 
   for (;;)
     {
@@ -3174,16 +3064,16 @@
 
       if ((col == bound.col) && (row != bound.row))
         {
-          if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ())
+          if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
             {
               trow = row + dirnadd;
               tcol = dirn == UP ? ncol - 1 : 0;
 
-              if (!save[trow].t)
+              if (!ROW(trow).t)
                 break;
 
-              stp = save[trow].t + tcol;
-              srp = save[trow].r + tcol;
+              stp = ROW(trow).t + tcol;
+              srp = ROW(trow).r + tcol;
 
               if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
                 break;
@@ -3201,7 +3091,7 @@
     col++;                  /* put us on one past the end */
 
   /* Poke the values back in */
-  ret->row = row - saveLines;
+  ret->row = row;
   ret->col = col;
 }
 
@@ -3216,14 +3106,8 @@
 void
 rxvt_term::selection_extend (int x, int y, int flag)
 {
-  int col, row;
-
-  col = Pixel2Col (x);
-  row = Pixel2Row (y);
-  MAX_IT (row, 0);
-  MIN_IT (row, (int)nrow - 1);
-  MAX_IT (col, 0);
-  MIN_IT (col, (int)ncol);
+  int col = clamp (Pixel2Col (x), 0, ncol);
+  int row = clamp (Pixel2Row (y), 0, nrow - 1);
 
   /*
   * If we're selecting characters (single click) then we must check first
@@ -3298,9 +3182,7 @@
     }
 
   pos.col = col;
-  pos.row = row;
-
-  pos.row -= view_start;   /* adjust for scroll */
+  pos.row = row - view_start;
 
   /*
    * This is mainly xterm style selection with a couple of differences, mainly
@@ -3369,8 +3251,8 @@
 
   if (selection.clicks == 1)
     {
-      if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN
-          && !save[selection.beg.row + saveLines].is_longer ()
+      if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
+          && !ROW(selection.beg.row).is_longer ()
 #if ENABLE_FRILLS
           && !selection.rect
 #endif
@@ -3378,8 +3260,8 @@
         selection.beg.col = ncol;
 
       if (
-          selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN
-          && !save[selection.end.row + saveLines].is_longer ()
+          selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
+          && !ROW(selection.end.row).is_longer ()
 #if ENABLE_FRILLS
           && !selection.rect
 #endif
@@ -3403,10 +3285,10 @@
 
           for (int end_row = selection.mark.row; end_row < nrow; end_row++)
             {
-              if (!save[end_row + saveLines].is_longer ())
+              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;
                 }
@@ -3423,11 +3305,11 @@
 
           // select a complete logical line
           while (selection.beg.row > -saveLines
-                 && save[selection.beg.row - 1 + saveLines].is_longer ())
+                 && ROW(selection.beg.row - 1).is_longer ())
             selection.beg.row--;
 
           while (selection.end.row < nrow
-                 && save[selection.end.row + saveLines].is_longer ())
+                 && ROW(selection.end.row).is_longer ())
             selection.end.row++;
         }
     }
@@ -3448,7 +3330,7 @@
 
 #if ENABLE_FRILLS
   if (selection.rect && selection.beg.col > selection.end.col)
-    SWAP_IT (selection.beg.col, selection.end.col, int);
+    ::swap (selection.beg.col, selection.end.col);
 #endif
 }
 
@@ -3462,9 +3344,9 @@
   end_col = selection.end.col;
   end_row = selection.end.row;
 
-  for ( ; end_row >= selection.beg.row; )
+  for (; end_row >= selection.beg.row; )
     {
-      stp = save[end_row + saveLines].t;
+      stp = ROW(end_row).t;
 
       while (--end_col >= 0)
         {
@@ -3475,7 +3357,7 @@
         }
 
       if (end_col >= 0
-          || !save[end_row - 1 + saveLines].is_longer ())
+          || !ROW(end_row - 1).is_longer ())
         {
           selection.end.col = end_col + 1;
           selection.end.row = end_row;
@@ -3656,9 +3538,9 @@
 rxvt_term::pixel_position (int *x, int *y)
 {
   *x = Pixel2Col (*x);
-  /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
+  /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
   *y = Pixel2Row (*y);
-  /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
+  /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
 }
 
 /* ------------------------------------------------------------------------- */
@@ -3690,14 +3572,11 @@
   if (y < 0) y = nrow - h;
 
   // make space for border
-  w += 2; MIN_IT (w, ncol);
-  h += 2; MIN_IT (h, nrow);
-
-  x -= 1; MAX_IT (x, 0);
-  y -= 1; MAX_IT (y, 0);
+  w += 2; min_it (w, ncol);
+  h += 2; min_it (h, nrow);
 
-  MIN_IT (x, ncol - w);
-  MIN_IT (y, nrow - h);
+  x -= 1; clamp_it (x, 0, ncol - w);
+  y -= 1; clamp_it (y, 0, nrow - h);
 
   ov_x = x; ov_y = y;
   ov_w = w; ov_h = h;
@@ -3793,16 +3672,14 @@
   if (!ov_text)
     return;
 
-  int row_offset = ov_y + saveLines - view_start;
-
   // swap screen mem with overlay
   for (int y = ov_h; y--; )
     {
       text_t *t1 = ov_text[y];
       rend_t *r1 = ov_rend[y];
 
-      text_t *t2 = save[y + row_offset].t + ov_x;
-      rend_t *r2 = save[y + row_offset].r + ov_x;
+      text_t *t2 = ROW(y - view_start).t + ov_x;
+      rend_t *r2 = ROW(y - view_start).r + ov_x;
 
       for (int x = ov_w; x--; )
         {
@@ -3814,3 +3691,4 @@
 
 #endif
 /* ------------------------------------------------------------------------- */
+