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.21 by root, Mon Jan 16 15:12:48 2006 UTC vs.
Revision 1.26 by root, Tue Jan 31 20:07:18 2006 UTC

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

Diff Legend

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