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

Diff Legend

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