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.4 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.22 by root, Mon Jan 16 17:11:12 2006 UTC

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

Diff Legend

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