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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC vs.
Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC

   drawn_buf = (line_t *)chunk;
   swap_buf  = drawn_buf + nrow;
   row_buf   = swap_buf  + nrow;
 }
+void
+rxvt_term::copy_line (line_t &dst, line_t &src)
+{
+  scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
+  dst.l = min (src.l, ncol);
+  memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
+  memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
+  dst.f = src.f;
+}
 void ecb_cold
 rxvt_term::scr_reset ()
 {
 #if ENABLE_OVERLAY
   scr_overlay_off ();
   void *prev_chunk = chunk;
   size_t prev_chunk_size = chunk_size;
   line_t *prev_drawn_buf = drawn_buf;
   line_t *prev_swap_buf  = swap_buf;
   line_t *prev_row_buf   = row_buf;
-  int common_col = min (prev_ncol, ncol);
   scr_alloc ();
   if (!prev_row_buf)
     {
        * add or delete rows as appropriate
        */
       for (int row = min (nrow, prev_nrow); row--; )
         {
-          scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
+          copy_line (drawn_buf [row], prev_drawn_buf [row]);
-          scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
-          memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
-          memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
-          memcpy (swap_buf  [row].t, prev_swap_buf  [row].t, sizeof (text_t) * common_col);
-          memcpy (swap_buf  [row].r, prev_swap_buf  [row].r, sizeof (rend_t) * common_col);
-          swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
-          swap_buf [row].f = prev_swap_buf [row].f;
+          copy_line (swap_buf [row], prev_swap_buf [row]);
         }
       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
           for (int row = min (nrow, prev_nrow); row--; )
             {
               line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
               line_t &dst = row_buf [row];
-              scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
+              copy_line (dst, src);
-              memcpy (dst.t, src.t, sizeof (text_t) * common_col);
-              memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
-              dst.l = min (src.l, ncol);
-              dst.f = src.f;
             }
           for (int row = prev_nrow; row < nrow; row++)
             scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC vs. Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC vs.
Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC