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.13 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.22 by root, Mon Jan 16 17:11:12 2006 UTC

… …
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26 26
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
28#if defined(RXVT_SCROLLBAR) 28#if defined(RXVT_SCROLLBAR)
29 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
30/* draw triangular button with a shadow of SHADOW (1 or 2) pixels */ 49/* draw triangular button with a shadow of 2 pixels */
31void 50void
32rxvt_term::Draw_button (int x, int y, int state, int dirn) 51rxvt_term::Draw_button (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];
… …
78 pt[1].x = x + sz2 - 1; 97 pt[1].x = x + sz2 - 1;
79 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 98 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
80 XDrawLine (display->display, scrollBar.win, top, 99 XDrawLine (display->display, scrollBar.win, top,
81 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);
82 101
83#if (SHADOW > 1) 102#if SHADOW_WIDTH > 1
84 /* doubled */ 103 /* doubled */
85 pt[0].x++; 104 pt[0].x++;
105
86 if (dirn == UP) 106 if (dirn == UP)
87 { 107 {
88 pt[0].y--; 108 pt[0].y--;
89 pt[1].y++; 109 pt[1].y++;
90 } 110 }
91 else 111 else
92 { 112 {
93 pt[0].y++; 113 pt[0].y++;
94 pt[1].y--; 114 pt[1].y--;
95 } 115 }
116
96 XDrawLine (display->display, scrollBar.win, top, 117 XDrawLine (display->display, scrollBar.win, top,
97 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);
98#endif 119#endif
120
99 /* draw shadow on right */ 121 /* draw shadow on right */
100 pt[1].x = x + sz - 1; 122 pt[1].x = x + sz - 1;
101 /* pt[2].x = x + sz2; */ 123 /* pt[2].x = x + sz2; */
102 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 124 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
103 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 125 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
104 XDrawLine (display->display, scrollBar.win, bot, 126 XDrawLine (display->display, scrollBar.win, bot,
105 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
106#if (SHADOW > 1) 129#if SHADOW_WIDTH > 1
107 /* doubled */ 130 /* doubled */
108 pt[1].x--; 131 pt[1].x--;
109 if (dirn == UP) 132 if (dirn == UP)
110 { 133 {
111 pt[2].y++; 134 pt[2].y++;
… …
121 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);
122#endif 145#endif
123} 146}
124 147
125int 148int
126rxvt_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)
127{ 150{
128 int sbshadow = sb_shadow; 151 int sbshadow = sb_shadow;
129 int sbwidth = (int)scrollBar.width; 152 int sbwidth = (int)scrollBar.width;
130 153
131 if ((scrollBar.init & R_SB_RXVT) == 0) 154 if ((scrollBar.init & R_SB_RXVT) == 0)
132 { 155 {
133 scrollBar.init |= R_SB_RXVT; 156 scrollBar.init |= R_SB_RXVT;
157
134 if (sbshadow) 158 if (sbshadow)
135 { 159 {
136 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_trough]); 160 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]);
137 XClearWindow (display->display, scrollBar.win); 161 XClearWindow (display->display, scrollBar.win);
138 } 162 }
139 } 163 }
140 else 164 else
141 { 165 {
142 /* instead of XClearWindow (display->display, scrollBar.win); */ 166 if (update)
167 {
143 if (last_top < scrollBar.top) 168 if (last_top < scrollBar.top)
144 XClearArea (display->display, scrollBar.win, 169 XClearArea (display->display, scrollBar.win,
145 sbshadow, last_top, 170 sbshadow, last_top,
146 sbwidth, (scrollBar.top - last_top), 171 sbwidth, (scrollBar.top - last_top),
147 False); 172 False);
148 173
149 if (scrollBar.bot < last_bot) 174 if (scrollBar.bot < last_bot)
150 XClearArea (display->display, scrollBar.win, 175 XClearArea (display->display, scrollBar.win,
151 sbshadow, scrollBar.bot, 176 sbshadow, scrollBar.bot,
152 sbwidth, (last_bot - scrollBar.bot), 177 sbwidth, (last_bot - scrollBar.bot),
153 False); 178 False);
179 }
180 else
181 XClearWindow (display->display, scrollBar.win);
154 } 182 }
155 183
156 /* scrollbar slider */ 184 /* scrollbar slider */
157#ifdef SB_BORDER 185#ifdef SB_BORDER
158 { 186 {
159 int xofs; 187 int xofs;
160 188
161 if (options & Opt_scrollBar_right) 189 if (OPTION (Opt_scrollBar_right))
162 xofs = 0; 190 xofs = 0;
163 else 191 else
164 xofs = sbshadow ? sbwidth : sbwidth - 1; 192 xofs = sbshadow ? sbwidth : sbwidth - 1;
165 193
166 XDrawLine (display->display, scrollBar.win, botShadowGC, 194 XDrawLine (display->display, scrollBar.win, botShadowGC,
… …
192 220
193 return 1; 221 return 1;
194} 222}
195#endif /* RXVT_SCROLLBAR */ 223#endif /* RXVT_SCROLLBAR */
196/*----------------------- end-of-file (C source) -----------------------*/ 224/*----------------------- end-of-file (C source) -----------------------*/
225

Diff Legend

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