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.7 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.41 by root, Mon Feb 21 07:41:04 2011 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 <schmorp@schmorp.de>
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 (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 }
64 else 85 else
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 XFillPolygon(display->display, scrollBar.win, scrollbarGC, 90
91 XFillPolygon (dpy, d, sb->scrollbarGC,
70 pt, 3, Convex, CoordModeOrigin); 92 pt, 3, Convex, CoordModeOrigin);
71 93
72 /* draw base */ 94 /* draw base */
73 XDrawLine(display->display, scrollBar.win, (dirn == UP ? bot : top), 95 XDrawLine (dpy, d, (dirn == UP ? bot : top),
74 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);
75 97
76 /* draw shadow on left */ 98 /* draw shadow on left */
77 pt[1].x = x + sz2 - 1; 99 pt[1].x = x + sz2 - 1;
78 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 100 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
79 XDrawLine(display->display, scrollBar.win, top, 101 XDrawLine (dpy, d, top,
80 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);
81 103
82#if (SHADOW > 1) 104#if SHADOW_WIDTH > 1
83 /* doubled */ 105 /* doubled */
84 pt[0].x++; 106 pt[0].x++;
107
85 if (dirn == UP) 108 if (dirn == UP)
86 { 109 {
87 pt[0].y--; 110 pt[0].y--;
88 pt[1].y++; 111 pt[1].y++;
89 } 112 }
90 else 113 else
91 { 114 {
92 pt[0].y++; 115 pt[0].y++;
93 pt[1].y--; 116 pt[1].y--;
94 } 117 }
95 XDrawLine(display->display, scrollBar.win, top, 118
119 XDrawLine (dpy, d, top,
96 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);
97#endif 121#endif
122
98 /* draw shadow on right */ 123 /* draw shadow on right */
99 pt[1].x = x + sz - 1; 124 pt[1].x = x + sz - 1;
100 /* pt[2].x = x + sz2; */ 125 /* pt[2].x = x + sz2; */
101 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 126 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
102 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 127 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
103 XDrawLine(display->display, scrollBar.win, bot, 128 XDrawLine (dpy, d, bot,
104 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
105#if (SHADOW > 1) 131#if SHADOW_WIDTH > 1
106 /* doubled */ 132 /* doubled */
107 pt[1].x--; 133 pt[1].x--;
108 if (dirn == UP) 134 if (dirn == UP)
109 { 135 {
110 pt[2].y++; 136 pt[2].y++;
… …
113 else 139 else
114 { 140 {
115 pt[2].y--; 141 pt[2].y--;
116 pt[1].y++; 142 pt[1].y++;
117 } 143 }
118 XDrawLine(display->display, scrollBar.win, bot, 144
145 XDrawLine (dpy, d, bot,
119 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);
120#endif 147#endif
121} 148}
122 149
123int 150int
124rxvt_term::scrollbar_show_rxvt (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 151scrollBar_t::show_rxvt (int update)
125{ 152{
126 int sbshadow = sb_shadow; 153 int sbwidth = (int)width;
127 int sbwidth = (int)scrollBar.width;
128 154
129 if ((scrollBar.init & R_SB_RXVT) == 0) 155 if ((init & R_SB_RXVT) == 0)
130 { 156 {
131 XGCValues gcvalue; 157 XGCValues gcvalue;
132 158
133 scrollBar.init |= R_SB_RXVT; 159 init |= R_SB_RXVT;
160
134 gcvalue.foreground = PixColors[Color_trough]; 161 gcvalue.foreground = term->pix_colors[Color_topShadow];
135 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 if (!term->option (Opt_scrollBar_floating))
136 { 168 {
137 XSetWindowBackground(display->display, scrollBar.win, 169 shadow = SHADOW_WIDTH;
138 gcvalue.foreground); 170 XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
139 XClearWindow(display->display, scrollBar.win); 171 XClearWindow (term->dpy, win);
140 } 172 }
141 } 173 }
142 else 174 else
143 { 175 {
144 /* instead of XClearWindow (display->display, scrollBar.win); */ 176 if (update)
177 {
145 if (last_top < scrollBar.top) 178 if (last_top < top)
146 XClearArea(display->display, scrollBar.win, 179 XClearArea (term->dpy, win,
147 sbshadow, last_top, 180 shadow, last_top,
148 sbwidth, (scrollBar.top - last_top), 181 sbwidth, (top - last_top),
149 False); 182 False);
150 183
151 if (scrollBar.bot < last_bot) 184 if (bot < last_bot)
152 XClearArea(display->display, scrollBar.win, 185 XClearArea (term->dpy, win,
153 sbshadow, scrollBar.bot, 186 shadow, bot,
154 sbwidth, (last_bot - scrollBar.bot), 187 sbwidth, (last_bot - bot),
155 False); 188 False);
189 }
190 else
191 XClearWindow (term->dpy, win);
156 } 192 }
157 193
158 /* scrollbar slider */ 194 /* scrollbar slider */
159#ifdef SB_BORDER 195#ifdef SB_BORDER
160 { 196 {
161 int xofs; 197 int xofs;
162 198
163 if (Options & Opt_scrollBar_right) 199 if (term->option (Opt_scrollBar_right))
164 xofs = 0; 200 xofs = 0;
165 else 201 else
166 xofs = sbshadow ? sbwidth : sbwidth - 1; 202 xofs = shadow ? sbwidth : sbwidth - 1;
167 203
168 XDrawLine(display->display, scrollBar.win, botShadowGC, 204 XDrawLine (term->dpy, win, botShadowGC,
169 xofs, 0, xofs, scrollBar.end + sbwidth); 205 xofs, 0, xofs, end + sbwidth);
170 } 206 }
171#endif 207#endif
208
172 XFillRectangle(display->display, scrollBar.win, scrollbarGC, 209 XFillRectangle (term->dpy, win, scrollbarGC,
173 sbshadow, scrollBar.top, sbwidth, 210 shadow, top, sbwidth,
174 scrollbar_len); 211 bot - top);
175 212
176 if (sbshadow) 213 if (shadow)
177 /* trough shadow */ 214 /* trough shadow */
178 rxvt_Draw_Shadow(display->display, scrollBar.win, 215 draw_shadow (this, 0, 0, sbwidth + 2 * shadow, end + (sbwidth + 1) + shadow);
179 botShadowGC, topShadowGC, 216
180 0, 0,
181 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
182 scrollBar.end + (sbwidth + 1) + sbshadow);
183 /* shadow for scrollbar slider */ 217 /* shadow for scrollbar slider */
184 rxvt_Draw_Shadow(display->display, scrollBar.win, 218 draw_shadow (this, shadow, top, sbwidth, bot - top);
185 topShadowGC, botShadowGC,
186 sbshadow, scrollBar.top, sbwidth,
187 scrollbar_len);
188 219
189 /*
190 * Redraw scrollbar arrows 220 /* Redraw scrollbar arrows */
191 */
192 Draw_button (sbshadow, sbshadow, 221 draw_button (this, shadow, shadow, UP);
193 (scrollbar_isUp() ? -1 : +1), UP); 222 draw_button (this, shadow, end + 1, DN);
194 Draw_button (sbshadow, (scrollBar.end + 1), 223
195 (scrollbar_isDn() ? -1 : +1), DN);
196 return 1; 224 return 1;
197} 225}
198#endif /* RXVT_SCROLLBAR */ 226#endif /* RXVT_SCROLLBAR */
199/*----------------------- end-of-file (C source) -----------------------*/ 227/*----------------------- end-of-file (C source) -----------------------*/
228

Diff Legend

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