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

Diff Legend

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