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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.233 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.237 by root, Wed Jan 18 11:07:30 2006 UTC

   scr_release ();
   prev_nrow = prev_ncol = 0;
   scr_reset ();
   scr_clear (true);
-  scr_refresh (SLOW_REFRESH);
+  scr_refresh ();
 }
 /* ------------------------------------------------------------------------- *
  *                         PROCESS SCREEN COMMANDS                           *
  * ------------------------------------------------------------------------- */
       && row1 == 0
       && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
     {
       top_row = max (top_row - count, -saveLines);
-      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;
+      // sever bottommost line
       {
-        // severe bottommost scrolled line
         line_t &l = ROW(row2 - count);
+        l.is_longer (0);
         l.touch ();
-        l.is_longer (0);
       }
-      // erase newly scorlled-in lines
+      // erase newly scrolled-in lines
-      for (int i = count; i; --i )
+      for (int i = count; 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);
+          line_t &l = ROW(nrow - 1 - i);
           scr_blank_line (l, 0, l.l, rstyle);
           l.l = 0;
           l.f = 0;
       // finally move the view window, if desired
       if (OPTION (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != -saveLines)
         scr_page (UP, count);
+      if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
+        HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
     }
   else
     {
       if (selection.op && current_screen == selection.screen)
         {
           CLEAR_SELECTION ();
         }
       if (screen.flags & Screen_WrapNext)
         {
-          max_it (line->l, ncol);
-          line->is_longer (1);
           scr_do_wrap ();
+          line->l = ncol;
+          line->is_longer (1);
           row = screen.cur.row;
           line = &ROW(row);   /* _must_ refresh */
         }
       // some utf-8 decoders "decode" surrogate characters: let's fix this.
     }
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
     fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
+  num_scr_allow = 0;
   if (refresh)
-    scr_refresh (SLOW_REFRESH);
+    scr_refresh ();
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Refresh the entire screen
   if (new_view_start == view_start)
     return false;
   num_scr += new_view_start - view_start;
   view_start = new_view_start;
+  want_refresh = 1;
   HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
-  want_refresh = 1;
   return true;
 }
 /* ------------------------------------------------------------------------- */
  * Refresh the screen
  * drawn_text/drawn_rend contain the screen information before the update.
  * screen.text/screen.rend contain what the screen will change to.
  */
 void
-rxvt_term::scr_refresh (unsigned char refresh_type)
+rxvt_term::scr_refresh ()
 {
   unsigned char must_clear, /* use draw_string not draw_image_string     */
                 showcursor; /* show the cursor                           */
   int16_t col, row,   /* column/row we're processing               */
           ocrow;      /* old cursor row                            */
 #ifndef NO_SLOW_LINK_SUPPORT
   /*
    * 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 && num_scr
       && abs (num_scr) < nrow && !must_clear)
     {
       int16_t nits;
       int j;
       int len, wlen;
+      dLocal (int, num_scr);
       j = nrow;
       wlen = len = -1;
       row = i > 0 ? 0 : j - 1;
       for (; j-- >= 0; row += (i > 0 ? 1 : -1))

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.233 by root, Mon Jan 16 06:37:52 2006 UTC vs. Revision 1.237 by root, Wed Jan 18 11:07:30 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.233 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.237 by root, Wed Jan 18 11:07:30 2006 UTC