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.23 by root, Mon Jan 16 18:09:28 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 30#define SHADOW_WIDTH 1
31
32static void
33draw_shadow (rxvt_term *term, int x, int y, int w, int h)
34{
35 int shadow;
36
37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
38 w += x - 1;
39 h += y - 1;
40 for (; shadow-- > 0; x++, y++, w--, h--)
41 {
42 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y);
43 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h);
44 XDrawLine (term->display->display, 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);
46 }
47}
31 48
32/* draw triangular button with a shadow of 2 pixels */ 49/* draw triangular button with a shadow of 2 pixels */
33void 50static void
34rxvt_term::Draw_button (int x, int y, int state, int dirn) 51draw_button (rxvt_term *term, int x, int y, int state, int dirn)
35{ 52{
36 unsigned int sz, sz2; 53 unsigned int sz, sz2;
37 XPoint pt[3]; 54 XPoint pt[3];
38 GC top, bot; 55 GC top, bot;
39 56
40 sz = scrollBar.width; 57 sz = term->scrollBar.width;
41 sz2 = sz / 2; 58 sz2 = sz / 2;
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;
… …
67 { 84 {
68 pt[0].y = pt[1].y = y; 85 pt[0].y = pt[1].y = y;
69 pt[2].y = y + sz - 1; 86 pt[2].y = y + sz - 1;
70 } 87 }
71 88
72 XFillPolygon (display->display, scrollBar.win, scrollbarGC, 89 XFillPolygon (term->display->display, term->scrollBar.win, term->scrollbarGC,
73 pt, 3, Convex, CoordModeOrigin); 90 pt, 3, Convex, CoordModeOrigin);
74 91
75 /* draw base */ 92 /* draw base */
76 XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top), 93 XDrawLine (term->display->display, term->scrollBar.win, (dirn == UP ? bot : top),
77 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);
78 95
79 /* draw shadow on left */ 96 /* draw shadow on left */
80 pt[1].x = x + sz2 - 1; 97 pt[1].x = x + sz2 - 1;
81 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 98 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
82 XDrawLine (display->display, scrollBar.win, top, 99 XDrawLine (term->display->display, term->scrollBar.win, top,
83 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);
84 101
85#if DOUBLED 102#if SHADOW_WIDTH > 1
86 /* doubled */ 103 /* doubled */
87 pt[0].x++; 104 pt[0].x++;
88 105
89 if (dirn == UP) 106 if (dirn == UP)
90 { 107 {
… …
95 { 112 {
96 pt[0].y++; 113 pt[0].y++;
97 pt[1].y--; 114 pt[1].y--;
98 } 115 }
99 116
100 XDrawLine (display->display, scrollBar.win, top, 117 XDrawLine (term->display->display, term->scrollBar.win, top,
101 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);
102#endif 119#endif
103 120
104 /* draw shadow on right */ 121 /* draw shadow on right */
105 pt[1].x = x + sz - 1; 122 pt[1].x = x + sz - 1;
106 /* pt[2].x = x + sz2; */ 123 /* pt[2].x = x + sz2; */
107 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 124 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
108 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 125 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
109 XDrawLine (display->display, scrollBar.win, bot, 126 XDrawLine (term->display->display, term->scrollBar.win, bot,
110 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);
111 128
112#if DOUBLED 129#if SHADOW_WIDTH > 1
113 /* doubled */ 130 /* doubled */
114 pt[1].x--; 131 pt[1].x--;
115 if (dirn == UP) 132 if (dirn == UP)
116 { 133 {
117 pt[2].y++; 134 pt[2].y++;
… …
121 { 138 {
122 pt[2].y--; 139 pt[2].y--;
123 pt[1].y++; 140 pt[1].y++;
124 } 141 }
125 142
126 XDrawLine (display->display, scrollBar.win, bot, 143 XDrawLine (term->display->display, term->scrollBar.win, bot,
127 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);
128#endif 145#endif
129} 146}
130 147
131int 148int
… …
183 sbshadow, scrollBar.top, sbwidth, 200 sbshadow, scrollBar.top, sbwidth,
184 scrollbar_len); 201 scrollbar_len);
185 202
186 if (sbshadow) 203 if (sbshadow)
187 /* trough shadow */ 204 /* trough shadow */
188 rxvt_Draw_Shadow (display->display, scrollBar.win, 205 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 206
194 /* shadow for scrollbar slider */ 207 /* shadow for scrollbar slider */
195 rxvt_Draw_Shadow (display->display, scrollBar.win, 208 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
196 topShadowGC, botShadowGC,
197 sbshadow, scrollBar.top, sbwidth,
198 scrollbar_len);
199 209
200 /* Redraw scrollbar arrows */ 210 /* Redraw scrollbar arrows */
201 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 211 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
202 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 212 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
203 213
204 return 1; 214 return 1;
205} 215}
206#endif /* RXVT_SCROLLBAR */ 216#endif /* RXVT_SCROLLBAR */
207/*----------------------- end-of-file (C source) -----------------------*/ 217/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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