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.22 by root, Mon Jan 16 17:11:12 2006 UTC vs.
Revision 1.23 by root, Mon Jan 16 18:09:28 2006 UTC

… …
28#if defined(RXVT_SCROLLBAR) 28#if defined(RXVT_SCROLLBAR)
29 29
30#define SHADOW_WIDTH 1 30#define SHADOW_WIDTH 1
31 31
32static void 32static void
33rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 33draw_shadow (rxvt_term *term, int x, int y, int w, int h)
34{ 34{
35 int shadow; 35 int shadow;
36 36
37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH; 37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
38 w += x - 1; 38 w += x - 1;
39 h += y - 1; 39 h += y - 1;
40 for (; shadow-- > 0; x++, y++, w--, h--) 40 for (; shadow-- > 0; x++, y++, w--, h--)
41 { 41 {
42 XDrawLine (display, win, topShadow, x, y, w, y); 42 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y);
43 XDrawLine (display, win, topShadow, x, y, x, h); 43 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h);
44 XDrawLine (display, win, botShadow, w, h, w, y + 1); 44 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1);
45 XDrawLine (display, win, botShadow, w, h, x + 1, h); 45 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h);
46 } 46 }
47} 47}
48 48
49/* draw triangular button with a shadow of 2 pixels */ 49/* draw triangular button with a shadow of 2 pixels */
50void 50static void
51rxvt_term::Draw_button (int x, int y, int state, int dirn) 51draw_button (rxvt_term *term, int x, int y, int state, int dirn)
52{ 52{
53 unsigned int sz, sz2; 53 unsigned int sz, sz2;
54 XPoint pt[3]; 54 XPoint pt[3];
55 GC top, bot; 55 GC top, bot;
56 56
57 sz = scrollBar.width; 57 sz = term->scrollBar.width;
58 sz2 = sz / 2; 58 sz2 = sz / 2;
59 switch (state) 59 switch (state)
60 { 60 {
61 case +1: 61 case +1:
62 top = topShadowGC; 62 top = term->topShadowGC;
63 bot = botShadowGC; 63 bot = term->botShadowGC;
64 break; 64 break;
65 case -1: 65 case -1:
66 top = botShadowGC; 66 top = term->botShadowGC;
67 bot = topShadowGC; 67 bot = term->topShadowGC;
68 break; 68 break;
69 default: 69 default:
70 top = bot = scrollbarGC; 70 top = bot = term->scrollbarGC;
71 break; 71 break;
72 } 72 }
73 73
74 /* fill triangle */ 74 /* fill triangle */
75 pt[0].x = x; 75 pt[0].x = x;
… …
84 { 84 {
85 pt[0].y = pt[1].y = y; 85 pt[0].y = pt[1].y = y;
86 pt[2].y = y + sz - 1; 86 pt[2].y = y + sz - 1;
87 } 87 }
88 88
89 XFillPolygon (display->display, scrollBar.win, scrollbarGC, 89 XFillPolygon (term->display->display, term->scrollBar.win, term->scrollbarGC,
90 pt, 3, Convex, CoordModeOrigin); 90 pt, 3, Convex, CoordModeOrigin);
91 91
92 /* draw base */ 92 /* draw base */
93 XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top), 93 XDrawLine (term->display->display, term->scrollBar.win, (dirn == UP ? bot : top),
94 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 94 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
95 95
96 /* draw shadow on left */ 96 /* draw shadow on left */
97 pt[1].x = x + sz2 - 1; 97 pt[1].x = x + sz2 - 1;
98 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 98 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
99 XDrawLine (display->display, scrollBar.win, top, 99 XDrawLine (term->display->display, term->scrollBar.win, top,
100 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 100 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
101 101
102#if SHADOW_WIDTH > 1 102#if SHADOW_WIDTH > 1
103 /* doubled */ 103 /* doubled */
104 pt[0].x++; 104 pt[0].x++;
… …
112 { 112 {
113 pt[0].y++; 113 pt[0].y++;
114 pt[1].y--; 114 pt[1].y--;
115 } 115 }
116 116
117 XDrawLine (display->display, scrollBar.win, top, 117 XDrawLine (term->display->display, term->scrollBar.win, top,
118 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 118 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
119#endif 119#endif
120 120
121 /* draw shadow on right */ 121 /* draw shadow on right */
122 pt[1].x = x + sz - 1; 122 pt[1].x = x + sz - 1;
123 /* pt[2].x = x + sz2; */ 123 /* pt[2].x = x + sz2; */
124 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 124 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
125 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 125 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
126 XDrawLine (display->display, scrollBar.win, bot, 126 XDrawLine (term->display->display, term->scrollBar.win, bot,
127 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 127 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
128 128
129#if SHADOW_WIDTH > 1 129#if SHADOW_WIDTH > 1
130 /* doubled */ 130 /* doubled */
131 pt[1].x--; 131 pt[1].x--;
… …
138 { 138 {
139 pt[2].y--; 139 pt[2].y--;
140 pt[1].y++; 140 pt[1].y++;
141 } 141 }
142 142
143 XDrawLine (display->display, scrollBar.win, bot, 143 XDrawLine (term->display->display, term->scrollBar.win, bot,
144 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 144 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
145#endif 145#endif
146} 146}
147 147
148int 148int
… …
200 sbshadow, scrollBar.top, sbwidth, 200 sbshadow, scrollBar.top, sbwidth,
201 scrollbar_len); 201 scrollbar_len);
202 202
203 if (sbshadow) 203 if (sbshadow)
204 /* trough shadow */ 204 /* trough shadow */
205 rxvt_Draw_Shadow (display->display, scrollBar.win, 205 draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow);
206 botShadowGC, topShadowGC,
207 0, 0,
208 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
209 scrollBar.end + (sbwidth + 1) + sbshadow);
210 206
211 /* shadow for scrollbar slider */ 207 /* shadow for scrollbar slider */
212 rxvt_Draw_Shadow (display->display, scrollBar.win, 208 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
213 topShadowGC, botShadowGC,
214 sbshadow, scrollBar.top, sbwidth,
215 scrollbar_len);
216 209
217 /* Redraw scrollbar arrows */ 210 /* Redraw scrollbar arrows */
218 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 211 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
219 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 212 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
220 213
221 return 1; 214 return 1;
222} 215}
223#endif /* RXVT_SCROLLBAR */ 216#endif /* RXVT_SCROLLBAR */
224/*----------------------- end-of-file (C source) -----------------------*/ 217/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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