| … | |
… | |
| 1530 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) |
1530 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) |
| 1531 | ; |
1531 | ; |
| 1532 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1532 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
| 1533 | ; |
1533 | ; |
| 1534 | |
1534 | |
| 1535 | if (isScrollbarWindow (ev.xany.window)) |
1535 | if (scrollBar.state && ev.xany.window == scrollBar.win) |
| 1536 | { |
1536 | { |
| 1537 | scrollBar.setIdle (); |
1537 | scrollBar.setIdle (); |
| 1538 | scrollbar_show (0); |
1538 | scrollbar_show (0); |
| 1539 | } |
1539 | } |
| 1540 | } |
1540 | } |
| … | |
… | |
| 1630 | #ifdef MOUSE_THRESHOLD |
1630 | #ifdef MOUSE_THRESHOLD |
| 1631 | } |
1631 | } |
| 1632 | #endif |
1632 | #endif |
| 1633 | } |
1633 | } |
| 1634 | } |
1634 | } |
| 1635 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1635 | else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) |
| 1636 | { |
1636 | { |
| 1637 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1637 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
| 1638 | MotionNotify, &ev)) |
1638 | MotionNotify, &ev)) |
| 1639 | ; |
1639 | ; |
| 1640 | |
1640 | |
| … | |
… | |
| 1924 | } |
1924 | } |
| 1925 | |
1925 | |
| 1926 | /* |
1926 | /* |
| 1927 | * Scrollbar window processing of button press |
1927 | * Scrollbar window processing of button press |
| 1928 | */ |
1928 | */ |
| 1929 | if (isScrollbarWindow (ev.window)) |
1929 | if (scrollBar.state && ev.window == scrollBar.win) |
| 1930 | { |
1930 | { |
| 1931 | scrollBar.setIdle (); |
1931 | scrollBar.setIdle (); |
| 1932 | /* |
1932 | /* |
| 1933 | * Rxvt-style scrollbar: |
1933 | * Rxvt-style scrollbar: |
| 1934 | * move up if mouse is above slider |
1934 | * move up if mouse is above slider |
| … | |
… | |
| 2170 | |
2170 | |
| 2171 | if (!slip_wheel_ev.is_active ()) |
2171 | if (!slip_wheel_ev.is_active ()) |
| 2172 | slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
2172 | slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
| 2173 | } |
2173 | } |
| 2174 | else |
2174 | else |
|
|
2175 | # endif |
| 2175 | { |
2176 | { |
| 2176 | # endif |
|
|
| 2177 | scr_page (v, i); |
2177 | scr_page (v, i); |
| 2178 | scrollbar_show (1); |
2178 | scrollbar_show (1); |
| 2179 | # ifdef MOUSE_SLIP_WHEELING |
|
|
| 2180 | } |
2179 | } |
| 2181 | # endif |
|
|
| 2182 | } |
2180 | } |
| 2183 | break; |
2181 | break; |
| 2184 | #endif |
2182 | #endif |
| 2185 | } |
2183 | } |
| 2186 | } |
2184 | } |
