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.25 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.36 by ayin, Tue Feb 19 10:46:03 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
… …
38 w += x - 1; 36 w += x - 1;
39 h += y - 1; 37 h += y - 1;
40 38
41 for (; shadow-- > 0; x++, y++, w--, h--) 39 for (; shadow-- > 0; x++, y++, w--, h--)
42 { 40 {
43 XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, w, y); 41 XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w , y );
44 XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, x, h); 42 XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x , h );
45 XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1); 43 XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1);
46 XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h); 44 XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h );
47 } 45 }
48} 46}
49 47
50/* draw triangular button with a shadow of 2 pixels */ 48/* draw triangular button with a shadow of 2 pixels */
51static void 49static void
52draw_button (rxvt_term *term, int x, int y, int state, int dirn) 50draw_button (rxvt_term *term, int x, int y, int dirn)
53{ 51{
54 unsigned int sz, sz2; 52 unsigned int sz, sz2;
55 XPoint pt[3]; 53 XPoint pt[3];
56 GC top, bot; 54 GC top, bot;
57 55
58 sz = term->scrollBar.width; 56 sz = term->scrollBar.width;
59 sz2 = sz / 2; 57 sz2 = sz / 2;
60 switch (state) 58
59 if ((dirn == UP && term->scrollBar.state == STATE_UP)
60 || (dirn == DN && term->scrollBar.state == STATE_DOWN))
61 { 61 {
62 case +1:
63 top = term->topShadowGC;
64 bot = term->botShadowGC;
65 break;
66 case -1:
67 top = term->botShadowGC; 62 top = term->botShadowGC;
68 bot = term->topShadowGC; 63 bot = term->topShadowGC;
69 break; 64 }
70 default: 65 else
71 top = bot = term->scrollbarGC; 66 {
72 break; 67 top = term->topShadowGC;
68 bot = term->botShadowGC;
73 } 69 }
74 70
75 /* fill triangle */ 71 /* fill triangle */
76 pt[0].x = x; 72 pt[0].x = x;
77 pt[1].x = x + sz - 1; 73 pt[1].x = x + sz - 1;
78 pt[2].x = x + sz2; 74 pt[2].x = x + sz2;
75
79 if (dirn == UP) 76 if (dirn == UP)
80 { 77 {
81 pt[0].y = pt[1].y = y + sz - 1; 78 pt[0].y = pt[1].y = y + sz - 1;
82 pt[2].y = y; 79 pt[2].y = y;
83 } 80 }
… …
85 { 82 {
86 pt[0].y = pt[1].y = y; 83 pt[0].y = pt[1].y = y;
87 pt[2].y = y + sz - 1; 84 pt[2].y = y + sz - 1;
88 } 85 }
89 86
90 XFillPolygon (term->xdisp, term->scrollBar.win, term->scrollbarGC, 87 XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC,
91 pt, 3, Convex, CoordModeOrigin); 88 pt, 3, Convex, CoordModeOrigin);
92 89
93 /* draw base */ 90 /* draw base */
94 XDrawLine (term->xdisp, term->scrollBar.win, (dirn == UP ? bot : top), 91 XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top),
95 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 92 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
96 93
97 /* draw shadow on left */ 94 /* draw shadow on left */
98 pt[1].x = x + sz2 - 1; 95 pt[1].x = x + sz2 - 1;
99 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 96 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
100 XDrawLine (term->xdisp, term->scrollBar.win, top, 97 XDrawLine (term->dpy, term->scrollBar.win, top,
101 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 98 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
102 99
103#if SHADOW_WIDTH > 1 100#if SHADOW_WIDTH > 1
104 /* doubled */ 101 /* doubled */
105 pt[0].x++; 102 pt[0].x++;
… …
113 { 110 {
114 pt[0].y++; 111 pt[0].y++;
115 pt[1].y--; 112 pt[1].y--;
116 } 113 }
117 114
118 XDrawLine (term->xdisp, term->scrollBar.win, top, 115 XDrawLine (term->dpy, term->scrollBar.win, top,
119 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 116 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
120#endif 117#endif
121 118
122 /* draw shadow on right */ 119 /* draw shadow on right */
123 pt[1].x = x + sz - 1; 120 pt[1].x = x + sz - 1;
124 /* pt[2].x = x + sz2; */ 121 /* pt[2].x = x + sz2; */
125 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 122 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
126 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 123 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
127 XDrawLine (term->xdisp, term->scrollBar.win, bot, 124 XDrawLine (term->dpy, term->scrollBar.win, bot,
128 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 125 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
129 126
130#if SHADOW_WIDTH > 1 127#if SHADOW_WIDTH > 1
131 /* doubled */ 128 /* doubled */
132 pt[1].x--; 129 pt[1].x--;
… …
139 { 136 {
140 pt[2].y--; 137 pt[2].y--;
141 pt[1].y++; 138 pt[1].y++;
142 } 139 }
143 140
144 XDrawLine (term->xdisp, term->scrollBar.win, bot, 141 XDrawLine (term->dpy, term->scrollBar.win, bot,
145 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 142 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
146#endif 143#endif
147} 144}
148 145
149int 146int
150rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len) 147rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
151{ 148{
152 int sbshadow = sb_shadow; 149 int sbshadow = scrollBar.shadow;
153 int sbwidth = (int)scrollBar.width; 150 int sbwidth = (int)scrollBar.width;
154 151
155 if ((scrollBar.init & R_SB_RXVT) == 0) 152 if ((scrollBar.init & R_SB_RXVT) == 0)
156 { 153 {
154 XGCValues gcvalue;
155
157 scrollBar.init |= R_SB_RXVT; 156 scrollBar.init |= R_SB_RXVT;
158 157
158 gcvalue.foreground = pix_colors[Color_topShadow];
159 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
160 gcvalue.foreground = pix_colors[Color_bottomShadow];
161 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
162 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
163 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
159 if (sbshadow) 164 if (sbshadow)
160 { 165 {
161 XSetWindowBackground (xdisp, scrollBar.win, pix_colors_focused[Color_trough]); 166 XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]);
162 XClearWindow (xdisp, scrollBar.win); 167 XClearWindow (dpy, scrollBar.win);
163 } 168 }
164 } 169 }
165 else 170 else
166 { 171 {
167 if (update) 172 if (update)
168 { 173 {
169 if (last_top < scrollBar.top) 174 if (last_top < scrollBar.top)
170 XClearArea (xdisp, scrollBar.win, 175 XClearArea (dpy, scrollBar.win,
171 sbshadow, last_top, 176 sbshadow, last_top,
172 sbwidth, (scrollBar.top - last_top), 177 sbwidth, (scrollBar.top - last_top),
173 False); 178 False);
174 179
175 if (scrollBar.bot < last_bot) 180 if (scrollBar.bot < last_bot)
176 XClearArea (xdisp, scrollBar.win, 181 XClearArea (dpy, scrollBar.win,
177 sbshadow, scrollBar.bot, 182 sbshadow, scrollBar.bot,
178 sbwidth, (last_bot - scrollBar.bot), 183 sbwidth, (last_bot - scrollBar.bot),
179 False); 184 False);
180 } 185 }
181 else 186 else
182 XClearWindow (xdisp, scrollBar.win); 187 XClearWindow (dpy, scrollBar.win);
183 } 188 }
184 189
185 /* scrollbar slider */ 190 /* scrollbar slider */
186#ifdef SB_BORDER 191#ifdef SB_BORDER
187 { 192 {
188 int xofs; 193 int xofs;
189 194
190 if (OPTION (Opt_scrollBar_right)) 195 if (option (Opt_scrollBar_right))
191 xofs = 0; 196 xofs = 0;
192 else 197 else
193 xofs = sbshadow ? sbwidth : sbwidth - 1; 198 xofs = sbshadow ? sbwidth : sbwidth - 1;
194 199
195 XDrawLine (xdisp, scrollBar.win, botShadowGC, 200 XDrawLine (dpy, scrollBar.win, botShadowGC,
196 xofs, 0, xofs, scrollBar.end + sbwidth); 201 xofs, 0, xofs, scrollBar.end + sbwidth);
197 } 202 }
198#endif 203#endif
199 204
200 XFillRectangle (xdisp, scrollBar.win, scrollbarGC, 205 XFillRectangle (dpy, scrollBar.win, scrollbarGC,
201 sbshadow, scrollBar.top, sbwidth, 206 sbshadow, scrollBar.top, sbwidth,
202 scrollbar_len); 207 scrollbar_len);
203 208
204 if (sbshadow) 209 if (sbshadow)
205 /* trough shadow */ 210 /* trough shadow */
… …
207 212
208 /* shadow for scrollbar slider */ 213 /* shadow for scrollbar slider */
209 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len); 214 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
210 215
211 /* Redraw scrollbar arrows */ 216 /* Redraw scrollbar arrows */
212 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 217 draw_button (this, sbshadow, sbshadow, UP);
213 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 218 draw_button (this, sbshadow, scrollBar.end + 1, DN);
214 219
215 return 1; 220 return 1;
216} 221}
217#endif /* RXVT_SCROLLBAR */ 222#endif /* RXVT_SCROLLBAR */
218/*----------------------- end-of-file (C source) -----------------------*/ 223/*----------------------- end-of-file (C source) -----------------------*/
219 224

Diff Legend

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