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

Diff Legend

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