it.
if (target->scrollBar.win)
{
- target->scrollBar.setIdle ();
+ target->scrollBar.state = STATE_IDLE;
target->scrollbar_show (0);
}
if (scrollBar.state && ev.xany.window == scrollBar.win)
{
- scrollBar.setIdle ();
+ scrollBar.state = STATE_IDLE;
scrollbar_show (0);
}
}
#endif
}
}
- else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
+ else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
{
while (XCheckTypedWindowEvent (dpy, scrollBar.win,
MotionNotify, &ev))
else if (scrollBar.dnButton (ev.y))
upordown = 1; /* down */
- scrollBar.setIdle ();
+ scrollBar.state = STATE_IDLE;
/*
* Rxvt-style scrollbar:
* move up if mouse is above slider
if (scr_page (upordown < 0 ? UP : DN, 1))
{
if (upordown < 0)
- scrollBar.setUp ();
+ scrollBar.state = STATE_UP;
else
- scrollBar.setDn ();
+ scrollBar.state = STATE_DOWN;
}
}
else
|| scrollbar_below_slider (ev.y))
scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
- scrollBar.setMotion ();
+ scrollBar.state = STATE_MOTION;
break;
case Button1:
scr_page (DN, nrow / 4);
# endif
else
- scrollBar.setMotion ();
+ scrollBar.state = STATE_MOTION;
}
else
{
if (!bypass_keystate)
reportmode = !! (priv_modes & PrivMode_mouse_report);
- if (scrollbar_isUpDn ())
+ if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
{
- scrollBar.setIdle ();
+ scrollBar.state = STATE_IDLE;
scrollbar_show (0);
}
#endif
if (option (Opt_scrollBar))
- scrollBar.setIdle (); /* set existence for size calculations */
+ scrollBar.state = STATE_IDLE; /* set existence for size calculations */
pty = ptytty::create ();
if (scrollBar.win)
{
XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
- scrollBar.setIdle ();
+ scrollBar.state = STATE_IDLE;
scrollbar_show (0);
}
if (map)
{
- scrollBar.setIdle ();
+ scrollBar.state = STATE_IDLE;
if (!scrollBar.win)
resize_scrollbar ();
/* no change */
if (scrollBar.top == scrollBar.last_top
&& scrollBar.bot == scrollBar.last_bot
- && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ()))
+ && (scrollBar.state == scrollBar.last_state
+ || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
return 0;
}
#define R_SB_PLAIN 4
#define R_SB_RXVT 8
+enum sb_state {
+ STATE_IDLE = 1,
+ STATE_MOTION,
+ STATE_UP,
+ STATE_DOWN,
+};
+
struct scrollBar_t {
char state; /* scrollbar state */
char init; /* scrollbar has been initialised */
Cursor leftptr_cursor;
int (rxvt_term::*update)(int, int, int, int);
- void setIdle() { state = 1 ; }
- void setMotion() { state = 'm'; }
- void setUp() { state = 'U'; }
- void setDn() { state = 'D'; }
-
bool upButton (int y)
{
if (style == R_SB_NEXT)
};
#define scrollbar_TotalWidth() (scrollBar.width + scrollBar.shadow * 2)
-#define scrollbar_isMotion() (scrollBar.state == 'm')
-#define scrollbar_isUp() (scrollBar.state == 'U')
-#define scrollbar_isDn() (scrollBar.state == 'D')
-#define scrollbar_isUpDn() (scrollbar_isUp () || scrollbar_isDn ())
#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
#define SCROLLRXVT_MINHEIGHT 10