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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.232 by root, Sun Jan 15 16:59:54 2006 UTC

   if (nrow + saveLines < 2)
     {
       //TODO//FIXME
       saveLines++;
       prev_nrow--;
-      nsaved++;
+      top_row--;
     }
   want_refresh = 1;
   int prev_total_rows = prev_nrow + saveLines;
   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
        */
-      nsaved = 0;       /* no saved lines */
+      top_row = 0;       /* no saved lines */
       term_start = 0;
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
       ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
-      row_buf   = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+      row_buf   = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
-      temp_buf  = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
-      drawn_buf = (line_t *)rxvt_calloc (nrow      , sizeof (line_t));
+      drawn_buf = (line_t *)rxvt_calloc (nrow             , sizeof (line_t));
-      swap_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);
             }
         }
 #endif
       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));
       for (int row = min (nrow, prev_nrow); row--; )
         {
           lresize (drawn_buf[row]);
         {
           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);
         }
+      line_t *old_buf = row_buf;
-      line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
+      row_buf = (line_t *)rxvt_calloc (total_rows + nrow, 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 pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
-      if (nsaved)
+      if (top_row)
         {
           // 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;
               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;
+          top_row = q - term_start;
           // make sure all terminal lines exist
-          while (nsaved < 0)
+          while (top_row > 0)
-            scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
+            scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
         }
       else
         {
           // if no scrollback exists (yet), wing, instead of wrap
           term_start = 0;
         }
 #ifdef DEBUG_STRICT //TODO: remove
-      for (int i = -nsaved; i < nrow; i++)
+      for (int i = top_row; i < nrow; i++)
         assert (ROW (i).t);
 #endif
       free (old_buf);
       delete old_ta;
   delete ralloc; ralloc = 0;
   free (row_buf);
   free (swap_buf);
   free (drawn_buf);
-  free (temp_buf);
   free (tabs);
   row_buf = 0; // signal that we freed all the arrays
 }
  * Change the colour for following text
  */
 void
 rxvt_term::scr_color (unsigned int color, int fgbg)
 {
-  if (color > maxTermCOLOR)
+  if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
     color = fgbg;
   if (fgbg == Color_fg)
     rstyle = SET_FGCOLOR (rstyle, color);
   else
   want_refresh = 1;
   num_scr += count;
   if (count > 0
       && row1 == 0
-      && row2 == nrow - 1
       && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
     {
-      nsaved = min (nsaved + count, saveLines);
+      top_row = max (top_row - count, -saveLines);
-      HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
+      HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
+      // scroll everything up 'count' lines
       term_start = (term_start + count) % total_rows;
+      {
+        // severe bottommost scrolled line
+        line_t &l = ROW(row2 - count);
+        l.touch ();
+        l.is_longer (0);
+      }
+      // erase newly scorlled-in lines
+      for (int i = count; i; --i )
+        {
+          // basically this is a slightly optimized scr_blank_screen_mem
+          // it is worth the effort on slower machines
+          line_t &l = ROW(nrow - i);
+          scr_blank_line (l, 0, l.l, rstyle);
+          l.l = 0;
+          l.f = 0;
+        }
+      // now copy lines below the scroll region bottom to the
+      // bottom of the screen again, so they look as if they
+      // hadn't moved.
+      for (int i = nrow; --i > row2; )
+        {
+          line_t &l1 = ROW(i - count);
+          line_t &l2 = ROW(i);
+          ::swap (l1, l2);
+          l2.touch ();
+        }
+      // move and/or clear selection, if any
       if (selection.op && current_screen == selection.screen)
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
           selection.mark.row -= count;
-          if (selection.beg.row < -nsaved
+          if (selection.beg.row < top_row
-              || selection.end.row < -nsaved
+              || selection.end.row < top_row
-              || selection.mark.row < -nsaved)
+              || selection.mark.row < top_row)
             {
               CLEAR_ALL_SELECTION ();
               selection.op = SELECTION_CLEAR;
             }
         }
-      for (int i = count; i--; )
+      // finally move the view window, if desired
-        scr_blank_screen_mem (ROW(row2 - i), rstyle);
       if (OPTION (Opt_scrollWithBuffer)
           && view_start != 0
-          && view_start != saveLines)
+          && view_start != -saveLines)
         scr_page (UP, count);
     }
   else
     {
       if (selection.op && current_screen == selection.screen)
       int rows = row2 - row1 + 1;
       min_it (count, rows);
+      line_t *temp_buf = row_buf + total_rows;
       for (int row = 0; row < rows; row++)
         {
           temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
           if (!IN_RANGE_EXC (row + count, 0, rows))
     }
 #ifdef DEBUG_STRICT
   assert (screen.cur.col < ncol);
   assert (screen.cur.row < nrow
-          && screen.cur.row >= -nsaved);
+          && screen.cur.row >= top_row);
 #endif
   int row = screen.cur.row;
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
 rxvt_term::scr_erase_savelines ()
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
-  nsaved = 0;
+  top_row = 0;
 }
 #endif
 /* ------------------------------------------------------------------------- */
 /*
 /* ------------------------------------------------------------------------- */
 /*
  * Move the display so that the line represented by scrollbar value Y is at
  * the top of the screen
  */
