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.23 by root, Mon Jan 16 18:09:28 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 SHADOW_WIDTH 1
31
32static void 30static void
33draw_shadow (rxvt_term *term, int x, int y, int w, int h) 31draw_shadow (rxvt_term *term, int x, int y, int w, int h)
34{ 32{
35 int shadow; 33 int shadow;
36 34
37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH; 35 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
38 w += x - 1; 36 w += x - 1;
39 h += y - 1; 37 h += y - 1;
38
40 for (; shadow-- > 0; x++, y++, w--, h--) 39 for (; shadow-- > 0; x++, y++, w--, h--)
41 { 40 {
42 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y); 41 XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, w , y );
43 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h); 42 XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, x , h );
44 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1); 43 XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1);
45 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h); 44 XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h );
46 } 45 }
47} 46}
48 47
49/* draw triangular button with a shadow of 2 pixels */ 48/* draw triangular button with a shadow of 2 pixels */
50static void 49static void
51draw_button (rxvt_term *term, int x, int y, int state, int dirn) 50draw_button (rxvt_term *term, int x, int y, int state, int dirn)
52{ 51{
… …
54 XPoint pt[3]; 53 XPoint pt[3];
55 GC top, bot; 54 GC top, bot;
56 55
57 sz = term->scrollBar.width; 56 sz = term->scrollBar.width;
58 sz2 = sz / 2; 57 sz2 = sz / 2;
58
59 switch (state) 59 switch (state)
60 { 60 {
61 case +1: 61 case +1:
62 top = term->topShadowGC; 62 top = term->topShadowGC;
63 bot = term->botShadowGC; 63 bot = term->botShadowGC;
… …
73 73
74 /* fill triangle */ 74 /* fill triangle */
75 pt[0].x = x; 75 pt[0].x = x;
76 pt[1].x = x + sz - 1; 76 pt[1].x = x + sz - 1;
77 pt[2].x = x + sz2; 77 pt[2].x = x + sz2;
78
78 if (dirn == UP) 79 if (dirn == UP)
79 { 80 {
80 pt[0].y = pt[1].y = y + sz - 1; 81 pt[0].y = pt[1].y = y + sz - 1;
81 pt[2].y = y; 82 pt[2].y = y;
82 } 83 }
… …
84 { 85 {
85 pt[0].y = pt[1].y = y; 86 pt[0].y = pt[1].y = y;
86 pt[2].y = y + sz - 1; 87 pt[2].y = y + sz - 1;
87 } 88 }
88 89
89 XFillPolygon (term->display->display, term->scrollBar.win, term->scrollbarGC, 90 XFillPolygon (term->xdisp, term->scrollBar.win, term->scrollbarGC,
90 pt, 3, Convex, CoordModeOrigin); 91 pt, 3, Convex, CoordModeOrigin);
91 92
92 /* draw base */ 93 /* draw base */
93 XDrawLine (term->display->display, term->scrollBar.win, (dirn == UP ? bot : top), 94 XDrawLine (term->xdisp, term->scrollBar.win, (dirn == UP ? bot : top),
94 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);
95 96
96 /* draw shadow on left */ 97 /* draw shadow on left */
97 pt[1].x = x + sz2 - 1; 98 pt[1].x = x + sz2 - 1;
98 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 99 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
99 XDrawLine (term->display->display, term->scrollBar.win, top, 100 XDrawLine (term->xdisp, term->scrollBar.win, top,
100 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);
101 102
102#if SHADOW_WIDTH > 1 103#if SHADOW_WIDTH > 1
103 /* doubled */ 104 /* doubled */
104 pt[0].x++; 105 pt[0].x++;
… …
112 { 113 {
113 pt[0].y++; 114 pt[0].y++;
114 pt[1].y--; 115 pt[1].y--;
115 } 116 }
116 117
117 XDrawLine (term->display->display, term->scrollBar.win, top, 118 XDrawLine (term->xdisp, term->scrollBar.win, top,
118 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);
119#endif 120#endif
120 121
121 /* draw shadow on right */ 122 /* draw shadow on right */
122 pt[1].x = x + sz - 1; 123 pt[1].x = x + sz - 1;
123 /* pt[2].x = x + sz2; */ 124 /* pt[2].x = x + sz2; */
124 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 125 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
125 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 126 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
126 XDrawLine (term->display->display, term->scrollBar.win, bot, 127 XDrawLine (term->xdisp, term->scrollBar.win, bot,
127 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);
128 129
129#if SHADOW_WIDTH > 1 130#if SHADOW_WIDTH > 1
130 /* doubled */ 131 /* doubled */
131 pt[1].x--; 132 pt[1].x--;
… …
138 { 139 {
139 pt[2].y--; 140 pt[2].y--;
140 pt[1].y++; 141 pt[1].y++;
141 } 142 }
142 143
143 XDrawLine (term->display->display, term->scrollBar.win, bot, 144 XDrawLine (term->xdisp, term->scrollBar.win, bot,
144 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);
145#endif 146#endif
146} 147}
147 148
148int 149int
… …
155 { 156 {
156 scrollBar.init |= R_SB_RXVT; 157 scrollBar.init |= R_SB_RXVT;
157 158
158 if (sbshadow) 159 if (sbshadow)
159 { 160 {
160 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]); 161 XSetWindowBackground (xdisp, scrollBar.win, pix_colors_focused[Color_trough]);
161 XClearWindow (display->display, scrollBar.win); 162 XClearWindow (xdisp, scrollBar.win);
162 } 163 }
163 } 164 }
164 else 165 else
165 { 166 {
166 if (update) 167 if (update)
167 { 168 {
168 if (last_top < scrollBar.top) 169 if (last_top < scrollBar.top)
169 XClearArea (display->display, scrollBar.win, 170 XClearArea (xdisp, scrollBar.win,
170 sbshadow, last_top, 171 sbshadow, last_top,
171 sbwidth, (scrollBar.top - last_top), 172 sbwidth, (scrollBar.top - last_top),
172 False); 173 False);
173 174
174 if (scrollBar.bot < last_bot) 175 if (scrollBar.bot < last_bot)
175 XClearArea (display->display, scrollBar.win, 176 XClearArea (xdisp, scrollBar.win,
176 sbshadow, scrollBar.bot, 177 sbshadow, scrollBar.bot,
177 sbwidth, (last_bot - scrollBar.bot), 178 sbwidth, (last_bot - scrollBar.bot),
178 False); 179 False);
179 } 180 }
180 else 181 else
181 XClearWindow (display->display, scrollBar.win); 182 XClearWindow (xdisp, scrollBar.win);
182 } 183 }
183 184
184 /* scrollbar slider */ 185 /* scrollbar slider */
185#ifdef SB_BORDER 186#ifdef SB_BORDER
186 { 187 {
… …
189 if (OPTION (Opt_scrollBar_right)) 190 if (OPTION (Opt_scrollBar_right))
190 xofs = 0; 191 xofs = 0;
191 else 192 else
192 xofs = sbshadow ? sbwidth : sbwidth - 1; 193 xofs = sbshadow ? sbwidth : sbwidth - 1;
193 194
194 XDrawLine (display->display, scrollBar.win, botShadowGC, 195 XDrawLine (xdisp, scrollBar.win, botShadowGC,
195 xofs, 0, xofs, scrollBar.end + sbwidth); 196 xofs, 0, xofs, scrollBar.end + sbwidth);
196 } 197 }
197#endif 198#endif
198 199
199 XFillRectangle (display->display, scrollBar.win, scrollbarGC, 200 XFillRectangle (xdisp, scrollBar.win, scrollbarGC,
200 sbshadow, scrollBar.top, sbwidth, 201 sbshadow, scrollBar.top, sbwidth,
201 scrollbar_len); 202 scrollbar_len);
202 203
203 if (sbshadow) 204 if (sbshadow)
204 /* trough shadow */ 205 /* trough shadow */

Diff Legend

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