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

Diff Legend

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