-int
+void
 rxvt_term::scr_move_to (int y, int len)
 {
-  long p = 0;
+  scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
-  unsigned int oldviewstart;
-  oldviewstart = view_start;
-  if (y < len)
-    {
-      p = (nrow + nsaved) * (len - y) / len;
-      p -= (long) (nrow - 1);
-      p = max (p, 0);
-    }
-  view_start = (unsigned int)min (p, nsaved);
-  return scr_changeview (oldviewstart);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Page the screen up/down nlines
  * direction should be UP or DN
  */
-int
+bool
 rxvt_term::scr_page (enum page_dirn direction, int nlines)
 {
-  int n;
+  int new_view_start =
-  unsigned int oldviewstart;
-  oldviewstart = view_start;
-  if (direction == UP)
-    {
-      n = view_start + nlines;
-      view_start = min (n, nsaved);
-    }
-  else
-    {
-      n = view_start - nlines;
+    direction == UP ? view_start - nlines
-      view_start = max (n, 0);
+                    : view_start + nlines;
-    }
-  return scr_changeview (oldviewstart);
+  return scr_changeview (new_view_start);
 }
-int
+bool
-rxvt_term::scr_changeview (unsigned int oldviewstart)
+rxvt_term::scr_changeview (int new_view_start)
 {
+  clamp_it (new_view_start, top_row, 0);
-  if (view_start != oldviewstart)
+  if (new_view_start == view_start)
-    {
+    return false;
+  num_scr += new_view_start - view_start;
+  view_start = new_view_start;
-      HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
+  HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
-      want_refresh = 1;
+  want_refresh = 1;
-      num_scr -= (view_start - oldviewstart);
-    }
-  return (int)view_start - (int)oldviewstart;
+  return true;
 }
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_bell ()
 # endif
   if (OPTION (Opt_visualBell))
     {
       scr_rvideo_mode (!rvideo); /* refresh also done */
+      display->flush ();
       rxvt_usleep (VISUAL_BELL_DURATION);
       scr_rvideo_mode (!rvideo); /* refresh also done */
     }
   else
     XBell (display->display, 0);
   if ((fd = popen_printer ()) == NULL)
     return;
   if (fullhist)
     {
-      nrows = nrow + nsaved;
+      nrows = nrow - top_row;
-      row_start = -nsaved;
+      row_start = top_row;
     }
   else
     {
       nrows = nrow;
-      row_start = -view_start;
+      row_start = view_start;
     }
   wctomb (0, 0);
   for (int r1 = 0; r1 < nrows; r1++)
     /* make sure no outline cursor is left around */
     setoldcursor = 0;
     if (ocrow != -1)
       {
-        if (screen.cur.row + view_start != ocrow
+        if (screen.cur.row - view_start != ocrow
             || screen.cur.col != oldcursor.col)
           {
             if (ocrow < nrow
                 && oldcursor.col < ncol)
               drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
     else if (!focus)
       setoldcursor = 1;
     if (setoldcursor)
       {
-        if (screen.cur.row + view_start >= nrow)
+        if (screen.cur.row - view_start >= nrow)
           oldcursor.row = -1;
         else
           {
-            oldcursor.row = screen.cur.row + view_start;
+            oldcursor.row = screen.cur.row - view_start;
             oldcursor.col = screen.cur.col;
           }
       }
   }
       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  = ROW(row - view_start);
+              line_t s  = ROW(view_start + row);
               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])
   /*
    * E: main pass across every character
    */
   for (row = 0; row < nrow; row++)
     {
-      text_t *stp = ROW(row - view_start).t;
+      text_t *stp = ROW(view_start + row).t;
-      rend_t *srp = ROW(row - view_start).r;
+      rend_t *srp = ROW(view_start + row).r;
       text_t *dtp = drawn_buf[row].t;
       rend_t *drp = drawn_buf[row].r;
       /*
        * E2: OK, now the real pass
   /*
    * H: cleanup selection
    */
   scr_reverse_selection ();
-  if (refresh_type & SMOOTH_REFRESH)
-    XFlush (display->display);
   num_scr = 0;
   num_scr_allow = 1;
 }
 void
   if (really)
     XClearWindow (display->display, vt);
 }
