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

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.74 by sf-exg, Thu Sep 1 08:11:27 2011 UTC vs.
Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC

                                  window_sb_x, 0,
                                  total_width (),
                                  term->szHint.height,
                                  0,
                                  term->pix_colors[Color_fg],
-                                 term->pix_colors[Color_border]);
+                                 term->pix_colors[color ()]);
       XDefineCursor (term->dpy, win, leftptr_cursor);
       XSelectInput (term->dpy, win,
                    ExposureMask | ButtonPressMask | ButtonReleaseMask
                    | Button1MotionMask | Button2MotionMask
   if (refresh)
     {
       int sb_top = term->view_start - term->top_row;
       int sb_bot = sb_top + (term->nrow - 1);
       int sb_len = max (term->nrow - 1 - term->top_row, 1);
+      int n = min (min_height (), size ());
-      top = beg + (sb_top * size ()) / sb_len;
+      top = beg + (sb_top * (size () - n)) / sb_len;
-      bot = top + ecb_div_ru ((sb_bot - sb_top) * size (), sb_len) + min_height ();
+      bot = top + ecb_div_ru ((sb_bot - sb_top) * (size () - n), sb_len) + n;
       /* no change */
       if (top == last_top
           && bot == last_bot
           && (state == last_state
               || !(state == SB_STATE_UP || state == SB_STATE_DOWN)))
   if (botShadowGC)  XFreeGC (term->dpy, botShadowGC);
   if (scrollbarGC)  XFreeGC (term->dpy, scrollbarGC);
 #endif
 }
+int
+scrollBar_t::color ()
+{
+#ifdef RXVT_SCROLLBAR
+  if (style == SB_STYLE_RXVT && shadow)
+    return Color_trough;
+  else
+#endif
+    return Color_border;
+}
 void
 scrollBar_t::update_data ()
 {
 #if defined(PLAIN_SCROLLBAR)
   if (style == SB_STYLE_PLAIN)
 #endif
 #if defined(RXVT_SCROLLBAR)
   if (style == SB_STYLE_RXVT)
     {
       beg = (width + 1) + shadow;
-      end = term->szHint.height - beg - (2 * shadow);
+      end = term->szHint.height - beg;
       update = &scrollBar_t::show_rxvt;
     }
 #endif
 }

Diff Legend

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

Comparing rxvt-unicode/src/scrollbar.C (file contents): Revision 1.74 by sf-exg, Thu Sep 1 08:11:27 2011 UTC vs. Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.74 by sf-exg, Thu Sep 1 08:11:27 2011 UTC vs.
Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC