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.17 by root, Fri Feb 4 11:41:23 2005 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++;
86 105
87 if (dirn == UP) 106 if (dirn == UP)
88 { 107 {
… …
96 } 115 }
97 116
98 XDrawLine (display->display, scrollBar.win, top, 117 XDrawLine (display->display, scrollBar.win, top,
99 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);
100#endif 119#endif
120
101 /* draw shadow on right */ 121 /* draw shadow on right */
102 pt[1].x = x + sz - 1; 122 pt[1].x = x + sz - 1;
103 /* pt[2].x = x + sz2; */ 123 /* pt[2].x = x + sz2; */
104 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 124 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
105 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 125 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
106 XDrawLine (display->display, scrollBar.win, bot, 126 XDrawLine (display->display, scrollBar.win, bot,
107 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);
108 128
109#if (SHADOW > 1) 129#if SHADOW_WIDTH > 1
110 /* doubled */ 130 /* doubled */
111 pt[1].x--; 131 pt[1].x--;
112 if (dirn == UP) 132 if (dirn == UP)
113 { 133 {
114 pt[2].y++; 134 pt[2].y++;
… …
132 int sbwidth = (int)scrollBar.width; 152 int sbwidth = (int)scrollBar.width;
133 153
134 if ((scrollBar.init & R_SB_RXVT) == 0) 154 if ((scrollBar.init & R_SB_RXVT) == 0)
135 { 155 {
136 scrollBar.init |= R_SB_RXVT; 156 scrollBar.init |= R_SB_RXVT;
157
137 if (sbshadow) 158 if (sbshadow)
138 { 159 {
139 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]); 160 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]);
140 XClearWindow (display->display, scrollBar.win); 161 XClearWindow (display->display, scrollBar.win);
141 } 162 }
… …
163 /* scrollbar slider */ 184 /* scrollbar slider */
164#ifdef SB_BORDER 185#ifdef SB_BORDER
165 { 186 {
166 int xofs; 187 int xofs;
167 188
168 if (options & Opt_scrollBar_right) 189 if (OPTION (Opt_scrollBar_right))
169 xofs = 0; 190 xofs = 0;
170 else 191 else
171 xofs = sbshadow ? sbwidth : sbwidth - 1; 192 xofs = sbshadow ? sbwidth : sbwidth - 1;
172 193
173 XDrawLine (display->display, scrollBar.win, botShadowGC, 194 XDrawLine (display->display, scrollBar.win, botShadowGC,
… …
199 220
200 return 1; 221 return 1;
201} 222}
202#endif /* RXVT_SCROLLBAR */ 223#endif /* RXVT_SCROLLBAR */
203/*----------------------- end-of-file (C source) -----------------------*/ 224/*----------------------- end-of-file (C source) -----------------------*/
225

Diff Legend

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