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

Diff Legend

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