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

Diff Legend

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