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

Diff Legend

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