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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.462 by root, Thu Jun 17 11:01:57 2021 UTC vs.
Revision 1.468 by root, Mon Aug 8 09:47:56 2022 UTC

        * add or delete rows as appropriate
        */
       int common_col = min (prev_ncol, ncol);
+      // resize swap_buf, blank drawn_buf
       for (int row = min (nrow, prev_nrow); row--; )
         {
           scr_blank_screen_mem (drawn_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);
       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
-      if (top_row)
+#if ENABLE_FRILLS
+      if ((rewrap_always || top_row) && !rewrap_never)
         {
           // Re-wrap lines. This is rather ugly, possibly because I am too dumb
           // to come up with a lean and mean algorithm.
           // TODO: maybe optimise when width didn't change
           // make sure all terminal lines exist
           while (top_row > 0)
             scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
         }
       else
+#endif
+        {
+          // wing, instead of wrap
-        {
+          do
-          // if no scrollback exists (yet), wing, instead of wrap
-          for (int row = min (nrow, prev_nrow); row--; )
             {
-              line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
+              p = MOD (p - 1, prev_total_rows);
-              line_t &dst = row_buf [row];
+              q--;
-              copy_line (dst, src);
+              copy_line (row_buf [q], prev_row_buf [p]);
             }
+          while (p != pend);
-          for (int row = prev_nrow; row < nrow; row++)
+          screen.cur.row += nrow - prev_nrow;
-            scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
+          term_start = total_rows - nrow;
-          term_start = 0;
         }
       clamp_it (screen.cur.row, 0, nrow - 1);
       clamp_it (screen.cur.col, 0, ncol - 1);
     }
+  // ensure drawn_buf, swap_buf and terminal rows are all initialized
   for (int row = nrow; row--; )
     {
       if (!ROW       (row).valid ()) scr_blank_screen_mem (ROW       (row), DEFAULT_RSTYLE);
       if (!swap_buf  [row].valid ()) scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
       if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
   /* convert normal newline chars into common keyboard Return key sequence */
   for (unsigned int i = 0; i < len; i++)
     if (data[i] == C0_LF)
       data[i] = C0_CR;
-  if (priv_modes & PrivMode_BracketPaste)
+  #if ENABLE_FRILLS
+  if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
     tt_printf ("\x1b[200~");
+  #endif
   tt_write (data, len);
-  if (priv_modes & PrivMode_BracketPaste)
+  #if ENABLE_FRILLS
+  if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
     tt_printf ("\x1b[201~");
+  #endif
 }
 void
 rxvt_term::paste (char *data, unsigned int len) noexcept
 {

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.462 by root, Thu Jun 17 11:01:57 2021 UTC vs. Revision 1.468 by root, Mon Aug 8 09:47:56 2022 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.462 by root, Thu Jun 17 11:01:57 2021 UTC vs.
Revision 1.468 by root, Mon Aug 8 09:47:56 2022 UTC