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.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs.
Revision 1.41 by root, Mon Feb 21 07:41:04 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar-rxvt.c 2 * File: scrollbar-rxvt.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar-rxvt.C,v 1.2 2003/11/24 17:31:28 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * 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 <schmorp@schmorp.de>
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.
… …
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/ 22 *----------------------------------------------------------------------*/
23 23
24#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26#include "scrollbar-rxvt.intpro" /* PROTOS for internal routines */
27 26
28/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
29#if defined(RXVT_SCROLLBAR) 28#if defined(RXVT_SCROLLBAR)
30 29
31/* draw triangular button with a shadow of SHADOW (1 or 2) pixels */ 30static void
32/* INTPROTO */ 31draw_shadow (scrollBar_t *sb, int x, int y, int w, int h)
33void
34rxvt_Draw_button(pR_ int x, int y, int state, int dirn)
35{ 32{
33 int shadow;
34 Drawable d = sb->win;
35 Display *dpy = sb->term->dpy;
36
37 shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
38 w += x - 1;
39 h += y - 1;
40
41 for (; shadow-- > 0; x++, y++, w--, h--)
42 {
43 XDrawLine (dpy, d, sb->topShadowGC, x, y, w , y );
44 XDrawLine (dpy, d, sb->topShadowGC, x, y, x , h );
45 XDrawLine (dpy, d, sb->botShadowGC, w, h, w , y + 1);
46 XDrawLine (dpy, d, sb->botShadowGC, w, h, x + 1, h );
47 }
48}
49
50/* draw triangular button with a shadow of 2 pixels */
51static void
52draw_button (scrollBar_t *sb, int x, int y, int dirn)
53{
36 unsigned int sz, sz2; 54 unsigned int sz, sz2;
37 XPoint pt[3]; 55 XPoint pt[3];
38 GC top, bot; 56 GC top, bot;
57 Drawable d = sb->win;
58 Display *dpy = sb->term->dpy;
39 59
40 sz = R->scrollBar.width; 60 sz = sb->width;
41 sz2 = sz / 2; 61 sz2 = sz / 2;
42 switch (state) { 62
43 case +1: 63 if ((dirn == UP && sb->state == STATE_UP)
44 top = R->h->topShadowGC; 64 || (dirn == DN && sb->state == STATE_DOWN))
45 bot = R->h->botShadowGC;
46 break;
47 case -1:
48 top = R->h->botShadowGC;
49 bot = R->h->topShadowGC;
50 break;
51 default:
52 top = bot = R->h->scrollbarGC;
53 break;
54 } 65 {
66 top = sb->botShadowGC;
67 bot = sb->topShadowGC;
68 }
69 else
70 {
71 top = sb->topShadowGC;
72 bot = sb->botShadowGC;
73 }
55 74
56/* fill triangle */ 75 /* fill triangle */
57 pt[0].x = x; 76 pt[0].x = x;
58 pt[1].x = x + sz - 1; 77 pt[1].x = x + sz - 1;
59 pt[2].x = x + sz2; 78 pt[2].x = x + sz2;
79
60 if (dirn == UP) { 80 if (dirn == UP)
81 {
61 pt[0].y = pt[1].y = y + sz - 1; 82 pt[0].y = pt[1].y = y + sz - 1;
62 pt[2].y = y; 83 pt[2].y = y;
63 } else { 84 }
85 else
86 {
64 pt[0].y = pt[1].y = y; 87 pt[0].y = pt[1].y = y;
65 pt[2].y = y + sz - 1; 88 pt[2].y = y + sz - 1;
66 } 89 }
67 XFillPolygon(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC, 90
91 XFillPolygon (dpy, d, sb->scrollbarGC,
68 pt, 3, Convex, CoordModeOrigin); 92 pt, 3, Convex, CoordModeOrigin);
69 93
70/* draw base */ 94 /* draw base */
71 XDrawLine(R->Xdisplay, R->scrollBar.win, (dirn == UP ? bot : top), 95 XDrawLine (dpy, d, (dirn == UP ? bot : top),
72 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 96 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
73 97
74/* draw shadow on left */ 98 /* draw shadow on left */
75 pt[1].x = x + sz2 - 1; 99 pt[1].x = x + sz2 - 1;
76 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 100 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
77 XDrawLine(R->Xdisplay, R->scrollBar.win, top, 101 XDrawLine (dpy, d, top,
78 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 102 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
79 103
80#if (SHADOW > 1) 104#if SHADOW_WIDTH > 1
81/* doubled */ 105 /* doubled */
82 pt[0].x++; 106 pt[0].x++;
107
83 if (dirn == UP) { 108 if (dirn == UP)
84 pt[0].y--;
85 pt[1].y++;
86 } else {
87 pt[0].y++;
88 pt[1].y--;
89 } 109 {
90 XDrawLine(R->Xdisplay, R->scrollBar.win, top, 110 pt[0].y--;
111 pt[1].y++;
112 }
113 else
114 {
115 pt[0].y++;
116 pt[1].y--;
117 }
118
119 XDrawLine (dpy, d, top,
91 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 120 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
92#endif 121#endif
122
93/* draw shadow on right */ 123 /* draw shadow on right */
94 pt[1].x = x + sz - 1; 124 pt[1].x = x + sz - 1;
95/* pt[2].x = x + sz2; */ 125 /* pt[2].x = x + sz2; */
96 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 126 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
97 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 127 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
98 XDrawLine(R->Xdisplay, R->scrollBar.win, bot, 128 XDrawLine (dpy, d, bot,
99 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 129 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
130
100#if (SHADOW > 1) 131#if SHADOW_WIDTH > 1
101/* doubled */ 132 /* doubled */
102 pt[1].x--; 133 pt[1].x--;
103 if (dirn == UP) { 134 if (dirn == UP)
104 pt[2].y++;
105 pt[1].y--;
106 } else {
107 pt[2].y--;
108 pt[1].y++;
109 } 135 {
110 XDrawLine(R->Xdisplay, R->scrollBar.win, bot, 136 pt[2].y++;
137 pt[1].y--;
138 }
139 else
140 {
141 pt[2].y--;
142 pt[1].y++;
143 }
144
145 XDrawLine (dpy, d, bot,
111 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 146 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
112#endif 147#endif
113} 148}
114 149
115/* EXTPROTO */
116int 150int
117rxvt_scrollbar_show_rxvt(pR_ int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 151scrollBar_t::show_rxvt (int update)
118{ 152{
119 int sbshadow = R->sb_shadow; 153 int sbwidth = (int)width;
120 int sbwidth = (int)R->scrollBar.width;
121 154
122 if ((R->scrollBar.init & R_SB_RXVT) == 0) { 155 if ((init & R_SB_RXVT) == 0)
123 XGCValues gcvalue; 156 {
157 XGCValues gcvalue;
124 158
125 R->scrollBar.init |= R_SB_RXVT; 159 init |= R_SB_RXVT;
160
126 gcvalue.foreground = R->PixColors[Color_trough]; 161 gcvalue.foreground = term->pix_colors[Color_topShadow];
127 if (sbshadow) { 162 topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
128 XSetWindowBackground(R->Xdisplay, R->scrollBar.win, 163 gcvalue.foreground = term->pix_colors[Color_bottomShadow];
129 gcvalue.foreground); 164 botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
130 XClearWindow(R->Xdisplay, R->scrollBar.win); 165 gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)];
131 } 166 scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
167 if (!term->option (Opt_scrollBar_floating))
168 {
169 shadow = SHADOW_WIDTH;
170 XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
171 XClearWindow (term->dpy, win);
172 }
173 }
174 else
175 {
176 if (update)
177 {
178 if (last_top < top)
179 XClearArea (term->dpy, win,
180 shadow, last_top,
181 sbwidth, (top - last_top),
182 False);
183
184 if (bot < last_bot)
185 XClearArea (term->dpy, win,
186 shadow, bot,
187 sbwidth, (last_bot - bot),
188 False);
189 }
132 } else { 190 else
133/* instead of XClearWindow (R->Xdisplay, R->scrollBar.win); */ 191 XClearWindow (term->dpy, win);
134 if (last_top < R->scrollBar.top)
135 XClearArea(R->Xdisplay, R->scrollBar.win,
136 sbshadow, last_top,
137 sbwidth, (R->scrollBar.top - last_top),
138 False);
139
140 if (R->scrollBar.bot < last_bot)
141 XClearArea(R->Xdisplay, R->scrollBar.win,
142 sbshadow, R->scrollBar.bot,
143 sbwidth, (last_bot - R->scrollBar.bot),
144 False);
145 } 192 }
146 193
147/* scrollbar slider */ 194 /* scrollbar slider */
148#ifdef SB_BORDER 195#ifdef SB_BORDER
149 { 196 {
150 int xofs; 197 int xofs;
151 198
152 if (R->Options & Opt_scrollBar_right) 199 if (term->option (Opt_scrollBar_right))
153 xofs = 0; 200 xofs = 0;
154 else 201 else
155 xofs = sbshadow ? sbwidth : sbwidth - 1; 202 xofs = shadow ? sbwidth : sbwidth - 1;
156 203
157 XDrawLine(R->Xdisplay, R->scrollBar.win, R->h->botShadowGC, 204 XDrawLine (term->dpy, win, botShadowGC,
158 xofs, 0, xofs, R->scrollBar.end + sbwidth); 205 xofs, 0, xofs, end + sbwidth);
159 } 206 }
160#endif 207#endif
161 XFillRectangle(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC,
162 sbshadow, R->scrollBar.top, sbwidth,
163 scrollbar_len);
164 208
209 XFillRectangle (term->dpy, win, scrollbarGC,
210 shadow, top, sbwidth,
211 bot - top);
212
165 if (sbshadow) 213 if (shadow)
166 /* trough shadow */ 214 /* trough shadow */
167 rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win, 215 draw_shadow (this, 0, 0, sbwidth + 2 * shadow, end + (sbwidth + 1) + shadow);
168 R->h->botShadowGC, R->h->topShadowGC, 216
169 0, 0,
170 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
171 R->scrollBar.end + (sbwidth + 1) + sbshadow);
172/* shadow for scrollbar slider */ 217 /* shadow for scrollbar slider */
173 rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win, 218 draw_shadow (this, shadow, top, sbwidth, bot - top);
174 R->h->topShadowGC, R->h->botShadowGC,
175 sbshadow, R->scrollBar.top, sbwidth,
176 scrollbar_len);
177 219
178/*
179 * Redraw scrollbar arrows 220 /* Redraw scrollbar arrows */
180 */ 221 draw_button (this, shadow, shadow, UP);
181 rxvt_Draw_button(aR_ sbshadow, sbshadow, 222 draw_button (this, shadow, end + 1, DN);
182 (scrollbar_isUp() ? -1 : +1), UP); 223
183 rxvt_Draw_button(aR_ sbshadow, (R->scrollBar.end + 1),
184 (scrollbar_isDn() ? -1 : +1), DN);
185 return 1; 224 return 1;
186} 225}
187#endif /* RXVT_SCROLLBAR */ 226#endif /* RXVT_SCROLLBAR */
188/*----------------------- end-of-file (C source) -----------------------*/ 227/*----------------------- end-of-file (C source) -----------------------*/
228

Diff Legend

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