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

Diff Legend

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