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

Diff Legend

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