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.23 by root, Mon Jan 16 18:09:28 2006 UTC

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

Diff Legend

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