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.7 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.8 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

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