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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC

     nrow = 24;
   if (ncol == prev_ncol && nrow == prev_nrow)
     return;
+  if (current_screen != PRIMARY)
+    scr_swap_screen ();
   // we need at least two lines for wrapping to work correctly
-  if (nrow + saveLines < 2)
+  while (nrow + saveLines < 2)
     {
       //TODO//FIXME
       saveLines++;
       prev_nrow--;
       top_row--;
   if (!row_buf)
     {
       /*
        * first time called so just malloc everything: don't rely on realloc
        */
-      top_row = 0;       /* no saved lines */
+      top_row    = 0;
       term_start = 0;
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
       ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
       if (top_row)
         {
-          // re-wrap lines, this is rather ugly, possibly because I am too dumb
+          // 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);
                       line_t &pline = old_buf [prow];
                       int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
-#if DEBUG_STRICT
-                      assert (len);
-                      assert (pline.t);
-#endif
                       memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
                       memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
                       lofs += len;
                       qcol += len;
       delete old_ra;
       clamp_it (screen.cur.row, 0, nrow - 1);
       clamp_it (screen.cur.col, 0, ncol - 1);
-      if (tabs)
-        free (tabs);
+      free (tabs);
     }
   CLEAR_ALL_SELECTION ();
   prev_nrow = nrow;
   tabs = (char *)rxvt_malloc (ncol * sizeof (char));
   for (int col = ncol; col--; )
     tabs [col] = col % TABSIZE == 0;
+  if (current_screen != PRIMARY)
+    scr_swap_screen ();
   tt_winch ();
   HOOK_INVOKE ((this, HOOK_RESET, DT_END));
 }
  * Free everything.  That way malloc debugging can find leakage.
  */
 void
 rxvt_term::scr_release () NOTHROW
 {
+  if (row_buf)
+    {
-  delete talloc; talloc = 0;
+      delete talloc; talloc = 0;
-  delete ralloc; ralloc = 0;
+      delete ralloc; ralloc = 0;
-  free (row_buf);
+      free (row_buf);
-  free (swap_buf);
+      free (swap_buf);
-  free (drawn_buf);
+      free (drawn_buf);
-  free (tabs);
+      free (tabs);
-  row_buf = 0; // signal that we freed all the arrays
+      row_buf = 0; // signal that we freed all the arrays
+    }
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Hard reset
  */
 void
-rxvt_term::scr_poweron () NOTHROW
+rxvt_term::scr_poweron ()
 {
   scr_release ();
   prev_nrow = prev_ncol = 0;
   scr_reset ();
   assert (s->cur.row >= 0);
   assert (s->cur.col >= 0);
 #endif
 }
+void
+rxvt_term::scr_swap_screen ()
+{
+  if (!OPTION (Opt_secondaryScreen))
+    return;
+  for (int i = prev_nrow; i--; )
+    ::swap (ROW(i), swap_buf [i]);
+  ::swap (screen.cur, swap.cur);
+  screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
+  screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
+}
 /* ------------------------------------------------------------------------- */
 /*
  * Swap between primary and secondary screens
  * XTERM_SEQ: Primary screen  : ESC [ ? 4 7 h
  * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
  */
-int
+void
-rxvt_term::scr_change_screen (int scrn) NOTHROW
+rxvt_term::scr_change_screen (int scrn)
 {
+  if (scrn == current_screen)
+    return;
   want_refresh = 1;
   view_start = 0;
-  if (current_screen == scrn)
-    return scrn;
   selection_check (2);        /* check for boundary cross */
   int i = current_screen; current_screen = scrn; scrn = i;
-  ::swap (screen.cur.row, swap.cur.row);
-  ::swap (screen.cur.col, swap.cur.col);
-  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 (OPTION (Opt_secondaryScreen))
     {
       num_scr = 0;
-      for (int i = prev_nrow; i--; )
+      scr_swap_screen ();
-        ::swap (ROW(i), swap_buf [i]);
       ::swap (screen.charset, swap.charset);
-      ::swap (screen.flags, swap.flags);
+      ::swap (screen.flags,   swap.flags);
       screen.flags |= Screen_VisibleCursor;
-      swap.flags |= Screen_VisibleCursor;
+      swap.flags   |= Screen_VisibleCursor;
     }
   else
 #endif
     if (OPTION (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
-  return scrn;
 }
 // clear WrapNext indicator, solidifying position on next line
 void
 rxvt_term::scr_do_wrap () NOTHROW

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC vs. Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC