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

Diff Legend

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