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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.235 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC

       CLEAR_ALL_SELECTION ();
       rvideo = 0;
     }
   else
     {
+      CLEAR_ALL_SELECTION ();
       /*
        * add or delete rows as appropriate
        */
       rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
                   qline->l = ncol;
                   qline->is_longer (1);
                   int qcol = 0;
+                  // see below for cursor adjustment rationale
+                  if (p == ocur.row)
+                    screen.cur.row = q - (total_rows - nrow);
                   // fill a single destination line
                   while (lofs < llen && qcol < ncol)
                     {
                       int prow = lofs / prev_ncol;
                       int pcol = lofs % prev_ncol;
               row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
             }
           term_start = 0;
         }
-#ifdef DEBUG_STRICT //TODO: remove
-      for (int i = top_row; i < nrow; i++)
-        assert (ROW (i).t);
-#endif
       free (old_buf);
       delete old_ta;
       delete old_ra;
       top_row = max (top_row - count, -saveLines);
       // 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;
           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.
  * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
  *     will auto fallback to CUT_BUFFER0
  * EXT: button 2 release
  */
 void
-rxvt_term::selection_request (Time tm, int x, int y)
+rxvt_term::selection_request (Time tm)
 {
-  if (x < 0 || x >= width || y < 0 || y >= height)
-    return;                 /* outside window */
   if (selection.text)
     { /* internal selection */
       char *str = rxvt_wcstombs (selection.text, selection.len);
       paste (str, strlen (str));
       free (str);

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.235 by root, Tue Jan 17 05:47:42 2006 UTC vs. Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.235 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC