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.24 by root, Mon Jan 16 18:10:07 2006 UTC

… …
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
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
40 for (; shadow-- > 0; x++, y++, w--, h--) 41 for (; shadow-- > 0; x++, y++, w--, h--)
41 { 42 {
42 XDrawLine (display, win, topShadow, x, y, w, y); 43 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y);
43 XDrawLine (display, win, topShadow, x, y, x, h); 44 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h);
44 XDrawLine (display, win, botShadow, w, h, w, y + 1); 45 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1);
45 XDrawLine (display, win, botShadow, w, h, x + 1, h); 46 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h);
46 } 47 }
47} 48}
48 49
49/* draw triangular button with a shadow of 2 pixels */ 50/* draw triangular button with a shadow of 2 pixels */
50void 51static void
51rxvt_term::Draw_button (int x, int y, int state, int dirn) 52draw_button (rxvt_term *term, int x, int y, int state, int dirn)
52{ 53{
53 unsigned int sz, sz2; 54 unsigned int sz, sz2;
54 XPoint pt[3]; 55 XPoint pt[3];
55 GC top, bot; 56 GC top, bot;
56 57
57 sz = scrollBar.width; 58 sz = term->scrollBar.width;
58 sz2 = sz / 2; 59 sz2 = sz / 2;
59 switch (state) 60 switch (state)
60 { 61 {
61 case +1: 62 case +1:
62 top = topShadowGC; 63 top = term->topShadowGC;
63 bot = botShadowGC; 64 bot = term->botShadowGC;
64 break; 65 break;
65 case -1: 66 case -1:
66 top = botShadowGC; 67 top = term->botShadowGC;
67 bot = topShadowGC; 68 bot = term->topShadowGC;
68 break; 69 break;
69 default: 70 default:
70 top = bot = scrollbarGC; 71 top = bot = term->scrollbarGC;
71 break; 72 break;
72 } 73 }
73 74
74 /* fill triangle */ 75 /* fill triangle */
75 pt[0].x = x; 76 pt[0].x = x;
… …
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 (display->display, scrollBar.win, scrollbarGC, 90 XFillPolygon (term->display->display, 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 (display->display, scrollBar.win, (dirn == UP ? bot : top), 94 XDrawLine (term->display->display, 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 (display->display, scrollBar.win, top, 100 XDrawLine (term->display->display, 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 (display->display, scrollBar.win, top, 118 XDrawLine (term->display->display, 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 (display->display, scrollBar.win, bot, 127 XDrawLine (term->display->display, 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 (display->display, scrollBar.win, bot, 144 XDrawLine (term->display->display, 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
… …
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 */
205 rxvt_Draw_Shadow (display->display, scrollBar.win, 206 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 207
211 /* shadow for scrollbar slider */ 208 /* shadow for scrollbar slider */
212 rxvt_Draw_Shadow (display->display, scrollBar.win, 209 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
213 topShadowGC, botShadowGC,
214 sbshadow, scrollBar.top, sbwidth,
215 scrollbar_len);
216 210
217 /* Redraw scrollbar arrows */ 211 /* Redraw scrollbar arrows */
218 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 212 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
219 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 213 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
220 214
221 return 1; 215 return 1;
222} 216}
223#endif /* RXVT_SCROLLBAR */ 217#endif /* RXVT_SCROLLBAR */
224/*----------------------- end-of-file (C source) -----------------------*/ 218/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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