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.23 by root, Mon Jan 16 18:09:28 2006 UTC vs.
Revision 1.35 by ayin, Wed Feb 6 01:29:19 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26 26
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
28#if defined(RXVT_SCROLLBAR) 28#if defined(RXVT_SCROLLBAR)
29 29
30#define SHADOW_WIDTH 1
31
32static void 30static void
33draw_shadow (rxvt_term *term, int x, int y, int w, int h) 31draw_shadow (rxvt_term *term, int x, int y, int w, int h)
34{ 32{
35 int shadow; 33 int shadow;
36 34
37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH; 35 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
38 w += x - 1; 36 w += x - 1;
39 h += y - 1; 37 h += y - 1;
38
40 for (; shadow-- > 0; x++, y++, w--, h--) 39 for (; shadow-- > 0; x++, y++, w--, h--)
41 { 40 {
42 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y); 41 XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w , y );
43 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h); 42 XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x , h );
44 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1); 43 XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1);
45 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h); 44 XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h );
46 } 45 }
47} 46}
48 47
49/* draw triangular button with a shadow of 2 pixels */ 48/* draw triangular button with a shadow of 2 pixels */
50static void 49static void
51draw_button (rxvt_term *term, int x, int y, int state, int dirn) 50draw_button (rxvt_term *term, int x, int y, int state, int dirn)
52{ 51{
… …
54 XPoint pt[3]; 53 XPoint pt[3];
55 GC top, bot; 54 GC top, bot;
56 55
57 sz = term->scrollBar.width; 56 sz = term->scrollBar.width;
58 sz2 = sz / 2; 57 sz2 = sz / 2;
58
59 switch (state) 59 switch (state)
60 { 60 {
61 case +1: 61 case +1:
62 top = term->topShadowGC; 62 top = term->topShadowGC;
63 bot = term->botShadowGC; 63 bot = term->botShadowGC;
… …
73 73
74 /* fill triangle */ 74 /* fill triangle */
75 pt[0].x = x; 75 pt[0].x = x;
76 pt[1].x = x + sz - 1; 76 pt[1].x = x + sz - 1;
77 pt[2].x = x + sz2; 77 pt[2].x = x + sz2;
78
78 if (dirn == UP) 79 if (dirn == UP)
79 { 80 {
80 pt[0].y = pt[1].y = y + sz - 1; 81 pt[0].y = pt[1].y = y + sz - 1;
81 pt[2].y = y; 82 pt[2].y = y;
82 } 83 }
… …
84 { 85 {
85 pt[0].y = pt[1].y = y; 86 pt[0].y = pt[1].y = y;
86 pt[2].y = y + sz - 1; 87 pt[2].y = y + sz - 1;
87 } 88 }
88 89
89 XFillPolygon (term->display->display, term->scrollBar.win, term->scrollbarGC, 90 XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC,
90 pt, 3, Convex, CoordModeOrigin); 91 pt, 3, Convex, CoordModeOrigin);
91 92
92 /* draw base */ 93 /* draw base */
93 XDrawLine (term->display->display, term->scrollBar.win, (dirn == UP ? bot : top), 94 XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top),
94 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 95 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
95 96
96 /* draw shadow on left */ 97 /* draw shadow on left */
97 pt[1].x = x + sz2 - 1; 98 pt[1].x = x + sz2 - 1;
98 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 99 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
99 XDrawLine (term->display->display, term->scrollBar.win, top, 100 XDrawLine (term->dpy, term->scrollBar.win, top,
100 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);
101 102
102#if SHADOW_WIDTH > 1 103#if SHADOW_WIDTH > 1
103 /* doubled */ 104 /* doubled */
104 pt[0].x++; 105 pt[0].x++;
… …
112 { 113 {
113 pt[0].y++; 114 pt[0].y++;
114 pt[1].y--; 115 pt[1].y--;
115 } 116 }
116 117
117 XDrawLine (term->display->display, term->scrollBar.win, top, 118 XDrawLine (term->dpy, term->scrollBar.win, top,
118 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 119 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
119#endif 120#endif
120 121
121 /* draw shadow on right */ 122 /* draw shadow on right */
122 pt[1].x = x + sz - 1; 123 pt[1].x = x + sz - 1;
123 /* pt[2].x = x + sz2; */ 124 /* pt[2].x = x + sz2; */
124 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 125 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
125 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 126 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
126 XDrawLine (term->display->display, term->scrollBar.win, bot, 127 XDrawLine (term->dpy, term->scrollBar.win, bot,
127 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 128 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
128 129
129#if SHADOW_WIDTH > 1 130#if SHADOW_WIDTH > 1
130 /* doubled */ 131 /* doubled */
131 pt[1].x--; 132 pt[1].x--;
… …
138 { 139 {
139 pt[2].y--; 140 pt[2].y--;
140 pt[1].y++; 141 pt[1].y++;
141 } 142 }
142 143
143 XDrawLine (term->display->display, term->scrollBar.win, bot, 144 XDrawLine (term->dpy, term->scrollBar.win, bot,
144 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 145 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
145#endif 146#endif
146} 147}
147 148
148int 149int
149rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len) 150rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
150{ 151{
151 int sbshadow = sb_shadow; 152 int sbshadow = scrollBar.shadow;
152 int sbwidth = (int)scrollBar.width; 153 int sbwidth = (int)scrollBar.width;
154 int state;
153 155
154 if ((scrollBar.init & R_SB_RXVT) == 0) 156 if ((scrollBar.init & R_SB_RXVT) == 0)
155 { 157 {
158 XGCValues gcvalue;
159
156 scrollBar.init |= R_SB_RXVT; 160 scrollBar.init |= R_SB_RXVT;
157 161
162 gcvalue.foreground = pix_colors[Color_topShadow];
163 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
164 gcvalue.foreground = pix_colors[Color_bottomShadow];
165 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
166 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
167 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
158 if (sbshadow) 168 if (sbshadow)
159 { 169 {
160 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]); 170 XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]);
161 XClearWindow (display->display, scrollBar.win); 171 XClearWindow (dpy, scrollBar.win);
162 } 172 }
163 } 173 }
164 else 174 else
165 { 175 {
166 if (update) 176 if (update)
167 { 177 {
168 if (last_top < scrollBar.top) 178 if (last_top < scrollBar.top)
169 XClearArea (display->display, scrollBar.win, 179 XClearArea (dpy, scrollBar.win,
170 sbshadow, last_top, 180 sbshadow, last_top,
171 sbwidth, (scrollBar.top - last_top), 181 sbwidth, (scrollBar.top - last_top),
172 False); 182 False);
173 183
174 if (scrollBar.bot < last_bot) 184 if (scrollBar.bot < last_bot)
175 XClearArea (display->display, scrollBar.win, 185 XClearArea (dpy, scrollBar.win,
176 sbshadow, scrollBar.bot, 186 sbshadow, scrollBar.bot,
177 sbwidth, (last_bot - scrollBar.bot), 187 sbwidth, (last_bot - scrollBar.bot),
178 False); 188 False);
179 } 189 }
180 else 190 else
181 XClearWindow (display->display, scrollBar.win); 191 XClearWindow (dpy, scrollBar.win);
182 } 192 }
183 193
184 /* scrollbar slider */ 194 /* scrollbar slider */
185#ifdef SB_BORDER 195#ifdef SB_BORDER
186 { 196 {
187 int xofs; 197 int xofs;
188 198
189 if (OPTION (Opt_scrollBar_right)) 199 if (option (Opt_scrollBar_right))
190 xofs = 0; 200 xofs = 0;
191 else 201 else
192 xofs = sbshadow ? sbwidth : sbwidth - 1; 202 xofs = sbshadow ? sbwidth : sbwidth - 1;
193 203
194 XDrawLine (display->display, scrollBar.win, botShadowGC, 204 XDrawLine (dpy, scrollBar.win, botShadowGC,
195 xofs, 0, xofs, scrollBar.end + sbwidth); 205 xofs, 0, xofs, scrollBar.end + sbwidth);
196 } 206 }
197#endif 207#endif
198 208
199 XFillRectangle (display->display, scrollBar.win, scrollbarGC, 209 XFillRectangle (dpy, scrollBar.win, scrollbarGC,
200 sbshadow, scrollBar.top, sbwidth, 210 sbshadow, scrollBar.top, sbwidth,
201 scrollbar_len); 211 scrollbar_len);
202 212
203 if (sbshadow) 213 if (sbshadow)
204 /* trough shadow */ 214 /* trough shadow */
… …
206 216
207 /* shadow for scrollbar slider */ 217 /* shadow for scrollbar slider */
208 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len); 218 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
209 219
210 /* Redraw scrollbar arrows */ 220 /* Redraw scrollbar arrows */
221 state = scrollBar.state == STATE_UP ? -1 : +1;
211 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 222 draw_button (this, sbshadow, sbshadow, state, UP);
223 state = scrollBar.state == STATE_DOWN ? -1 : +1;
212 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 224 draw_button (this, sbshadow, scrollBar.end + 1, state, DN);
213 225
214 return 1; 226 return 1;
215} 227}
216#endif /* RXVT_SCROLLBAR */ 228#endif /* RXVT_SCROLLBAR */
217/*----------------------- end-of-file (C source) -----------------------*/ 229/*----------------------- end-of-file (C source) -----------------------*/
218 230

Diff Legend

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