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

Diff Legend

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