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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.383 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

     if (option (Opt_scrollTtyOutput))                                  \
         view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
         = selection.end.row = selection.end.col = 0
-#define CLEAR_ALL_SELECTION()                                          \
+#define CLEAR_SELECTION_MARK()                                         \
-    selection.beg.row = selection.beg.col                              \
-        = selection.mark.row = selection.mark.col                      \
-        = selection.end.row = selection.end.col = 0
+    selection.mark.row = selection.mark.col = 0
 #define ROW_AND_COL_IS_AFTER(A, B, C, D)                               \
     (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
 #define ROW_AND_COL_IS_BEFORE(A, B, C, D)                              \
     (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
       term_start = 0;
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
       ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
-      row_buf   = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
+      row_buf   = (line_t *)rxvt_calloc (total_rows       , sizeof (line_t));
       drawn_buf = (line_t *)rxvt_calloc (nrow             , sizeof (line_t));
       swap_buf  = (line_t *)rxvt_calloc (nrow             , sizeof (line_t));
       for (int row = nrow; row--; )
         {
           swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
           drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
         }
       line_t *old_buf = row_buf;
-      row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
+      row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
       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
   tabs = (char *)rxvt_malloc (ncol);
   for (int col = ncol; col--; )
     tabs [col] = col % TABSIZE == 0;
-  CLEAR_ALL_SELECTION ();
+  CLEAR_SELECTION ();
+  CLEAR_SELECTION_MARK ();
   prev_nrow = nrow;
   prev_ncol = ncol;
   tt_winch ();
   if (count > 0
       && row1 == 0
       && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
     {
+      min_it (count, total_rows - (nrow - (row2 + 1)));
       top_row = max (top_row - count, -saveLines);
-      // scroll everything up 'count' lines
-      term_start = (term_start + count) % total_rows;
       // sever bottommost line
       {
-        line_t &l = ROW(row2 - count);
+        line_t &l = ROW(row2);
         l.is_longer (0);
         l.touch ();
       }
+      // scroll everything up 'count' lines
+      term_start = (term_start + count) % total_rows;
+      // now copy lines below the scroll region bottom to the
+      // bottom of the screen again, so they look as if they
+      // hadn't moved.
+      for (int i = nrow; --i > row2; )
+        {
+          line_t &l1 = ROW(i - count);
+          line_t &l2 = ROW(i);
+          ::swap (l1, l2);
+          l2.touch ();
+        }
       // erase newly scrolled-in lines
       for (int i = count; i--; )
         {
-          line_t &l = ROW(nrow - 1 - i);
+          line_t &l = ROW(row2 - i);
-          // optimize if already cleared, can be significant on slow machines
+          // optimise if already cleared, can be significant on slow machines
           // could be rolled into scr_blank_screen_mem
           if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
             {
               scr_blank_line (l, 0, l.l, rstyle);
               l.l = 0;
             }
           else
             scr_blank_screen_mem (l, rstyle);
         }
-      // now copy lines below the scroll region bottom to the
-      // bottom of the screen again, so they look as if they
-      // hadn't moved.
-      for (int i = nrow; --i > row2; )
-        {
-          line_t &l1 = ROW(i - count);
-          line_t &l2 = ROW(i);
-          ::swap (l1, l2);
-          l2.touch ();
-        }
       // move and/or clear selection, if any
-      if (selection.op && current_screen == selection.screen)
+      if (selection.op && current_screen == selection.screen
+          && selection.beg.row <= row2)
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
           selection.mark.row -= count;
-          if (selection.beg.row < top_row
+          selection_check (0);
-              || selection.end.row < top_row
-              || selection.mark.row < top_row)
-            {
-              CLEAR_ALL_SELECTION ();
-              selection.op = SELECTION_CLEAR;
-            }
         }
       // finally move the view window, if desired
       if (option (Opt_scrollWithBuffer)
           && view_start != 0
               || (selection.beg.row - count < row1 && selection.beg.row >= row1)
               || (selection.beg.row - count > row2 && selection.beg.row <= row2)
               || (selection.end.row - count < row1 && selection.end.row >= row1)
               || (selection.end.row - count > row2 && selection.end.row <= row2))
             {
-              CLEAR_ALL_SELECTION ();
+              CLEAR_SELECTION ();
-              selection.op = SELECTION_CLEAR;
+              if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
+                CLEAR_SELECTION_MARK ();
             }
           else if (selection.end.row >= row1 && selection.end.row <= row2)
             {
               /* move selected region too */
               selection.beg.row  -= count;
         }
       // use a simple and robust scrolling algorithm, this
       // part of scr_scroll_text is not time-critical.
+      // sever line above scroll region
+      if (row1)
+        {
+          line_t &l = ROW(row1 - 1);
+          l.is_longer (0);
+          l.touch ();
+        }
       int rows = row2 - row1 + 1;
       min_it (count, rows);
-      line_t *temp_buf = row_buf + total_rows;
+      line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
       for (int row = 0; row < rows; row++)
         {
           temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
             scr_blank_screen_mem (temp_buf [row], rstyle);
         }
       for (int row = 0; row < rows; row++)
         ROW(row1 + row) = temp_buf [row];
+      // sever bottommost line
+      {
+        line_t &l = ROW(row2);
+        l.is_longer (0);
+        l.touch ();
+      }
     }
   return count;
 }
 rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
 {
   if (len <= 0)               /* sanity */
     return;
-  unsigned char checksel;
+  bool checksel;
   unicode_t c;
   int ncol = this->ncol;
   const wchar_t *strend = str + len;
   want_refresh = 1;
   while (str < strend)
     {
       c = (unicode_t)*str++; // convert to rxvt-unicodes representation
-      if (expect_false (c < 0x20))
+      if (ecb_unlikely (c < 0x20))
         if (c == C0_LF)
           {
             max_it (line->l, screen.cur.col);
             screen.flags &= ~Screen_WrapNext;
           {
             scr_tab (1, true);
             continue;
           }
-      if (expect_false (
+      if (ecb_unlikely (
             checksel            /* see if we're writing within selection */
             && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
             && ROWCOL_IS_BEFORE (screen.cur, selection.end)
          ))
         {
            *      should be a similar check.
            */
           CLEAR_SELECTION ();
         }
-      if (expect_false (screen.flags & Screen_WrapNext))
+      if (ecb_unlikely (screen.flags & Screen_WrapNext))
         {
           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 (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
+      if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
         c = 0xfffd;
       // rely on wcwidth to tell us the character width, do wcwidth before
       // further replacements, as wcwidth might return -1 for the line
       // drawing characters below as they might be invalid in the current
       // locale.
       int width = WCWIDTH (c);
-      if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
+      if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
         {
           // vt100 special graphics and line drawing
           // 5f-7e standard vt100
           // 40-5e rxvt extension for extra curses acs chars
           static uint16_t vt100_0[62] = { // 41 .. 7e
               c = vt100_0[c - 0x41];
               width = 1; // vt100 line drawing characters are always single-width
             }
         }
-      if (expect_false (screen.flags & Screen_Insert))
+      if (ecb_unlikely (screen.flags & Screen_Insert))
         scr_insdel_chars (width, INSERT);
       if (width != 0)
         {
 #if !UNICODE_3
 #endif
           rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
           // if the character doesn't fit into the remaining columns...
-          if (expect_false (screen.cur.col > ncol - width && ncol >= width))
+          if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
             {
               if (screen.flags & Screen_Autowrap)
                 {
                   // ... artificially enlargen the previous one
                   c = NOCHAR;
           // nuke the character at this position, if required
           // due to wonderful coincidences everywhere else in this loop
           // we never have to check for overwriting a wide char itself,
           // only its tail.
-          if (expect_false (line->t[screen.cur.col] == NOCHAR))
+          if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
             scr_kill_char (*line, screen.cur.col);
           line->touch ();
           do
             {
               line->t[screen.cur.col] = c;
               line->r[screen.cur.col] = rend;
-              if (expect_true (screen.cur.col < ncol - 1))
+              if (ecb_likely (screen.cur.col < ncol - 1))
                 screen.cur.col++;
               else
                 {
                   line->l = ncol;
                   if (screen.flags & Screen_Autowrap)
                   goto end_of_line;
                 }
               c = NOCHAR;
             }
-          while (expect_false (--width > 0));
+          while (ecb_unlikely (--width > 0));
           // pad with spaces when overwriting wide character with smaller one
-          for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
+          for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
             {
               line->t[c] = ' ';
               line->r[c] = rend;
             }
    * A: set up vars
    */
   refresh_count = 0;
   unsigned int old_screen_flags = screen.flags;
-  char have_bg = 0;
+  bool have_bg = 0;
 #ifdef HAVE_BG_PIXMAP
   have_bg = bg_pixmap != None;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
   HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
 #if ENABLE_OVERLAY
   scr_swap_overlay ();
 #endif
-  char showcursor = screen.flags & Screen_VisibleCursor;
+  bool showcursor = screen.flags & Screen_VisibleCursor;
   /*
    * C: set the cursor character (s)
    */
   {
-    unsigned char setoldcursor;
+    bool setoldcursor;
 #ifdef CURSOR_BLINK
     if (hidden_cursor)
       showcursor = 0;
 #endif
             continue;
           // redraw one or more characters
           // seek to the beginning of wide characters
-          while (expect_false (stp[col] == NOCHAR && col > 0))
+          while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
             --col;
           rend_t rend = srp[col];     /* screen rendition (target rendition) */
           text_t *text = stp + col;
           int count = 1;
           col--;      /* went one too far.  move back */
           count -= i; /* dump any matching trailing chars */
           // sometimes we optimize away the trailing NOCHAR's, add them back
-          while (expect_false (i && text[count] == NOCHAR))
+          while (ecb_unlikely (i && text[count] == NOCHAR))
             count++, i--;
           /*
            * Determine the attributes for the string
            */
           int fore = fgcolor_of (rend); // desired foreground
           int back = bgcolor_of (rend); // desired background
           // only do special processing if any attributes are set, which is unlikely
-          if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
+          if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
             {
               bool invert = rend & RS_RVid;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
               if (rend & RS_Bold && fore == Color_fg)
           /*
            * Actually do the drawing of the string here
            */
           rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
-          if (expect_true (have_bg && back == Color_bg))
+          if (ecb_likely (have_bg && back == Color_bg))
             {
               // this is very ugly, maybe push it into ->draw?
               for (i = 0; i < count; i++) /* don't draw empty strings */
                 if (text[i] != ' ')
               did_clear: ;
             }
           else
             font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
-          if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
+          if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
             {
 #if ENABLE_FRILLS
               if (ISSET_PIXCOLOR (Color_underline))
                 XSetForeground (dpy, gc, pix_colors[Color_underline]);
               else
     {
       if (transparent)
         XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
       else
         XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
-      scrollBar.state = STATE_IDLE;
+      scrollBar.state = SB_STATE_IDLE;
       scrollBar.show (0);
     }
   if (refresh)
     {
  *                           CHARACTER SELECTION                             *
  * ------------------------------------------------------------------------- */
 void
 rxvt_term::selection_check (int check_more) NOTHROW
 {
-  row_col_t pos;
   if (!selection.op)
     return;
+  row_col_t pos;
   pos.row = pos.col = 0;
   if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
-      || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
       || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
       || (check_more == 1
           && current_screen == selection.screen
           && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
           && ROWCOL_IS_BEFORE (screen.cur, selection.end))
       || (check_more == 2
           && ROWCOL_IS_BEFORE (selection.beg, pos)
           && ROWCOL_IS_AFTER (selection.end, pos))
       || (check_more == 3
-          && ROWCOL_IS_AFTER (selection.end, pos))
+          && ROWCOL_IS_AFTER (selection.end, pos)))
-      || (check_more == 4     /* screen width change */
-          && (selection.beg.row != selection.end.row
-              || selection.end.col > ncol)))
     CLEAR_SELECTION ();
+  if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
+    CLEAR_SELECTION_MARK ();
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Paste a selection direct to the command fd

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.383 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs. Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.383 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC