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

Diff Legend

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