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

Diff Legend

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