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

Diff Legend

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