| … | |
… | |
| 26 | |
26 | |
| 27 | /*----------------------------------------------------------------------*/ |
27 | /*----------------------------------------------------------------------*/ |
| 28 | #if defined(PLAIN_SCROLLBAR) |
28 | #if defined(PLAIN_SCROLLBAR) |
| 29 | |
29 | |
| 30 | int |
30 | int |
| 31 | rxvt_term::scrollbar_show_plain (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) |
31 | rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len) |
| 32 | { |
32 | { |
| 33 | int xsb = 0; |
33 | int xsb = 0; |
| 34 | int sbwidth = scrollBar.width - 1; |
34 | int sbwidth = scrollBar.width - 1; |
| 35 | |
35 | |
| 36 | if ((scrollBar.init & R_SB_PLAIN) == 0) |
36 | if ((scrollBar.init & R_SB_PLAIN) == 0) |
| 37 | { |
37 | { |
| 38 | XGCValues gcvalue; |
38 | XGCValues gcvalue; |
| 39 | |
39 | |
| 40 | scrollBar.init |= R_SB_PLAIN; |
40 | scrollBar.init |= R_SB_PLAIN; |
| 41 | gcvalue.foreground = pix_colors[Color_fg]; |
41 | gcvalue.foreground = pix_colors_focused[Color_scroll]; |
| 42 | gcvalue.background = pix_colors[Color_bg]; |
|
|
| 43 | |
42 | |
| 44 | pscrollbarGC = XCreateGC (display->display, scrollBar.win, |
43 | pscrollbarGC = XCreateGC (display->display, scrollBar.win, |
| 45 | GCForeground | GCBackground, &gcvalue); |
44 | GCForeground, &gcvalue); |
| 46 | } |
45 | } |
| 47 | /* instead of XClearWindow (display->display, scrollBar.win); */ |
46 | |
| 48 | xsb = (options & Opt_scrollBar_right) ? 1 : 0; |
47 | xsb = (options & Opt_scrollBar_right) ? 1 : 0; |
| 49 | if (last_top < scrollBar.top) |
|
|
| 50 | XClearArea (display->display, scrollBar.win, |
|
|
| 51 | sb_shadow + xsb, last_top, |
|
|
| 52 | sbwidth + 1, (scrollBar.top - last_top), False); |
|
|
| 53 | |
48 | |
| 54 | if (scrollBar.bot < last_bot) |
49 | if (update) |
|
|
50 | { |
|
|
51 | if (last_top < scrollBar.top) |
| 55 | XClearArea (display->display, scrollBar.win, |
52 | XClearArea (display->display, scrollBar.win, |
|
|
53 | sb_shadow + xsb, last_top, |
|
|
54 | sbwidth + 1, (scrollBar.top - last_top), False); |
|
|
55 | |
|
|
56 | if (scrollBar.bot < last_bot) |
|
|
57 | XClearArea (display->display, scrollBar.win, |
| 56 | sb_shadow + xsb, scrollBar.bot, |
58 | sb_shadow + xsb, scrollBar.bot, |
| 57 | sbwidth + 1, (last_bot - scrollBar.bot), False); |
59 | sbwidth + 1, (last_bot - scrollBar.bot), False); |
|
|
60 | } |
|
|
61 | else |
|
|
62 | XClearWindow (display->display, scrollBar.win); |
| 58 | |
63 | |
| 59 | /* scrollbar slider */ |
64 | /* scrollbar slider */ |
| 60 | XFillRectangle (display->display, scrollBar.win, pscrollbarGC, |
65 | XFillRectangle (display->display, scrollBar.win, pscrollbarGC, |
| 61 | xsb + 1, scrollBar.top, sbwidth, scrollbar_len); |
66 | xsb + 1, scrollBar.top, sbwidth, scrollbar_len); |
| 62 | |
67 | |
