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

Diff Legend

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