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

Diff Legend

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