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.23 by root, Mon Jan 16 18:09:28 2006 UTC vs.
Revision 1.45 by root, Thu May 22 18:54:33 2014 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 3 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 (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 (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y); 43 XDrawLine (dpy, d, sb->topShadowGC, x, y, w , y );
43 XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h); 44 XDrawLine (dpy, d, sb->topShadowGC, x, y, x , h );
44 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1); 45 XDrawLine (dpy, d, sb->botShadowGC, w, h, w , y + 1);
45 XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, 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 */
50static void 51static void
51draw_button (rxvt_term *term, 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 = term->scrollBar.width; 60 sz = sb->width;
58 sz2 = sz / 2; 61 sz2 = sz / 2;
59 switch (state) 62
63 if ((dirn == UP && sb->state == SB_STATE_UP)
64 || (dirn == DN && sb->state == SB_STATE_DOWN))
60 { 65 {
61 case +1:
62 top = term->topShadowGC;
63 bot = term->botShadowGC;
64 break;
65 case -1:
66 top = term->botShadowGC; 66 top = sb->botShadowGC;
67 bot = term->topShadowGC; 67 bot = sb->topShadowGC;
68 break; 68 }
69 default: 69 else
70 top = bot = term->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 (term->display->display, term->scrollBar.win, term->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 (term->display->display, term->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 (term->display->display, term->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 (term->display->display, term->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 (term->display->display, term->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 (term->display->display, term->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 & SB_STYLE_RXVT) == 0)
155 { 156 {
156 scrollBar.init |= R_SB_RXVT; 157 XGCValues gcvalue;
157 158
158 if (sbshadow) 159 init |= SB_STYLE_RXVT;
159 { 160
160 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]); 161 gcvalue.foreground = term->pix_colors[Color_topShadow];
161 XClearWindow (display->display, scrollBar.win); 162 topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
162 } 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);
163 } 167 }
164 else 168 else
165 { 169 {
166 if (update) 170 if (update)
167 { 171 {
168 if (last_top < scrollBar.top) 172 if (last_top < top)
169 XClearArea (display->display, scrollBar.win, 173 XClearArea (term->dpy, win,
170 sbshadow, last_top, 174 shadow, last_top,
171 sbwidth, (scrollBar.top - last_top), 175 sbwidth, (top - last_top),
172 False); 176 False);
173 177
174 if (scrollBar.bot < last_bot) 178 if (bot < last_bot)
175 XClearArea (display->display, scrollBar.win, 179 XClearArea (term->dpy, win,
176 sbshadow, scrollBar.bot, 180 shadow, bot,
177 sbwidth, (last_bot - scrollBar.bot), 181 sbwidth, (last_bot - bot),
178 False); 182 False);
179 } 183 }
180 else 184 else
181 XClearWindow (display->display, scrollBar.win); 185 XClearWindow (term->dpy, win);
182 } 186 }
183 187
184 /* scrollbar slider */ 188 /* scrollbar slider */
185#ifdef SB_BORDER 189#ifdef SB_BORDER
186 { 190 {
187 int xofs; 191 int xofs;
188 192
189 if (OPTION (Opt_scrollBar_right)) 193 if (term->option (Opt_scrollBar_right))
190 xofs = 0; 194 xofs = 0;
191 else 195 else
192 xofs = sbshadow ? sbwidth : sbwidth - 1; 196 xofs = shadow ? sbwidth : sbwidth - 1;
193 197
194 XDrawLine (display->display, scrollBar.win, botShadowGC, 198 XDrawLine (term->dpy, win, botShadowGC,
195 xofs, 0, xofs, scrollBar.end + sbwidth); 199 xofs, 0, xofs, end + sbwidth);
196 } 200 }
197#endif 201#endif
198 202
199 XFillRectangle (display->display, scrollBar.win, scrollbarGC, 203 XFillRectangle (term->dpy, win, scrollbarGC,
200 sbshadow, scrollBar.top, sbwidth, 204 shadow, top, sbwidth,
201 scrollbar_len); 205 bot - top);
202 206
203 if (sbshadow) 207 if (shadow)
204 /* trough shadow */ 208 /* trough shadow */
205 draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow); 209 draw_shadow (this, 0, 0, sbwidth + 2 * shadow, end + (sbwidth + 1) + shadow);
206 210
207 /* shadow for scrollbar slider */ 211 /* shadow for scrollbar slider */
208 draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len); 212 draw_shadow (this, shadow, top, sbwidth, bot - top);
209 213
210 /* Redraw scrollbar arrows */ 214 /* Redraw scrollbar arrows */
211 draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 215 draw_button (this, shadow, shadow, UP);
212 draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 216 draw_button (this, shadow, end + 1, DN);
213 217
214 return 1; 218 return 1;
215} 219}
216#endif /* RXVT_SCROLLBAR */ 220#endif /* RXVT_SCROLLBAR */
217/*----------------------- end-of-file (C source) -----------------------*/ 221/*----------------------- end-of-file (C source) -----------------------*/
218 222

Diff Legend

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