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

Diff Legend

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