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

Diff Legend

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