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.9 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.21 by root, Mon Jan 16 15:12:48 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
30#define DOUBLED 1
31
31/* draw triangular button with a shadow of SHADOW (1 or 2) pixels */ 32/* draw triangular button with a shadow of 2 pixels */
32void 33void
33rxvt_term::Draw_button (int x, int y, int state, int dirn) 34rxvt_term::Draw_button (int x, int y, int state, int dirn)
34{ 35{
35 unsigned int sz, sz2; 36 unsigned int sz, sz2;
36 XPoint pt[3]; 37 XPoint pt[3];
… …
65 else 66 else
66 { 67 {
67 pt[0].y = pt[1].y = y; 68 pt[0].y = pt[1].y = y;
68 pt[2].y = y + sz - 1; 69 pt[2].y = y + sz - 1;
69 } 70 }
71
70 XFillPolygon (display->display, scrollBar.win, scrollbarGC, 72 XFillPolygon (display->display, scrollBar.win, scrollbarGC,
71 pt, 3, Convex, CoordModeOrigin); 73 pt, 3, Convex, CoordModeOrigin);
72 74
73 /* draw base */ 75 /* draw base */
74 XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top), 76 XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top),
75 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 77 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
76 78
77 /* draw shadow on left */ 79 /* draw shadow on left */
78 pt[1].x = x + sz2 - 1; 80 pt[1].x = x + sz2 - 1;
79 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 81 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
80 XDrawLine (display->display, scrollBar.win, top, 82 XDrawLine (display->display, scrollBar.win, top,
81 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 83 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
82 84
83#if (SHADOW > 1) 85#if DOUBLED
84 /* doubled */ 86 /* doubled */
85 pt[0].x++; 87 pt[0].x++;
88
86 if (dirn == UP) 89 if (dirn == UP)
87 { 90 {
88 pt[0].y--; 91 pt[0].y--;
89 pt[1].y++; 92 pt[1].y++;
90 } 93 }
91 else 94 else
92 { 95 {
93 pt[0].y++; 96 pt[0].y++;
94 pt[1].y--; 97 pt[1].y--;
95 } 98 }
99
96 XDrawLine (display->display, scrollBar.win, top, 100 XDrawLine (display->display, scrollBar.win, top,
97 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);
98#endif 102#endif
103
99 /* draw shadow on right */ 104 /* draw shadow on right */
100 pt[1].x = x + sz - 1; 105 pt[1].x = x + sz - 1;
101 /* pt[2].x = x + sz2; */ 106 /* pt[2].x = x + sz2; */
102 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 107 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
103 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 108 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
104 XDrawLine (display->display, scrollBar.win, bot, 109 XDrawLine (display->display, scrollBar.win, bot,
105 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 110 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
106#if (SHADOW > 1) 111
112#if DOUBLED
107 /* doubled */ 113 /* doubled */
108 pt[1].x--; 114 pt[1].x--;
109 if (dirn == UP) 115 if (dirn == UP)
110 { 116 {
111 pt[2].y++; 117 pt[2].y++;
… …
114 else 120 else
115 { 121 {
116 pt[2].y--; 122 pt[2].y--;
117 pt[1].y++; 123 pt[1].y++;
118 } 124 }
125
119 XDrawLine (display->display, scrollBar.win, bot, 126 XDrawLine (display->display, scrollBar.win, bot,
120 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);
121#endif 128#endif
122} 129}
123 130
124int 131int
125rxvt_term::scrollbar_show_rxvt (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 132rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
126{ 133{
127 int sbshadow = sb_shadow; 134 int sbshadow = sb_shadow;
128 int sbwidth = (int)scrollBar.width; 135 int sbwidth = (int)scrollBar.width;
129 136
130 if ((scrollBar.init & R_SB_RXVT) == 0) 137 if ((scrollBar.init & R_SB_RXVT) == 0)
131 { 138 {
132 XGCValues gcvalue;
133
134 scrollBar.init |= R_SB_RXVT; 139 scrollBar.init |= R_SB_RXVT;
135 gcvalue.foreground = PixColors[Color_trough]; 140
136 if (sbshadow) 141 if (sbshadow)
137 { 142 {
138 XSetWindowBackground (display->display, scrollBar.win, 143 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]);
139 gcvalue.foreground);
140 XClearWindow (display->display, scrollBar.win); 144 XClearWindow (display->display, scrollBar.win);
141 } 145 }
142 } 146 }
143 else 147 else
144 { 148 {
145 /* instead of XClearWindow (display->display, scrollBar.win); */ 149 if (update)
150 {
146 if (last_top < scrollBar.top) 151 if (last_top < scrollBar.top)
147 XClearArea (display->display, scrollBar.win, 152 XClearArea (display->display, scrollBar.win,
148 sbshadow, last_top, 153 sbshadow, last_top,
149 sbwidth, (scrollBar.top - last_top), 154 sbwidth, (scrollBar.top - last_top),
150 False); 155 False);
151 156
152 if (scrollBar.bot < last_bot) 157 if (scrollBar.bot < last_bot)
153 XClearArea (display->display, scrollBar.win, 158 XClearArea (display->display, scrollBar.win,
154 sbshadow, scrollBar.bot, 159 sbshadow, scrollBar.bot,
155 sbwidth, (last_bot - scrollBar.bot), 160 sbwidth, (last_bot - scrollBar.bot),
156 False); 161 False);
162 }
163 else
164 XClearWindow (display->display, scrollBar.win);
157 } 165 }
158 166
159 /* scrollbar slider */ 167 /* scrollbar slider */
160#ifdef SB_BORDER 168#ifdef SB_BORDER
161 { 169 {
162 int xofs; 170 int xofs;
163 171
164 if (Options & Opt_scrollBar_right) 172 if (OPTION (Opt_scrollBar_right))
165 xofs = 0; 173 xofs = 0;
166 else 174 else
167 xofs = sbshadow ? sbwidth : sbwidth - 1; 175 xofs = sbshadow ? sbwidth : sbwidth - 1;
168 176
169 XDrawLine (display->display, scrollBar.win, botShadowGC, 177 XDrawLine (display->display, scrollBar.win, botShadowGC,
170 xofs, 0, xofs, scrollBar.end + sbwidth); 178 xofs, 0, xofs, scrollBar.end + sbwidth);
171 } 179 }
172#endif 180#endif
181
173 XFillRectangle (display->display, scrollBar.win, scrollbarGC, 182 XFillRectangle (display->display, scrollBar.win, scrollbarGC,
174 sbshadow, scrollBar.top, sbwidth, 183 sbshadow, scrollBar.top, sbwidth,
175 scrollbar_len); 184 scrollbar_len);
176 185
177 if (sbshadow) 186 if (sbshadow)
178 /* trough shadow */ 187 /* trough shadow */
179 rxvt_Draw_Shadow (display->display, scrollBar.win, 188 rxvt_Draw_Shadow (display->display, scrollBar.win,
180 botShadowGC, topShadowGC, 189 botShadowGC, topShadowGC,
181 0, 0, 190 0, 0,
182 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */ 191 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
183 scrollBar.end + (sbwidth + 1) + sbshadow); 192 scrollBar.end + (sbwidth + 1) + sbshadow);
193
184 /* shadow for scrollbar slider */ 194 /* shadow for scrollbar slider */
185 rxvt_Draw_Shadow (display->display, scrollBar.win, 195 rxvt_Draw_Shadow (display->display, scrollBar.win,
186 topShadowGC, botShadowGC, 196 topShadowGC, botShadowGC,
187 sbshadow, scrollBar.top, sbwidth, 197 sbshadow, scrollBar.top, sbwidth,
188 scrollbar_len); 198 scrollbar_len);
189 199
190 /*
191 * Redraw scrollbar arrows 200 /* Redraw scrollbar arrows */
192 */ 201 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
193 Draw_button (sbshadow, sbshadow, 202 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
194 (scrollbar_isUp () ? -1 : +1), UP); 203
195 Draw_button (sbshadow, (scrollBar.end + 1),
196 (scrollbar_isDn () ? -1 : +1), DN);
197 return 1; 204 return 1;
198} 205}
199#endif /* RXVT_SCROLLBAR */ 206#endif /* RXVT_SCROLLBAR */
200/*----------------------- end-of-file (C source) -----------------------*/ 207/*----------------------- end-of-file (C source) -----------------------*/
208

Diff Legend

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