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.8 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.26 by root, Tue Jan 31 20:07:18 2006 UTC

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

Diff Legend

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