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.6 by pcg, Sun Feb 1 01:34:41 2004 UTC

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 {
62 pt[0].y = pt[1].y = y;
63 pt[2].y = y + sz - 1;
64 } 63 }
64 else
65 {
66 pt[0].y = pt[1].y = y;
67 pt[2].y = y + sz - 1;
68 }
65 XFillPolygon(Xdisplay, scrollBar.win, scrollbarGC, 69 XFillPolygon(Xdisplay, scrollBar.win, scrollbarGC,
66 pt, 3, Convex, CoordModeOrigin); 70 pt, 3, Convex, CoordModeOrigin);
67 71
68/* draw base */ 72 /* draw base */
69 XDrawLine(Xdisplay, scrollBar.win, (dirn == UP ? bot : top), 73 XDrawLine(Xdisplay, scrollBar.win, (dirn == UP ? bot : top),
70 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 74 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
71 75
72/* draw shadow on left */ 76 /* draw shadow on left */
73 pt[1].x = x + sz2 - 1; 77 pt[1].x = x + sz2 - 1;
74 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 78 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
75 XDrawLine(Xdisplay, scrollBar.win, top, 79 XDrawLine(Xdisplay, scrollBar.win, top,
76 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 80 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
77 81
78#if (SHADOW > 1) 82#if (SHADOW > 1)
79/* doubled */ 83 /* doubled */
80 pt[0].x++; 84 pt[0].x++;
81 if (dirn == UP) { 85 if (dirn == UP)
82 pt[0].y--; 86 {
83 pt[1].y++; 87 pt[0].y--;
84 } else { 88 pt[1].y++;
85 pt[0].y++;
86 pt[1].y--;
87 } 89 }
90 else
91 {
92 pt[0].y++;
93 pt[1].y--;
94 }
88 XDrawLine(Xdisplay, scrollBar.win, top, 95 XDrawLine(Xdisplay, scrollBar.win, top,
89 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 96 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
90#endif 97#endif
91/* draw shadow on right */ 98 /* draw shadow on right */
92 pt[1].x = x + sz - 1; 99 pt[1].x = x + sz - 1;
93/* pt[2].x = x + sz2; */ 100 /* pt[2].x = x + sz2; */
94 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 101 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
95 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 102 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
96 XDrawLine(Xdisplay, scrollBar.win, bot, 103 XDrawLine(Xdisplay, scrollBar.win, bot,
97 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 104 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
98#if (SHADOW > 1) 105#if (SHADOW > 1)
99/* doubled */ 106 /* doubled */
100 pt[1].x--; 107 pt[1].x--;
101 if (dirn == UP) { 108 if (dirn == UP)
102 pt[2].y++; 109 {
103 pt[1].y--; 110 pt[2].y++;
104 } else { 111 pt[1].y--;
105 pt[2].y--;
106 pt[1].y++;
107 } 112 }
113 else
114 {
115 pt[2].y--;
116 pt[1].y++;
117 }
108 XDrawLine(Xdisplay, scrollBar.win, bot, 118 XDrawLine(Xdisplay, scrollBar.win, bot,
109 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 119 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
110#endif 120#endif
111} 121}
112 122
113int 123int
114rxvt_term::scrollbar_show_rxvt (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 124rxvt_term::scrollbar_show_rxvt (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
115{ 125{
116 int sbshadow = sb_shadow; 126 int sbshadow = sb_shadow;
117 int sbwidth = (int)scrollBar.width; 127 int sbwidth = (int)scrollBar.width;
118 128
119 if ((scrollBar.init & R_SB_RXVT) == 0) { 129 if ((scrollBar.init & R_SB_RXVT) == 0)
130 {
120 XGCValues gcvalue; 131 XGCValues gcvalue;
121 132
122 scrollBar.init |= R_SB_RXVT; 133 scrollBar.init |= R_SB_RXVT;
123 gcvalue.foreground = PixColors[Color_trough]; 134 gcvalue.foreground = PixColors[Color_trough];
124 if (sbshadow) { 135 if (sbshadow)
136 {
125 XSetWindowBackground(Xdisplay, scrollBar.win, 137 XSetWindowBackground(Xdisplay, scrollBar.win,
126 gcvalue.foreground); 138 gcvalue.foreground);
127 XClearWindow(Xdisplay, scrollBar.win); 139 XClearWindow(Xdisplay, scrollBar.win);
128 } 140 }
129 } else { 141 }
142 else
143 {
130/* instead of XClearWindow (Xdisplay, scrollBar.win); */ 144 /* instead of XClearWindow (Xdisplay, scrollBar.win); */
131 if (last_top < scrollBar.top) 145 if (last_top < scrollBar.top)
132 XClearArea(Xdisplay, scrollBar.win, 146 XClearArea(Xdisplay, scrollBar.win,
133 sbshadow, last_top, 147 sbshadow, last_top,
134 sbwidth, (scrollBar.top - last_top), 148 sbwidth, (scrollBar.top - last_top),
135 False); 149 False);
136 150
137 if (scrollBar.bot < last_bot) 151 if (scrollBar.bot < last_bot)
138 XClearArea(Xdisplay, scrollBar.win, 152 XClearArea(Xdisplay, scrollBar.win,
139 sbshadow, scrollBar.bot, 153 sbshadow, scrollBar.bot,
140 sbwidth, (last_bot - scrollBar.bot), 154 sbwidth, (last_bot - scrollBar.bot),
141 False); 155 False);
142 } 156 }
143 157
144/* scrollbar slider */ 158 /* scrollbar slider */
145#ifdef SB_BORDER 159#ifdef SB_BORDER
146 { 160 {
147 int xofs; 161 int xofs;
148 162
149 if (Options & Opt_scrollBar_right) 163 if (Options & Opt_scrollBar_right)
150 xofs = 0; 164 xofs = 0;
151 else 165 else
152 xofs = sbshadow ? sbwidth : sbwidth - 1; 166 xofs = sbshadow ? sbwidth : sbwidth - 1;
153 167
154 XDrawLine(Xdisplay, scrollBar.win, botShadowGC, 168 XDrawLine(Xdisplay, scrollBar.win, botShadowGC,
155 xofs, 0, xofs, scrollBar.end + sbwidth); 169 xofs, 0, xofs, scrollBar.end + sbwidth);
156 } 170 }
157#endif 171#endif
158 XFillRectangle(Xdisplay, scrollBar.win, scrollbarGC, 172 XFillRectangle(Xdisplay, scrollBar.win, scrollbarGC,
159 sbshadow, scrollBar.top, sbwidth, 173 sbshadow, scrollBar.top, sbwidth,
160 scrollbar_len); 174 scrollbar_len);
161 175
162 if (sbshadow) 176 if (sbshadow)
163 /* trough shadow */ 177 /* trough shadow */
164 rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
165 botShadowGC, topShadowGC,
166 0, 0,
167 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
168 scrollBar.end + (sbwidth + 1) + sbshadow);
169/* shadow for scrollbar slider */
170 rxvt_Draw_Shadow(Xdisplay, scrollBar.win, 178 rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
179 botShadowGC, topShadowGC,
180 0, 0,
181 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
182 scrollBar.end + (sbwidth + 1) + sbshadow);
183 /* shadow for scrollbar slider */
184 rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
171 topShadowGC, botShadowGC, 185 topShadowGC, botShadowGC,
172 sbshadow, scrollBar.top, sbwidth, 186 sbshadow, scrollBar.top, sbwidth,
173 scrollbar_len); 187 scrollbar_len);
174 188
175/* 189 /*
176 * Redraw scrollbar arrows 190 * Redraw scrollbar arrows
177 */ 191 */
178 Draw_button (sbshadow, sbshadow, 192 Draw_button (sbshadow, sbshadow,
179 (scrollbar_isUp() ? -1 : +1), UP); 193 (scrollbar_isUp() ? -1 : +1), UP);
180 Draw_button (sbshadow, (scrollBar.end + 1), 194 Draw_button (sbshadow, (scrollBar.end + 1),
181 (scrollbar_isDn() ? -1 : +1), DN); 195 (scrollbar_isDn() ? -1 : +1), DN);
182 return 1; 196 return 1;
183} 197}
184#endif /* RXVT_SCROLLBAR */ 198#endif /* RXVT_SCROLLBAR */
185/*----------------------- end-of-file (C source) -----------------------*/ 199/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines