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

Diff Legend

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