… | |
… | |
36 | w += x - 1; |
36 | w += x - 1; |
37 | h += y - 1; |
37 | h += y - 1; |
38 | |
38 | |
39 | for (; shadow-- > 0; x++, y++, w--, h--) |
39 | for (; shadow-- > 0; x++, y++, w--, h--) |
40 | { |
40 | { |
41 | XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, w , y ); |
41 | XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w , y ); |
42 | XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, x , h ); |
42 | XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x , h ); |
43 | XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1); |
43 | XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1); |
44 | XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h ); |
44 | XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h ); |
45 | } |
45 | } |
46 | } |
46 | } |
47 | |
47 | |
48 | /* draw triangular button with a shadow of 2 pixels */ |
48 | /* draw triangular button with a shadow of 2 pixels */ |
49 | static void |
49 | static void |
… | |
… | |
85 | { |
85 | { |
86 | pt[0].y = pt[1].y = y; |
86 | pt[0].y = pt[1].y = y; |
87 | pt[2].y = y + sz - 1; |
87 | pt[2].y = y + sz - 1; |
88 | } |
88 | } |
89 | |
89 | |
90 | XFillPolygon (term->xdisp, term->scrollBar.win, term->scrollbarGC, |
90 | XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC, |
91 | pt, 3, Convex, CoordModeOrigin); |
91 | pt, 3, Convex, CoordModeOrigin); |
92 | |
92 | |
93 | /* draw base */ |
93 | /* draw base */ |
94 | XDrawLine (term->xdisp, term->scrollBar.win, (dirn == UP ? bot : top), |
94 | XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top), |
95 | pt[0].x, pt[0].y, pt[1].x, pt[1].y); |
95 | pt[0].x, pt[0].y, pt[1].x, pt[1].y); |
96 | |
96 | |
97 | /* draw shadow on left */ |
97 | /* draw shadow on left */ |
98 | pt[1].x = x + sz2 - 1; |
98 | pt[1].x = x + sz2 - 1; |
99 | pt[1].y = y + (dirn == UP ? 0 : sz - 1); |
99 | pt[1].y = y + (dirn == UP ? 0 : sz - 1); |
100 | XDrawLine (term->xdisp, term->scrollBar.win, top, |
100 | XDrawLine (term->dpy, term->scrollBar.win, top, |
101 | pt[0].x, pt[0].y, pt[1].x, pt[1].y); |
101 | pt[0].x, pt[0].y, pt[1].x, pt[1].y); |
102 | |
102 | |
103 | #if SHADOW_WIDTH > 1 |
103 | #if SHADOW_WIDTH > 1 |
104 | /* doubled */ |
104 | /* doubled */ |
105 | pt[0].x++; |
105 | pt[0].x++; |
… | |
… | |
113 | { |
113 | { |
114 | pt[0].y++; |
114 | pt[0].y++; |
115 | pt[1].y--; |
115 | pt[1].y--; |
116 | } |
116 | } |
117 | |
117 | |
118 | XDrawLine (term->xdisp, term->scrollBar.win, top, |
118 | XDrawLine (term->dpy, term->scrollBar.win, top, |
119 | pt[0].x, pt[0].y, pt[1].x, pt[1].y); |
119 | pt[0].x, pt[0].y, pt[1].x, pt[1].y); |
120 | #endif |
120 | #endif |
121 | |
121 | |
122 | /* draw shadow on right */ |
122 | /* draw shadow on right */ |
123 | pt[1].x = x + sz - 1; |
123 | pt[1].x = x + sz - 1; |
124 | /* pt[2].x = x + sz2; */ |
124 | /* pt[2].x = x + sz2; */ |
125 | pt[1].y = y + (dirn == UP ? sz - 1 : 0); |
125 | pt[1].y = y + (dirn == UP ? sz - 1 : 0); |
126 | pt[2].y = y + (dirn == UP ? 0 : sz - 1); |
126 | pt[2].y = y + (dirn == UP ? 0 : sz - 1); |
127 | XDrawLine (term->xdisp, term->scrollBar.win, bot, |
127 | XDrawLine (term->dpy, term->scrollBar.win, bot, |
128 | pt[2].x, pt[2].y, pt[1].x, pt[1].y); |
128 | pt[2].x, pt[2].y, pt[1].x, pt[1].y); |
129 | |
129 | |
130 | #if SHADOW_WIDTH > 1 |
130 | #if SHADOW_WIDTH > 1 |
131 | /* doubled */ |
131 | /* doubled */ |
132 | pt[1].x--; |
132 | pt[1].x--; |
… | |
… | |
139 | { |
139 | { |
140 | pt[2].y--; |
140 | pt[2].y--; |
141 | pt[1].y++; |
141 | pt[1].y++; |
142 | } |
142 | } |
143 | |
143 | |
144 | XDrawLine (term->xdisp, term->scrollBar.win, bot, |
144 | XDrawLine (term->dpy, term->scrollBar.win, bot, |
145 | pt[2].x, pt[2].y, pt[1].x, pt[1].y); |
145 | pt[2].x, pt[2].y, pt[1].x, pt[1].y); |
146 | #endif |
146 | #endif |
147 | } |
147 | } |
148 | |
148 | |
149 | int |
149 | int |
… | |
… | |
156 | { |
156 | { |
157 | scrollBar.init |= R_SB_RXVT; |
157 | scrollBar.init |= R_SB_RXVT; |
158 | |
158 | |
159 | if (sbshadow) |
159 | if (sbshadow) |
160 | { |
160 | { |
161 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors_focused[Color_trough]); |
161 | XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]); |
162 | XClearWindow (xdisp, scrollBar.win); |
162 | XClearWindow (dpy, scrollBar.win); |
163 | } |
163 | } |
164 | } |
164 | } |
165 | else |
165 | else |
166 | { |
166 | { |
167 | if (update) |
167 | if (update) |
168 | { |
168 | { |
169 | if (last_top < scrollBar.top) |
169 | if (last_top < scrollBar.top) |
170 | XClearArea (xdisp, scrollBar.win, |
170 | XClearArea (dpy, scrollBar.win, |
171 | sbshadow, last_top, |
171 | sbshadow, last_top, |
172 | sbwidth, (scrollBar.top - last_top), |
172 | sbwidth, (scrollBar.top - last_top), |
173 | False); |
173 | False); |
174 | |
174 | |
175 | if (scrollBar.bot < last_bot) |
175 | if (scrollBar.bot < last_bot) |
176 | XClearArea (xdisp, scrollBar.win, |
176 | XClearArea (dpy, scrollBar.win, |
177 | sbshadow, scrollBar.bot, |
177 | sbshadow, scrollBar.bot, |
178 | sbwidth, (last_bot - scrollBar.bot), |
178 | sbwidth, (last_bot - scrollBar.bot), |
179 | False); |
179 | False); |
180 | } |
180 | } |
181 | else |
181 | else |
182 | XClearWindow (xdisp, scrollBar.win); |
182 | XClearWindow (dpy, scrollBar.win); |
183 | } |
183 | } |
184 | |
184 | |
185 | /* scrollbar slider */ |
185 | /* scrollbar slider */ |
186 | #ifdef SB_BORDER |
186 | #ifdef SB_BORDER |
187 | { |
187 | { |
… | |
… | |
190 | if (OPTION (Opt_scrollBar_right)) |
190 | if (OPTION (Opt_scrollBar_right)) |
191 | xofs = 0; |
191 | xofs = 0; |
192 | else |
192 | else |
193 | xofs = sbshadow ? sbwidth : sbwidth - 1; |
193 | xofs = sbshadow ? sbwidth : sbwidth - 1; |
194 | |
194 | |
195 | XDrawLine (xdisp, scrollBar.win, botShadowGC, |
195 | XDrawLine (dpy, scrollBar.win, botShadowGC, |
196 | xofs, 0, xofs, scrollBar.end + sbwidth); |
196 | xofs, 0, xofs, scrollBar.end + sbwidth); |
197 | } |
197 | } |
198 | #endif |
198 | #endif |
199 | |
199 | |
200 | XFillRectangle (xdisp, scrollBar.win, scrollbarGC, |
200 | XFillRectangle (dpy, scrollBar.win, scrollbarGC, |
201 | sbshadow, scrollBar.top, sbwidth, |
201 | sbshadow, scrollBar.top, sbwidth, |
202 | scrollbar_len); |
202 | scrollbar_len); |
203 | |
203 | |
204 | if (sbshadow) |
204 | if (sbshadow) |
205 | /* trough shadow */ |
205 | /* trough shadow */ |