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.36 by ayin, Tue Feb 19 10:46:03 2008 UTC vs.
Revision 1.37 by ayin, Tue Feb 19 13:01:33 2008 UTC

… …
26 26
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
28#if defined(RXVT_SCROLLBAR) 28#if defined(RXVT_SCROLLBAR)
29 29
30static void 30static void
31draw_shadow (rxvt_term *term, int x, int y, int w, int h) 31draw_shadow (scrollBar_t *sb, int x, int y, int w, int h)
32{ 32{
33 int shadow; 33 int shadow;
34 Drawable d = sb->win;
35 Display *dpy = sb->term->dpy;
34 36
35 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH; 37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
36 w += x - 1; 38 w += x - 1;
37 h += y - 1; 39 h += y - 1;
38 40
39 for (; shadow-- > 0; x++, y++, w--, h--) 41 for (; shadow-- > 0; x++, y++, w--, h--)
40 { 42 {
41 XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w , y ); 43 XDrawLine (dpy, d, sb->topShadowGC, x, y, w , y );
42 XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x , h ); 44 XDrawLine (dpy, d, sb->topShadowGC, x, y, x , h );
43 XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1); 45 XDrawLine (dpy, d, sb->botShadowGC, w, h, w , y + 1);
44 XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h ); 46 XDrawLine (dpy, d, sb->botShadowGC, w, h, x + 1, h );
45 } 47 }
46} 48}
47 49
48/* draw triangular button with a shadow of 2 pixels */ 50/* draw triangular button with a shadow of 2 pixels */
49static void 51static void
50draw_button (rxvt_term *term, int x, int y, int dirn) 52draw_button (scrollBar_t *sb, int x, int y, int dirn)
51{ 53{
52 unsigned int sz, sz2; 54 unsigned int sz, sz2;
53 XPoint pt[3]; 55 XPoint pt[3];
54 GC top, bot; 56 GC top, bot;
57 Drawable d = sb->win;
58 Display *dpy = sb->term->dpy;
55 59
56 sz = term->scrollBar.width; 60 sz = sb->width;
57 sz2 = sz / 2; 61 sz2 = sz / 2;
58 62
59 if ((dirn == UP && term->scrollBar.state == STATE_UP) 63 if ((dirn == UP && sb->state == STATE_UP)
60 || (dirn == DN && term->scrollBar.state == STATE_DOWN)) 64 || (dirn == DN && sb->state == STATE_DOWN))
61 { 65 {
62 top = term->botShadowGC; 66 top = sb->botShadowGC;
63 bot = term->topShadowGC; 67 bot = sb->topShadowGC;
64 }
65 else
66 { 68 }
69 else
70 {
67 top = term->topShadowGC; 71 top = sb->topShadowGC;
68 bot = term->botShadowGC; 72 bot = sb->botShadowGC;
69 } 73 }
70 74
71 /* fill triangle */ 75 /* fill triangle */
72 pt[0].x = x; 76 pt[0].x = x;
73 pt[1].x = x + sz - 1; 77 pt[1].x = x + sz - 1;
… …
82 { 86 {
83 pt[0].y = pt[1].y = y; 87 pt[0].y = pt[1].y = y;
84 pt[2].y = y + sz - 1; 88 pt[2].y = y + sz - 1;
85 } 89 }
86 90
87 XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC, 91 XFillPolygon (dpy, d, sb->scrollbarGC,
88 pt, 3, Convex, CoordModeOrigin); 92 pt, 3, Convex, CoordModeOrigin);
89 93
90 /* draw base */ 94 /* draw base */
91 XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top), 95 XDrawLine (dpy, d, (dirn == UP ? bot : top),
92 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 96 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
93 97
94 /* draw shadow on left */ 98 /* draw shadow on left */
95 pt[1].x = x + sz2 - 1; 99 pt[1].x = x + sz2 - 1;
96 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 100 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
97 XDrawLine (term->dpy, term->scrollBar.win, top, 101 XDrawLine (dpy, d, top,
98 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 102 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
99 103
100#if SHADOW_WIDTH > 1 104#if SHADOW_WIDTH > 1
101 /* doubled */ 105 /* doubled */
102 pt[0].x++; 106 pt[0].x++;
… …
110 { 114 {
111 pt[0].y++; 115 pt[0].y++;
112 pt[1].y--; 116 pt[1].y--;
113 } 117 }
114 118
115 XDrawLine (term->dpy, term->scrollBar.win, top, 119 XDrawLine (dpy, d, top,
116 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 120 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
117#endif 121#endif
118 122
119 /* draw shadow on right */ 123 /* draw shadow on right */
120 pt[1].x = x + sz - 1; 124 pt[1].x = x + sz - 1;
121 /* pt[2].x = x + sz2; */ 125 /* pt[2].x = x + sz2; */
122 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 126 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
123 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 127 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
124 XDrawLine (term->dpy, term->scrollBar.win, bot, 128 XDrawLine (dpy, d, bot,
125 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 129 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
126 130
127#if SHADOW_WIDTH > 1 131#if SHADOW_WIDTH > 1
128 /* doubled */ 132 /* doubled */
129 pt[1].x--; 133 pt[1].x--;
… …
136 { 140 {
137 pt[2].y--; 141 pt[2].y--;
138 pt[1].y++; 142 pt[1].y++;
139 } 143 }
140 144
141 XDrawLine (term->dpy, term->scrollBar.win, bot, 145 XDrawLine (dpy, d, bot,
142 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 146 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
143#endif 147#endif
144} 148}
145 149
146int 150int
147rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len) 151scrollBar_t::show_rxvt (int update)
148{ 152{
149 int sbshadow = scrollBar.shadow; 153 int sbshadow = shadow;
150 int sbwidth = (int)scrollBar.width; 154 int sbwidth = (int)width;
151 155
152 if ((scrollBar.init & R_SB_RXVT) == 0) 156 if ((init & R_SB_RXVT) == 0)
153 { 157 {
154 XGCValues gcvalue; 158 XGCValues gcvalue;
155 159
156 scrollBar.init |= R_SB_RXVT; 160 init |= R_SB_RXVT;
157 161
158 gcvalue.foreground = pix_colors[Color_topShadow]; 162 gcvalue.foreground = term->pix_colors[Color_topShadow];
159 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); 163 topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
160 gcvalue.foreground = pix_colors[Color_bottomShadow]; 164 gcvalue.foreground = term->pix_colors[Color_bottomShadow];
161 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); 165 botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
162 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 166 gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)];
163 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); 167 scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
164 if (sbshadow) 168 if (sbshadow)
165 { 169 {
166 XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]); 170 XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
167 XClearWindow (dpy, scrollBar.win); 171 XClearWindow (term->dpy, win);
168 } 172 }
169 } 173 }
170 else 174 else
171 { 175 {
172 if (update) 176 if (update)
173 { 177 {
174 if (last_top < scrollBar.top) 178 if (last_top < top)
175 XClearArea (dpy, scrollBar.win, 179 XClearArea (term->dpy, win,
176 sbshadow, last_top, 180 sbshadow, last_top,
177 sbwidth, (scrollBar.top - last_top), 181 sbwidth, (top - last_top),
178 False); 182 False);
179 183
180 if (scrollBar.bot < last_bot) 184 if (bot < last_bot)
181 XClearArea (dpy, scrollBar.win, 185 XClearArea (term->dpy, win,
182 sbshadow, scrollBar.bot, 186 sbshadow, bot,
183 sbwidth, (last_bot - scrollBar.bot), 187 sbwidth, (last_bot - bot),
184 False); 188 False);
185 } 189 }
186 else 190 else
187 XClearWindow (dpy, scrollBar.win); 191 XClearWindow (term->dpy, win);
188 } 192 }
189 193
190 /* scrollbar slider */ 194 /* scrollbar slider */
191#ifdef SB_BORDER 195#ifdef SB_BORDER
192 { 196 {
193 int xofs; 197 int xofs;
194 198
195 if (option (Opt_scrollBar_right)) 199 if (term->option (Opt_scrollBar_right))
196 xofs = 0; 200 xofs = 0;
197 else 201 else
198 xofs = sbshadow ? sbwidth : sbwidth - 1; 202 xofs = sbshadow ? sbwidth : sbwidth - 1;
199 203
200 XDrawLine (dpy, scrollBar.win, botShadowGC, 204 XDrawLine (term->dpy, win, botShadowGC,
201 xofs, 0, xofs, scrollBar.end + sbwidth); 205 xofs, 0, xofs, end + sbwidth);
202 } 206 }
203#endif 207#endif
204 208
205 XFillRectangle (dpy, scrollBar.win, scrollbarGC, 209 XFillRectangle (term->dpy, win, scrollbarGC,
206 sbshadow, scrollBar.top, sbwidth, 210 sbshadow, top, sbwidth,
207 scrollbar_len); 211 len);
208 212
209 if (sbshadow) 213 if (sbshadow)
210 /* trough shadow */ 214 /* trough shadow */
211 draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow); 215 draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, end + (sbwidth + 1) + sbshadow);
212 216
213 /* shadow for scrollbar slider */ 217 /* shadow for scrollbar slider */
214 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len); 218 draw_shadow (this, sbshadow, top, sbwidth, len);
215 219
216 /* Redraw scrollbar arrows */ 220 /* Redraw scrollbar arrows */
217 draw_button (this, sbshadow, sbshadow, UP); 221 draw_button (this, sbshadow, sbshadow, UP);
218 draw_button (this, sbshadow, scrollBar.end + 1, DN); 222 draw_button (this, sbshadow, end + 1, DN);
219 223
220 return 1; 224 return 1;
221} 225}
222#endif /* RXVT_SCROLLBAR */ 226#endif /* RXVT_SCROLLBAR */
223/*----------------------- end-of-file (C source) -----------------------*/ 227/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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