+void
+rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
+{
+  int view_end = view_start + nrow;
+  int row, col;
+  for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
+    {
+      text_t *stp = ROW(row).t;
+      rend_t *srp = ROW(row).r;
+      for (col = beg_col; col < end_col; col++)
+        srp[col] ^= rstyle1;
+      while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
+        srp[col] ^= rstyle2;
+      if (++col < end_col)
+        srp[col] ^= rstyle2;
+    }
+}
+void
+rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
+{
+  int view_end = view_start + nrow;
+  int row, col;
+  if (beg_row >= view_start)
+    {
+      col = beg_col;
+      row = beg_row;
+    }
+  else
+    {
+      col = 0;
+      row = view_start;
+    }
+  for (; row < min (end_row, view_end); row++, col = 0)
+    for (rend_t *srp = ROW(row).r; col < ncol; col++)
+      srp[col] ^= rstyle;
+  if (row == end_row)
+    for (rend_t *srp = ROW(row).r; col < end_col; col++)
+      srp[col] ^= rstyle;
+}
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_reverse_selection ()
 {
   if (selection.op
       && current_screen == selection.screen
-      && selection.end.row >= -view_start)
+      && selection.end.row >= view_start)
     {
-      int view_end = -view_start + nrow;
-      int row, col;
 #if ENABLE_FRILLS
       if (selection.rect)
-        {
+        scr_xor_rect (selection.beg.row, selection.beg.col,
-          for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
+                      selection.end.row, selection.end.col,
-            {
+                      RS_RVid, RS_RVid | RS_Uline);
-              text_t *stp = ROW(row).t;
-              rend_t *srp = ROW(row).r;
-              for (col = selection.beg.col; col < selection.end.col; col++)
-                srp[col] ^= RS_RVid;
-              while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
-                srp[col] ^= RS_RVid | RS_Uline;
-              if (++col < selection.end.col)
-                srp[col] ^= RS_RVid | RS_Uline;
-            }
-        }
       else
 #endif
-        {
+        scr_xor_span (selection.beg.row, selection.beg.col,
-          if (selection.beg.row >= -view_start)
+                      selection.end.row, selection.end.col,
-            {
+                      RS_RVid);
-              col = selection.beg.col;
-              row = selection.beg.row;
-            }
-          else
-            {
-              col = 0;
-              row = -view_start;
-            }
-          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 (row == selection.end.row)
-            for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
-              srp[col] ^= RS_RVid;
-        }
     }
 }
 /* ------------------------------------------------------------------------- */
 /*
   if (!selection.op)
     return;
   pos.row = pos.col = 0;
-  if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
+  if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
-      || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
+      || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
-      || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
+      || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
       || (check_more == 1
           && current_screen == selection.screen
           && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
           && ROWCOL_IS_BEFORE (screen.cur, selection.end))
       || (check_more == 2
     {
       display->set_selection_owner (this);
       return true;
     }
   else
+    {
+      selection_clear ();
-    return false;
+      return false;
+    }
 #if 0
   XTextProperty ct;
   if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
 rxvt_term::selection_click (int clicks, int x, int y)
 {
   clicks = ((clicks - 1) % 3) + 1;
   selection.clicks = clicks;       /* save clicks so extend will work */
+  if (clicks == 2 && !selection.rect
+      && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
+    {
+      MEvent.clicks = 1; // what a mess
+      selection.screen = current_screen;
+      selection.op = SELECTION_CONT;
+      return;
+    }
   selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
   if (clicks == 2 || clicks == 3)
     selection_extend_colrow (selection.mark.col,
-                             selection.mark.row + view_start,
+                             selection.mark.row - view_start,
                              0, /* button 3     */
                              1, /* button press */
                              0);        /* click change */
 }
 void
 rxvt_term::selection_start_colrow (int col, int row)
 {
   want_refresh = 1;
-  selection.mark.row = row - view_start;
+  selection.mark.row = row + view_start;
   selection.mark.col = col;
-  selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
+  selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
   selection.mark.col = clamp (selection.mark.col,       0, ncol - 1);
   while (selection.mark.col > 0
          && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
     --selection.mark.col;
   text_t *stp;
   rend_t *srp;
   if (dirn == UP)
     {
-      bound.row = - nsaved - 1;
+      bound.row = top_row - 1;
       bound.col = 0;
       dirnadd = -1;
     }
   else
     {
   * select nothing.  Otherwise, if we're to the right of the mark, you have to
   * be _past_ a character for it to be selected.
   */
   if (((selection.clicks % 3) == 1) && !flag
       && (col == selection.mark.col
-          && (row == selection.mark.row + view_start)))
+          && (row == selection.mark.row - view_start)))
     {
       /* select nothing */
       selection.beg.row = selection.end.row = 0;
       selection.beg.col = selection.end.col = 0;
       selection.clicks = 4;
       selection.beg.col = selection.end.col = selection.mark.col;
       selection.beg.row = selection.end.row = selection.mark.row;
     }
   pos.col = col;
-  pos.row = row - view_start;
+  pos.row = view_start + row;
   /*
    * This is mainly xterm style selection with a couple of differences, mainly
    * in the way button3 drag extension works.
    * We're either doing: button1 drag; button3 press; or button3 drag
   else if (selection.clicks == 2)
     {
       if (ROWCOL_IS_AFTER (selection.end, selection.beg))
         selection.end.col--;
-      if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
-        {
-          selection_delimit_word (UP, &selection.beg, &selection.beg);
+      selection_delimit_word (UP, &selection.beg, &selection.beg);
-          selection_delimit_word (DN, &selection.end, &selection.end);
+      selection_delimit_word (DN, &selection.end, &selection.end);
-        }
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
       if (OPTION (Opt_tripleclickwords))
   for (int y = ov_h; y--; )
     {
       text_t *t1 = ov_text[y];
       rend_t *r1 = ov_rend[y];
-      text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
+      text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
-      rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
+      rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
       for (int x = ov_w; x--; )
         {
           text_t t = *t1; *t1++ = *t2; *t2++ = t;
           rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC vs. Revision 1.232 by root, Sun Jan 15 16:59:54 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.232 by root, Sun Jan 15 16:59:54 2006 UTC