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.10 by root, Mon Jun 21 22:24:07 2004 UTC vs.
Revision 1.26 by root, Tue Jan 31 20:07:18 2006 UTC

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

Diff Legend

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