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

Diff Legend

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