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

Diff Legend

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