| … | |
… | |
| 40 | if ((scrollBar.init & R_SB_XTERM) == 0) |
40 | if ((scrollBar.init & R_SB_XTERM) == 0) |
| 41 | { |
41 | { |
| 42 | XGCValues gcvalue; |
42 | XGCValues gcvalue; |
| 43 | |
43 | |
| 44 | scrollBar.init |= R_SB_XTERM; |
44 | scrollBar.init |= R_SB_XTERM; |
| 45 | gcvalue.stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win, |
45 | gcvalue.stipple = XCreateBitmapFromData(display->display, scrollBar.win, |
| 46 | (char *)x_stp_bits, x_stp_width, |
46 | (char *)x_stp_bits, x_stp_width, |
| 47 | x_stp_height); |
47 | x_stp_height); |
| 48 | if (!gcvalue.stipple) |
48 | if (!gcvalue.stipple) |
| 49 | { |
49 | { |
| 50 | rxvt_print_error("can't create bitmap"); |
50 | rxvt_print_error("can't create bitmap"); |
| … | |
… | |
| 52 | } |
52 | } |
| 53 | gcvalue.fill_style = FillOpaqueStippled; |
53 | gcvalue.fill_style = FillOpaqueStippled; |
| 54 | gcvalue.foreground = PixColors[Color_fg]; |
54 | gcvalue.foreground = PixColors[Color_fg]; |
| 55 | gcvalue.background = PixColors[Color_bg]; |
55 | gcvalue.background = PixColors[Color_bg]; |
| 56 | |
56 | |
| 57 | xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win, |
57 | xscrollbarGC = XCreateGC(display->display, scrollBar.win, |
| 58 | GCForeground | GCBackground |
58 | GCForeground | GCBackground |
| 59 | | GCFillStyle | GCStipple, &gcvalue); |
59 | | GCFillStyle | GCStipple, &gcvalue); |
| 60 | gcvalue.foreground = PixColors[Color_border]; |
60 | gcvalue.foreground = PixColors[Color_border]; |
| 61 | ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue); |
61 | ShadowGC = XCreateGC(display->display, scrollBar.win, GCForeground, &gcvalue); |
| 62 | } |
62 | } |
| 63 | /* instead of XClearWindow (Xdisplay, scrollBar.win); */ |
63 | /* instead of XClearWindow (display->display, scrollBar.win); */ |
| 64 | xsb = (Options & Opt_scrollBar_right) ? 1 : 0; |
64 | xsb = (Options & Opt_scrollBar_right) ? 1 : 0; |
| 65 | if (last_top < scrollBar.top) |
65 | if (last_top < scrollBar.top) |
| 66 | XClearArea(Xdisplay, scrollBar.win, |
66 | XClearArea(display->display, scrollBar.win, |
| 67 | sb_shadow + xsb, last_top, |
67 | sb_shadow + xsb, last_top, |
| 68 | sbwidth, (scrollBar.top - last_top), False); |
68 | sbwidth, (scrollBar.top - last_top), False); |
| 69 | |
69 | |
| 70 | if (scrollBar.bot < last_bot) |
70 | if (scrollBar.bot < last_bot) |
| 71 | XClearArea(Xdisplay, scrollBar.win, |
71 | XClearArea(display->display, scrollBar.win, |
| 72 | sb_shadow + xsb, scrollBar.bot, |
72 | sb_shadow + xsb, scrollBar.bot, |
| 73 | sbwidth, (last_bot - scrollBar.bot), False); |
73 | sbwidth, (last_bot - scrollBar.bot), False); |
| 74 | |
74 | |
| 75 | /* scrollbar slider */ |
75 | /* scrollbar slider */ |
| 76 | XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC, |
76 | XFillRectangle(display->display, scrollBar.win, xscrollbarGC, |
| 77 | xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); |
77 | xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); |
| 78 | |
78 | |
| 79 | XDrawLine(Xdisplay, scrollBar.win, ShadowGC, |
79 | XDrawLine(display->display, scrollBar.win, ShadowGC, |
| 80 | xsb ? 0 : sbwidth, scrollBar.beg, |
80 | xsb ? 0 : sbwidth, scrollBar.beg, |
| 81 | xsb ? 0 : sbwidth, scrollBar.end); |
81 | xsb ? 0 : sbwidth, scrollBar.end); |
| 82 | return 1; |
82 | return 1; |
| 83 | } |
83 | } |
| 84 | #endif /* XTERM_SCROLLBAR */ |
84 | #endif /* XTERM_SCROLLBAR */ |
