ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar-rxvt.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents):
Revision 1.26 by root, Tue Jan 31 20:07:18 2006 UTC vs.
Revision 1.35 by ayin, Wed Feb 6 01:29:19 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar-rxvt.C 2 * File: scrollbar-rxvt.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
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 */
49static void 49static 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
149int 149int
150rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len) 150rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
151{ 151{
152 int sbshadow = sb_shadow; 152 int sbshadow = scrollBar.shadow;
153 int sbwidth = (int)scrollBar.width; 153 int sbwidth = (int)scrollBar.width;
154 int state;
154 155
155 if ((scrollBar.init & R_SB_RXVT) == 0) 156 if ((scrollBar.init & R_SB_RXVT) == 0)
156 { 157 {
158 XGCValues gcvalue;
159
157 scrollBar.init |= R_SB_RXVT; 160 scrollBar.init |= R_SB_RXVT;
158 161
162 gcvalue.foreground = pix_colors[Color_topShadow];
163 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
164 gcvalue.foreground = pix_colors[Color_bottomShadow];
165 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
166 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
167 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
159 if (sbshadow) 168 if (sbshadow)
160 { 169 {
161 XSetWindowBackground (xdisp, scrollBar.win, pix_colors_focused[Color_trough]); 170 XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]);
162 XClearWindow (xdisp, scrollBar.win); 171 XClearWindow (dpy, scrollBar.win);
163 } 172 }
164 } 173 }
165 else 174 else
166 { 175 {
167 if (update) 176 if (update)
168 { 177 {
169 if (last_top < scrollBar.top) 178 if (last_top < scrollBar.top)
170 XClearArea (xdisp, scrollBar.win, 179 XClearArea (dpy, scrollBar.win,
171 sbshadow, last_top, 180 sbshadow, last_top,
172 sbwidth, (scrollBar.top - last_top), 181 sbwidth, (scrollBar.top - last_top),
173 False); 182 False);
174 183
175 if (scrollBar.bot < last_bot) 184 if (scrollBar.bot < last_bot)
176 XClearArea (xdisp, scrollBar.win, 185 XClearArea (dpy, scrollBar.win,
177 sbshadow, scrollBar.bot, 186 sbshadow, scrollBar.bot,
178 sbwidth, (last_bot - scrollBar.bot), 187 sbwidth, (last_bot - scrollBar.bot),
179 False); 188 False);
180 } 189 }
181 else 190 else
182 XClearWindow (xdisp, scrollBar.win); 191 XClearWindow (dpy, scrollBar.win);
183 } 192 }
184 193
185 /* scrollbar slider */ 194 /* scrollbar slider */
186#ifdef SB_BORDER 195#ifdef SB_BORDER
187 { 196 {
188 int xofs; 197 int xofs;
189 198
190 if (OPTION (Opt_scrollBar_right)) 199 if (option (Opt_scrollBar_right))
191 xofs = 0; 200 xofs = 0;
192 else 201 else
193 xofs = sbshadow ? sbwidth : sbwidth - 1; 202 xofs = sbshadow ? sbwidth : sbwidth - 1;
194 203
195 XDrawLine (xdisp, scrollBar.win, botShadowGC, 204 XDrawLine (dpy, scrollBar.win, botShadowGC,
196 xofs, 0, xofs, scrollBar.end + sbwidth); 205 xofs, 0, xofs, scrollBar.end + sbwidth);
197 } 206 }
198#endif 207#endif
199 208
200 XFillRectangle (xdisp, scrollBar.win, scrollbarGC, 209 XFillRectangle (dpy, scrollBar.win, scrollbarGC,
201 sbshadow, scrollBar.top, sbwidth, 210 sbshadow, scrollBar.top, sbwidth,
202 scrollbar_len); 211 scrollbar_len);
203 212
204 if (sbshadow) 213 if (sbshadow)
205 /* trough shadow */ 214 /* trough shadow */
… …
207 216
208 /* shadow for scrollbar slider */ 217 /* shadow for scrollbar slider */
209 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len); 218 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
210 219
211 /* Redraw scrollbar arrows */ 220 /* Redraw scrollbar arrows */
221 state = scrollBar.state == STATE_UP ? -1 : +1;
212 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 222 draw_button (this, sbshadow, sbshadow, state, UP);
223 state = scrollBar.state == STATE_DOWN ? -1 : +1;
213 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 224 draw_button (this, sbshadow, scrollBar.end + 1, state, DN);
214 225
215 return 1; 226 return 1;
216} 227}
217#endif /* RXVT_SCROLLBAR */ 228#endif /* RXVT_SCROLLBAR */
218/*----------------------- end-of-file (C source) -----------------------*/ 229/*----------------------- end-of-file (C source) -----------------------*/
219 230

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines