| … | |
… | |
| 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_focused[Color_scroll]; |
41 | gcvalue.foreground = pix_colors_focused[Color_scroll]; |
| 42 | |
42 | |
| 43 | pscrollbarGC = XCreateGC (display->display, scrollBar.win, |
43 | pscrollbarGC = XCreateGC (xdisp, scrollBar.win, GCForeground, &gcvalue); |
| 44 | GCForeground, &gcvalue); |
|
|
| 45 | } |
44 | } |
| 46 | |
45 | |
| 47 | xsb = (options & Opt_scrollBar_right) ? 1 : 0; |
46 | xsb = OPTION (Opt_scrollBar_right) ? 1 : 0; |
| 48 | |
47 | |
| 49 | if (update) |
48 | if (update) |
| 50 | { |
49 | { |
| 51 | if (last_top < scrollBar.top) |
50 | if (last_top < scrollBar.top) |
| 52 | XClearArea (display->display, scrollBar.win, |
51 | XClearArea (xdisp, scrollBar.win, |
| 53 | sb_shadow + xsb, last_top, |
52 | sb_shadow, last_top, |
| 54 | sbwidth + 1, (scrollBar.top - last_top), False); |
53 | sbwidth + 1, (scrollBar.top - last_top), False); |
| 55 | |
54 | |
| 56 | if (scrollBar.bot < last_bot) |
55 | if (scrollBar.bot < last_bot) |
| 57 | XClearArea (display->display, scrollBar.win, |
56 | XClearArea (xdisp, scrollBar.win, |
| 58 | sb_shadow + xsb, scrollBar.bot, |
57 | sb_shadow, scrollBar.bot, |
| 59 | sbwidth + 1, (last_bot - scrollBar.bot), False); |
58 | sbwidth + 1, (last_bot - scrollBar.bot), False); |
| 60 | } |
59 | } |
| 61 | else |
60 | else |
| 62 | XClearWindow (display->display, scrollBar.win); |
61 | XClearWindow (xdisp, scrollBar.win); |
| 63 | |
62 | |
| 64 | /* scrollbar slider */ |
63 | /* scrollbar slider */ |
| 65 | XFillRectangle (display->display, scrollBar.win, pscrollbarGC, |
64 | XFillRectangle (xdisp, scrollBar.win, pscrollbarGC, |
| 66 | xsb + 1, scrollBar.top, sbwidth, scrollbar_len); |
65 | 1 - xsb, scrollBar.top, sbwidth, scrollbar_len); |
| 67 | |
66 | |
| 68 | return 1; |
67 | return 1; |
| 69 | } |
68 | } |
| 70 | |
69 | |
| 71 | #endif |
70 | #endif |
