Remove missed occurrences of scrollbar_is{Up,Dn}.

diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
index 388413bbc6783e89d255360a8105d11b583dd50c..64364399be97c45296751cc88bb8e10646feef42 100644 (file)
--- a/src/scrollbar-next.C
+++ b/src/scrollbar-next.C
@@ -282,12 +282,12 @@ rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scro
                  height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
                  SB_BUTTON_HEIGHT);
 
-      s = (scrollbar_isUp ()) ? upArrowHi : upArrow;
+      s = scrollBar.state == STATE_UP ? upArrowHi : upArrow;
       XCopyArea (dpy, s, scrollBar.win, whiteGC, 0, 0,
                  ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
                  height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
 
-      s = (scrollbar_isDn ()) ? downArrowHi : downArrow;
+      s = scrollBar.state == STATE_DOWN ? downArrowHi : downArrow;
       XCopyArea (dpy, s, scrollBar.win, whiteGC, 0, 0,
                  ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
                  height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);

diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 216e07144c902977cf5fc37e60ef691e667a82f6..cfe826c08ee23a6a39e2b1339834417f483c0e80 100644 (file)
--- a/src/scrollbar-rxvt.C
+++ b/src/scrollbar-rxvt.C
@@ -151,6 +151,7 @@ rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scro
 {
   int sbshadow = scrollBar.shadow;
   int sbwidth = (int)scrollBar.width;
+  int state;
 
   if ((scrollBar.init & R_SB_RXVT) == 0)
     {
@@ -217,8 +218,10 @@ rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scro
   draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
 
   /* Redraw scrollbar arrows */
-  draw_button (this, sbshadow, sbshadow,          (scrollbar_isUp () ? -1 : +1), UP);
-  draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
+  state = scrollBar.state == STATE_UP ? -1 : +1;
+  draw_button (this, sbshadow, sbshadow,          state, UP);
+  state = scrollBar.state == STATE_DOWN ? -1 : +1;
+  draw_button (this, sbshadow, scrollBar.end + 1, state, DN);
 
   return 1;
 }