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

Diff Legend

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