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.13 by root, Sun Aug 15 22:09:24 2004 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 if (dirn == UP) 86 if (dirn == UP)
… …
92 { 92 {
93 pt[0].y++; 93 pt[0].y++;
94 pt[1].y--; 94 pt[1].y--;
95 } 95 }
96 XDrawLine (display->display, scrollBar.win, top, 96 XDrawLine (display->display, scrollBar.win, top,
97 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 97 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
98#endif 98#endif
99 /* draw shadow on right */ 99 /* draw shadow on right */
100 pt[1].x = x + sz - 1; 100 pt[1].x = x + sz - 1;
101 /* pt[2].x = x + sz2; */ 101 /* pt[2].x = x + sz2; */
102 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 102 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
103 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 103 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
104 XDrawLine (display->display, scrollBar.win, bot, 104 XDrawLine (display->display, scrollBar.win, bot,
105 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 105 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
106#if (SHADOW > 1) 106#if (SHADOW > 1)
107 /* doubled */ 107 /* doubled */
108 pt[1].x--; 108 pt[1].x--;
109 if (dirn == UP) 109 if (dirn == UP)
110 { 110 {
… …
114 else 114 else
115 { 115 {
116 pt[2].y--; 116 pt[2].y--;
117 pt[1].y++; 117 pt[1].y++;
118 } 118 }
119
119 XDrawLine (display->display, scrollBar.win, bot, 120 XDrawLine (display->display, scrollBar.win, bot,
120 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 121 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
121#endif 122#endif
122} 123}
123 124
124int 125int
125rxvt_term::scrollbar_show_rxvt (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 126rxvt_term::scrollbar_show_rxvt (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len)
… …
127 int sbshadow = sb_shadow; 128 int sbshadow = sb_shadow;
128 int sbwidth = (int)scrollBar.width; 129 int sbwidth = (int)scrollBar.width;
129 130
130 if ((scrollBar.init & R_SB_RXVT) == 0) 131 if ((scrollBar.init & R_SB_RXVT) == 0)
131 { 132 {
132 XGCValues gcvalue;
133
134 scrollBar.init |= R_SB_RXVT; 133 scrollBar.init |= R_SB_RXVT;
135 gcvalue.foreground = PixColors[Color_trough];
136 if (sbshadow) 134 if (sbshadow)
137 { 135 {
138 XSetWindowBackground (display->display, scrollBar.win, 136 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_trough]);
139 gcvalue.foreground);
140 XClearWindow (display->display, scrollBar.win); 137 XClearWindow (display->display, scrollBar.win);
141 } 138 }
142 } 139 }
143 else 140 else
144 { 141 {
145 /* instead of XClearWindow (display->display, scrollBar.win); */ 142 /* instead of XClearWindow (display->display, scrollBar.win); */
146 if (last_top < scrollBar.top) 143 if (last_top < scrollBar.top)
147 XClearArea (display->display, scrollBar.win, 144 XClearArea (display->display, scrollBar.win,
148 sbshadow, last_top, 145 sbshadow, last_top,
149 sbwidth, (scrollBar.top - last_top), 146 sbwidth, (scrollBar.top - last_top),
150 False); 147 False);
151 148
152 if (scrollBar.bot < last_bot) 149 if (scrollBar.bot < last_bot)
153 XClearArea (display->display, scrollBar.win, 150 XClearArea (display->display, scrollBar.win,
154 sbshadow, scrollBar.bot, 151 sbshadow, scrollBar.bot,
155 sbwidth, (last_bot - scrollBar.bot), 152 sbwidth, (last_bot - scrollBar.bot),
156 False); 153 False);
157 } 154 }
158 155
159 /* scrollbar slider */ 156 /* scrollbar slider */
160#ifdef SB_BORDER 157#ifdef SB_BORDER
161 { 158 {
162 int xofs; 159 int xofs;
163 160
164 if (Options & Opt_scrollBar_right) 161 if (options & Opt_scrollBar_right)
165 xofs = 0; 162 xofs = 0;
166 else 163 else
167 xofs = sbshadow ? sbwidth : sbwidth - 1; 164 xofs = sbshadow ? sbwidth : sbwidth - 1;
168 165
169 XDrawLine (display->display, scrollBar.win, botShadowGC, 166 XDrawLine (display->display, scrollBar.win, botShadowGC,
170 xofs, 0, xofs, scrollBar.end + sbwidth); 167 xofs, 0, xofs, scrollBar.end + sbwidth);
171 } 168 }
172#endif 169#endif
170
173 XFillRectangle (display->display, scrollBar.win, scrollbarGC, 171 XFillRectangle (display->display, scrollBar.win, scrollbarGC,
174 sbshadow, scrollBar.top, sbwidth, 172 sbshadow, scrollBar.top, sbwidth,
175 scrollbar_len); 173 scrollbar_len);
176 174
177 if (sbshadow) 175 if (sbshadow)
178 /* trough shadow */ 176 /* trough shadow */
179 rxvt_Draw_Shadow (display->display, scrollBar.win, 177 rxvt_Draw_Shadow (display->display, scrollBar.win,
180 botShadowGC, topShadowGC, 178 botShadowGC, topShadowGC,
181 0, 0, 179 0, 0,
182 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */ 180 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
183 scrollBar.end + (sbwidth + 1) + sbshadow); 181 scrollBar.end + (sbwidth + 1) + sbshadow);
182
184 /* shadow for scrollbar slider */ 183 /* shadow for scrollbar slider */
185 rxvt_Draw_Shadow (display->display, scrollBar.win, 184 rxvt_Draw_Shadow (display->display, scrollBar.win,
186 topShadowGC, botShadowGC, 185 topShadowGC, botShadowGC,
187 sbshadow, scrollBar.top, sbwidth, 186 sbshadow, scrollBar.top, sbwidth,
188 scrollbar_len); 187 scrollbar_len);
189 188
190 /*
191 * Redraw scrollbar arrows 189 /* Redraw scrollbar arrows */
192 */ 190 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
193 Draw_button (sbshadow, sbshadow, 191 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
194 (scrollbar_isUp () ? -1 : +1), UP); 192
195 Draw_button (sbshadow, (scrollBar.end + 1),
196 (scrollbar_isDn () ? -1 : +1), DN);
197 return 1; 193 return 1;
198} 194}
199#endif /* RXVT_SCROLLBAR */ 195#endif /* RXVT_SCROLLBAR */
200/*----------------------- end-of-file (C source) -----------------------*/ 196/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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