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

Diff Legend

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