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.13 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.39 by sf-exg, Tue Mar 30 10:26:22 2010 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.
… …
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/* 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 }
… …
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 90
70 XFillPolygon (display->display, scrollBar.win, scrollbarGC, 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++;
… …
115 { 140 {
116 pt[2].y--; 141 pt[2].y--;
117 pt[1].y++; 142 pt[1].y++;
118 } 143 }
119 144
120 XDrawLine (display->display, scrollBar.win, bot, 145 XDrawLine (dpy, d, bot,
121 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);
122#endif 147#endif
123} 148}
124 149
125int 150int
126rxvt_term::scrollbar_show_rxvt (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 151scrollBar_t::show_rxvt (int update)
127{ 152{
128 int sbshadow = sb_shadow; 153 int sbwidth = (int)width;
129 int sbwidth = (int)scrollBar.width;
130 154
131 if ((scrollBar.init & R_SB_RXVT) == 0) 155 if ((init & R_SB_RXVT) == 0)
132 { 156 {
157 XGCValues gcvalue;
158
133 scrollBar.init |= R_SB_RXVT; 159 init |= R_SB_RXVT;
160
161 gcvalue.foreground = term->pix_colors[Color_topShadow];
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);
134 if (sbshadow) 167 if (shadow)
135 { 168 {
136 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_trough]); 169 XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
137 XClearWindow (display->display, scrollBar.win); 170 XClearWindow (term->dpy, win);
138 } 171 }
139 } 172 }
140 else 173 else
141 { 174 {
142 /* instead of XClearWindow (display->display, scrollBar.win); */ 175 if (update)
176 {
143 if (last_top < scrollBar.top) 177 if (last_top < top)
144 XClearArea (display->display, scrollBar.win, 178 XClearArea (term->dpy, win,
145 sbshadow, last_top, 179 shadow, last_top,
146 sbwidth, (scrollBar.top - last_top), 180 sbwidth, (top - last_top),
147 False); 181 False);
148 182
149 if (scrollBar.bot < last_bot) 183 if (bot < last_bot)
150 XClearArea (display->display, scrollBar.win, 184 XClearArea (term->dpy, win,
151 sbshadow, scrollBar.bot, 185 shadow, bot,
152 sbwidth, (last_bot - scrollBar.bot), 186 sbwidth, (last_bot - bot),
153 False); 187 False);
188 }
189 else
190 XClearWindow (term->dpy, win);
154 } 191 }
155 192
156 /* scrollbar slider */ 193 /* scrollbar slider */
157#ifdef SB_BORDER 194#ifdef SB_BORDER
158 { 195 {
159 int xofs; 196 int xofs;
160 197
161 if (options & Opt_scrollBar_right) 198 if (term->option (Opt_scrollBar_right))
162 xofs = 0; 199 xofs = 0;
163 else 200 else
164 xofs = sbshadow ? sbwidth : sbwidth - 1; 201 xofs = shadow ? sbwidth : sbwidth - 1;
165 202
166 XDrawLine (display->display, scrollBar.win, botShadowGC, 203 XDrawLine (term->dpy, win, botShadowGC,
167 xofs, 0, xofs, scrollBar.end + sbwidth); 204 xofs, 0, xofs, end + sbwidth);
168 } 205 }
169#endif 206#endif
170 207
171 XFillRectangle (display->display, scrollBar.win, scrollbarGC, 208 XFillRectangle (term->dpy, win, scrollbarGC,
172 sbshadow, scrollBar.top, sbwidth, 209 shadow, top, sbwidth,
173 scrollbar_len); 210 bot - top);
174 211
175 if (sbshadow) 212 if (shadow)
176 /* trough shadow */ 213 /* trough shadow */
177 rxvt_Draw_Shadow (display->display, scrollBar.win, 214 draw_shadow (this, 0, 0, sbwidth + 2 * shadow, end + (sbwidth + 1) + shadow);
178 botShadowGC, topShadowGC,
179 0, 0,
180 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
181 scrollBar.end + (sbwidth + 1) + sbshadow);
182 215
183 /* shadow for scrollbar slider */ 216 /* shadow for scrollbar slider */
184 rxvt_Draw_Shadow (display->display, scrollBar.win, 217 draw_shadow (this, shadow, top, sbwidth, bot - top);
185 topShadowGC, botShadowGC,
186 sbshadow, scrollBar.top, sbwidth,
187 scrollbar_len);
188 218
189 /* Redraw scrollbar arrows */ 219 /* Redraw scrollbar arrows */
190 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); 220 draw_button (this, shadow, shadow, UP);
191 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); 221 draw_button (this, shadow, end + 1, DN);
192 222
193 return 1; 223 return 1;
194} 224}
195#endif /* RXVT_SCROLLBAR */ 225#endif /* RXVT_SCROLLBAR */
196/*----------------------- end-of-file (C source) -----------------------*/ 226/*----------------------- end-of-file (C source) -----------------------*/
227

Diff Legend

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