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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC vs.
Revision 1.454 by sf-exg, Sun Jan 18 13:08:46 2015 UTC

  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
  * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
       // finally move the view window, if desired
       if (option (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != -saveLines)
-        scr_page (UP, count);
+        scr_page (count);
       if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
         HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
     }
   else
  * direction should be UP or DN
  */
 void
 rxvt_term::scr_index (enum page_dirn direction) NOTHROW
 {
-  int dirn;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
-  dirn = ((direction == UP) ? 1 : -1);
   screen.flags &= ~Screen_WrapNext;
   if ((screen.cur.row == screen.bscroll && direction == UP)
       || (screen.cur.row == screen.tscroll && direction == DN))
-    scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
+    scr_scroll_text (screen.tscroll, screen.bscroll, direction);
   else
-    screen.cur.row += dirn;
+    screen.cur.row += direction;
   clamp_it (screen.cur.row, 0, nrow - 1);
   selection_check (0);
 }
  * the top of the screen
  */
 void
 rxvt_term::scr_move_to (int y, int len) NOTHROW
 {
-  scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
+  // lerp (y, 0, len, top_row, nrow - 1)
+  scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Page the screen up/down nlines
  * direction should be UP or DN
  */
 bool
-rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
+rxvt_term::scr_page (int nlines) NOTHROW
 {
-  int new_view_start =
-    direction == UP ? view_start - nlines
-                    : view_start + nlines;
-  return scr_changeview (new_view_start);
+  return scr_changeview (view_start - nlines);
 }
 bool
 rxvt_term::scr_changeview (int new_view_start) NOTHROW
 {
           ccol2 = bgcolor_of (rstyle);
 #else
           ccol2 = Color_bg;
 #endif
-        if (focus)
+        if (focus && cursor_type == 0)
           {
             rend_t rend = cur_rend;
-            if (option (Opt_cursorUnderline))
-              rend ^= RS_Uline;
-            else
-              {
-                rend ^= RS_RVid;
+            rend ^= RS_RVid;
-                rend = SET_FGCOLOR (rend, ccol1);
+            rend = SET_FGCOLOR (rend, ccol1);
-                rend = SET_BGCOLOR (rend, ccol2);
+            rend = SET_BGCOLOR (rend, ccol2);
-              }
             scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
           }
       }
     /* make sure no outline cursor is left around */
-    if (ocrow != -1)
+    if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
-      {
-        if (screen.cur.row - view_start != ocrow
-            || screen.cur.col != oldcursor.col)
-          {
-            if (ocrow < nrow
-                && oldcursor.col < ncol)
-              drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
+      drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
-          }
-      }
     // save the current cursor coordinates if the cursor is visible
-    // and the window is unfocused, so as to clear the outline cursor
+    // and either the window is unfocused or the cursor style is
+    // underline or vertical bar, so as to clear the outline cursor in
-    // in the next refresh if the cursor moves
+    // the next refresh if the cursor moves or becomes invisible
-    if (showcursor && !focus && screen.cur.row - view_start < nrow)
+    if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
       {
         oldcursor.row = screen.cur.row - view_start;
         oldcursor.col = screen.cur.col;
       }
     else
       int ypixel = (int)Row2Pixel (row);
       for (col = 0; col < ncol; col++)
         {
           /* compare new text with old - if exactly the same then continue */
-          if (stp[col] == dtp[col]    /* Must match characters to skip. */
+          if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
-              && (RS_SAME (srp[col], drp[col])    /* Either rendition the same or   */
-                  || (stp[col] == ' ' /* space w/ no background change  */
-                      && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
             continue;
           // redraw one or more characters
           // seek to the beginning of wide characters
    * G: cleanup cursor and display outline cursor if necessary
    */
   if (showcursor)
     {
       if (focus)
+        {
+          if (cursor_type == 0)
-        scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
+            scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
+          else if (oldcursor.row >= 0)
+            {
+              XSetForeground (dpy, gc, pix_colors[ccol1]);
+              if (cursor_type == 1)
+                XFillRectangle (dpy, vt, gc,
+                                Col2Pixel (cur_col),
+                                Row2Pixel (oldcursor.row + 1) - 2,
+                                Width2Pixel (1),
+                                2);
+              else
+                XFillRectangle (dpy, vt, gc,
+                                Col2Pixel (cur_col),
+                                Row2Pixel (oldcursor.row),
+                                2,
+                                Height2Pixel (1));
+            }
+        }
       else if (oldcursor.row >= 0)
         {
           XSetForeground (dpy, gc, pix_colors[ccol1]);
           XDrawRectangle (dpy, vt, gc,
       scr_remap_chars (swap_buf [i]);
     }
 }
 void ecb_cold
-rxvt_term::scr_recolour (bool refresh) NOTHROW
+rxvt_term::scr_recolor (bool refresh) NOTHROW
 {
   bool transparent = false;
 #ifdef HAVE_IMG
   if (bg_img != 0)
       XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
     }
   XClearWindow (dpy, parent);
-  if (scrollBar.win)
+  if (scrollBar.state && scrollBar.win)
     {
       if (transparent)
         XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
       else
         XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
 void
 rxvt_term::selection_changed () NOTHROW
 {
   line_t &r1 = ROW (selection.beg.row);
-  while (selection.beg.col >    0 && r1.t [selection.beg.col] == NOCHAR)
+  while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
-    --selection.beg.col;
+    ++selection.beg.col;
   line_t &r2 = ROW (selection.end.row);
   while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
     ++selection.end.col;

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC vs. Revision 1.454 by sf-exg, Sun Jan 18 13:08:46 2015 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC vs.
Revision 1.454 by sf-exg, Sun Jan 18 13:08:46 2015 UTC