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.6 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.9 by pcg, Thu Apr 8 20:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar-rxvt.c 2 * File: scrollbar-rxvt.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
… …
64 else 65 else
65 { 66 {
66 pt[0].y = pt[1].y = y; 67 pt[0].y = pt[1].y = y;
67 pt[2].y = y + sz - 1; 68 pt[2].y = y + sz - 1;
68 } 69 }
69 XFillPolygon(Xdisplay, scrollBar.win, scrollbarGC, 70 XFillPolygon (display->display, scrollBar.win, scrollbarGC,
70 pt, 3, Convex, CoordModeOrigin); 71 pt, 3, Convex, CoordModeOrigin);
71 72
72 /* draw base */ 73 /* draw base */
73 XDrawLine(Xdisplay, scrollBar.win, (dirn == UP ? bot : top), 74 XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top),
74 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);
75 76
76 /* draw shadow on left */ 77 /* draw shadow on left */
77 pt[1].x = x + sz2 - 1; 78 pt[1].x = x + sz2 - 1;
78 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 79 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
79 XDrawLine(Xdisplay, scrollBar.win, top, 80 XDrawLine (display->display, scrollBar.win, top,
80 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);
81 82
82#if (SHADOW > 1) 83#if (SHADOW > 1)
83 /* doubled */ 84 /* doubled */
84 pt[0].x++; 85 pt[0].x++;
… …
90 else 91 else
91 { 92 {
92 pt[0].y++; 93 pt[0].y++;
93 pt[1].y--; 94 pt[1].y--;
94 } 95 }
95 XDrawLine(Xdisplay, scrollBar.win, top, 96 XDrawLine (display->display, scrollBar.win, top,
96 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);
97#endif 98#endif
98 /* draw shadow on right */ 99 /* draw shadow on right */
99 pt[1].x = x + sz - 1; 100 pt[1].x = x + sz - 1;
100 /* pt[2].x = x + sz2; */ 101 /* pt[2].x = x + sz2; */
101 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 102 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
102 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 103 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
103 XDrawLine(Xdisplay, scrollBar.win, bot, 104 XDrawLine (display->display, scrollBar.win, bot,
104 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);
105#if (SHADOW > 1) 106#if (SHADOW > 1)
106 /* doubled */ 107 /* doubled */
107 pt[1].x--; 108 pt[1].x--;
108 if (dirn == UP) 109 if (dirn == UP)
… …
113 else 114 else
114 { 115 {
115 pt[2].y--; 116 pt[2].y--;
116 pt[1].y++; 117 pt[1].y++;
117 } 118 }
118 XDrawLine(Xdisplay, scrollBar.win, bot, 119 XDrawLine (display->display, scrollBar.win, bot,
119 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 120 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
120#endif 121#endif
121} 122}
122 123
123int 124int
124rxvt_term::scrollbar_show_rxvt (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 125rxvt_term::scrollbar_show_rxvt (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len)
125{ 126{
126 int sbshadow = sb_shadow; 127 int sbshadow = sb_shadow;
127 int sbwidth = (int)scrollBar.width; 128 int sbwidth = (int)scrollBar.width;
128 129
129 if ((scrollBar.init & R_SB_RXVT) == 0) 130 if ((scrollBar.init & R_SB_RXVT) == 0)
… …
132 133
133 scrollBar.init |= R_SB_RXVT; 134 scrollBar.init |= R_SB_RXVT;
134 gcvalue.foreground = PixColors[Color_trough]; 135 gcvalue.foreground = PixColors[Color_trough];
135 if (sbshadow) 136 if (sbshadow)
136 { 137 {
137 XSetWindowBackground(Xdisplay, scrollBar.win, 138 XSetWindowBackground (display->display, scrollBar.win,
138 gcvalue.foreground); 139 gcvalue.foreground);
139 XClearWindow(Xdisplay, scrollBar.win); 140 XClearWindow (display->display, scrollBar.win);
140 } 141 }
141 } 142 }
142 else 143 else
143 { 144 {
144 /* instead of XClearWindow (Xdisplay, scrollBar.win); */ 145 /* instead of XClearWindow (display->display, scrollBar.win); */
145 if (last_top < scrollBar.top) 146 if (last_top < scrollBar.top)
146 XClearArea(Xdisplay, scrollBar.win, 147 XClearArea (display->display, scrollBar.win,
147 sbshadow, last_top, 148 sbshadow, last_top,
148 sbwidth, (scrollBar.top - last_top), 149 sbwidth, (scrollBar.top - last_top),
149 False); 150 False);
150 151
151 if (scrollBar.bot < last_bot) 152 if (scrollBar.bot < last_bot)
152 XClearArea(Xdisplay, scrollBar.win, 153 XClearArea (display->display, scrollBar.win,
153 sbshadow, scrollBar.bot, 154 sbshadow, scrollBar.bot,
154 sbwidth, (last_bot - scrollBar.bot), 155 sbwidth, (last_bot - scrollBar.bot),
155 False); 156 False);
156 } 157 }
157 158
… …
163 if (Options & Opt_scrollBar_right) 164 if (Options & Opt_scrollBar_right)
164 xofs = 0; 165 xofs = 0;
165 else 166 else
166 xofs = sbshadow ? sbwidth : sbwidth - 1; 167 xofs = sbshadow ? sbwidth : sbwidth - 1;
167 168
168 XDrawLine(Xdisplay, scrollBar.win, botShadowGC, 169 XDrawLine (display->display, scrollBar.win, botShadowGC,
169 xofs, 0, xofs, scrollBar.end + sbwidth); 170 xofs, 0, xofs, scrollBar.end + sbwidth);
170 } 171 }
171#endif 172#endif
172 XFillRectangle(Xdisplay, scrollBar.win, scrollbarGC, 173 XFillRectangle (display->display, scrollBar.win, scrollbarGC,
173 sbshadow, scrollBar.top, sbwidth, 174 sbshadow, scrollBar.top, sbwidth,
174 scrollbar_len); 175 scrollbar_len);
175 176
176 if (sbshadow) 177 if (sbshadow)
177 /* trough shadow */ 178 /* trough shadow */
178 rxvt_Draw_Shadow(Xdisplay, scrollBar.win, 179 rxvt_Draw_Shadow (display->display, scrollBar.win,
179 botShadowGC, topShadowGC, 180 botShadowGC, topShadowGC,
180 0, 0, 181 0, 0,
181 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */ 182 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
182 scrollBar.end + (sbwidth + 1) + sbshadow); 183 scrollBar.end + (sbwidth + 1) + sbshadow);
183 /* shadow for scrollbar slider */ 184 /* shadow for scrollbar slider */
184 rxvt_Draw_Shadow(Xdisplay, scrollBar.win, 185 rxvt_Draw_Shadow (display->display, scrollBar.win,
185 topShadowGC, botShadowGC, 186 topShadowGC, botShadowGC,
186 sbshadow, scrollBar.top, sbwidth, 187 sbshadow, scrollBar.top, sbwidth,
187 scrollbar_len); 188 scrollbar_len);
188 189
189 /* 190 /*
190 * Redraw scrollbar arrows 191 * Redraw scrollbar arrows
191 */ 192 */
192 Draw_button (sbshadow, sbshadow, 193 Draw_button (sbshadow, sbshadow,
193 (scrollbar_isUp() ? -1 : +1), UP); 194 (scrollbar_isUp () ? -1 : +1), UP);
194 Draw_button (sbshadow, (scrollBar.end + 1), 195 Draw_button (sbshadow, (scrollBar.end + 1),
195 (scrollbar_isDn() ? -1 : +1), DN); 196 (scrollbar_isDn () ? -1 : +1), DN);
196 return 1; 197 return 1;
197} 198}
198#endif /* RXVT_SCROLLBAR */ 199#endif /* RXVT_SCROLLBAR */
199/*----------------------- end-of-file (C source) -----------------------*/ 200/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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