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

Diff Legend

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