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

Diff Legend

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