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

Diff Legend

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