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.4 by pcg, Sat Jan 31 00:20: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.3 2003/11/25 11:52:42 pcg Exp $ 4 * $Id: scrollbar-rxvt.C,v 1.4 2004/01/31 00:20:21 pcg Exp $
5 * 5 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 7 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.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
… …
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) {
43 case +1: 42 case +1:
44 top = R->topShadowGC; 43 top = topShadowGC;
45 bot = R->botShadowGC; 44 bot = botShadowGC;
46 break; 45 break;
47 case -1: 46 case -1:
48 top = R->botShadowGC; 47 top = botShadowGC;
49 bot = R->topShadowGC; 48 bot = topShadowGC;
50 break; 49 break;
51 default: 50 default:
52 top = bot = R->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;
… …
62 pt[2].y = y; 61 pt[2].y = y;
63 } else { 62 } else {
64 pt[0].y = pt[1].y = y; 63 pt[0].y = pt[1].y = y;
65 pt[2].y = y + sz - 1; 64 pt[2].y = y + sz - 1;
66 } 65 }
67 XFillPolygon(R->Xdisplay, R->scrollBar.win, R->scrollbarGC, 66 XFillPolygon(Xdisplay, scrollBar.win, scrollbarGC,
68 pt, 3, Convex, CoordModeOrigin); 67 pt, 3, Convex, CoordModeOrigin);
69 68
70/* draw base */ 69/* draw base */
71 XDrawLine(R->Xdisplay, R->scrollBar.win, (dirn == UP ? bot : top), 70 XDrawLine(Xdisplay, scrollBar.win, (dirn == UP ? bot : top),
72 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 71 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
73 72
74/* draw shadow on left */ 73/* draw shadow on left */
75 pt[1].x = x + sz2 - 1; 74 pt[1].x = x + sz2 - 1;
76 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 75 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
77 XDrawLine(R->Xdisplay, R->scrollBar.win, top, 76 XDrawLine(Xdisplay, scrollBar.win, top,
78 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 77 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
79 78
80#if (SHADOW > 1) 79#if (SHADOW > 1)
81/* doubled */ 80/* doubled */
82 pt[0].x++; 81 pt[0].x++;
… …
85 pt[1].y++; 84 pt[1].y++;
86 } else { 85 } else {
87 pt[0].y++; 86 pt[0].y++;
88 pt[1].y--; 87 pt[1].y--;
89 } 88 }
90 XDrawLine(R->Xdisplay, R->scrollBar.win, top, 89 XDrawLine(Xdisplay, scrollBar.win, top,
91 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 90 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
92#endif 91#endif
93/* draw shadow on right */ 92/* draw shadow on right */
94 pt[1].x = x + sz - 1; 93 pt[1].x = x + sz - 1;
95/* pt[2].x = x + sz2; */ 94/* pt[2].x = x + sz2; */
96 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 95 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
97 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 96 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
98 XDrawLine(R->Xdisplay, R->scrollBar.win, bot, 97 XDrawLine(Xdisplay, scrollBar.win, bot,
99 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 98 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
100#if (SHADOW > 1) 99#if (SHADOW > 1)
101/* doubled */ 100/* doubled */
102 pt[1].x--; 101 pt[1].x--;
103 if (dirn == UP) { 102 if (dirn == UP) {
… …
105 pt[1].y--; 104 pt[1].y--;
106 } else { 105 } else {
107 pt[2].y--; 106 pt[2].y--;
108 pt[1].y++; 107 pt[1].y++;
109 } 108 }
110 XDrawLine(R->Xdisplay, R->scrollBar.win, bot, 109 XDrawLine(Xdisplay, scrollBar.win, bot,
111 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 110 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
112#endif 111#endif
113} 112}
114 113
115/* EXTPROTO */
116int 114int
117rxvt_scrollbar_show_rxvt(pR_ int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 115rxvt_term::scrollbar_show_rxvt (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
118{ 116{
119 int sbshadow = R->sb_shadow; 117 int sbshadow = sb_shadow;
120 int sbwidth = (int)R->scrollBar.width; 118 int sbwidth = (int)scrollBar.width;
121 119
122 if ((R->scrollBar.init & R_SB_RXVT) == 0) { 120 if ((scrollBar.init & R_SB_RXVT) == 0) {
123 XGCValues gcvalue; 121 XGCValues gcvalue;
124 122
125 R->scrollBar.init |= R_SB_RXVT; 123 scrollBar.init |= R_SB_RXVT;
126 gcvalue.foreground = R->PixColors[Color_trough]; 124 gcvalue.foreground = PixColors[Color_trough];
127 if (sbshadow) { 125 if (sbshadow) {
128 XSetWindowBackground(R->Xdisplay, R->scrollBar.win, 126 XSetWindowBackground(Xdisplay, scrollBar.win,
129 gcvalue.foreground); 127 gcvalue.foreground);
130 XClearWindow(R->Xdisplay, R->scrollBar.win); 128 XClearWindow(Xdisplay, scrollBar.win);
131 } 129 }
132 } else { 130 } else {
133/* instead of XClearWindow (R->Xdisplay, R->scrollBar.win); */ 131/* instead of XClearWindow (Xdisplay, scrollBar.win); */
134 if (last_top < R->scrollBar.top) 132 if (last_top < scrollBar.top)
135 XClearArea(R->Xdisplay, R->scrollBar.win, 133 XClearArea(Xdisplay, scrollBar.win,
136 sbshadow, last_top, 134 sbshadow, last_top,
137 sbwidth, (R->scrollBar.top - last_top), 135 sbwidth, (scrollBar.top - last_top),
138 False); 136 False);
139 137
140 if (R->scrollBar.bot < last_bot) 138 if (scrollBar.bot < last_bot)
141 XClearArea(R->Xdisplay, R->scrollBar.win, 139 XClearArea(Xdisplay, scrollBar.win,
142 sbshadow, R->scrollBar.bot, 140 sbshadow, scrollBar.bot,
143 sbwidth, (last_bot - R->scrollBar.bot), 141 sbwidth, (last_bot - scrollBar.bot),
144 False); 142 False);
145 } 143 }
146 144
147/* scrollbar slider */ 145/* scrollbar slider */
148#ifdef SB_BORDER 146#ifdef SB_BORDER
149 { 147 {
150 int xofs; 148 int xofs;
151 149
152 if (R->Options & Opt_scrollBar_right) 150 if (Options & Opt_scrollBar_right)
153 xofs = 0; 151 xofs = 0;
154 else 152 else
155 xofs = sbshadow ? sbwidth : sbwidth - 1; 153 xofs = sbshadow ? sbwidth : sbwidth - 1;
156 154
157 XDrawLine(R->Xdisplay, R->scrollBar.win, R->botShadowGC, 155 XDrawLine(Xdisplay, scrollBar.win, botShadowGC,
158 xofs, 0, xofs, R->scrollBar.end + sbwidth); 156 xofs, 0, xofs, scrollBar.end + sbwidth);
159 } 157 }
160#endif 158#endif
161 XFillRectangle(R->Xdisplay, R->scrollBar.win, R->scrollbarGC, 159 XFillRectangle(Xdisplay, scrollBar.win, scrollbarGC,
162 sbshadow, R->scrollBar.top, sbwidth, 160 sbshadow, scrollBar.top, sbwidth,
163 scrollbar_len); 161 scrollbar_len);
164 162
165 if (sbshadow) 163 if (sbshadow)
166 /* trough shadow */ 164 /* trough shadow */
167 rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win, 165 rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
168 R->botShadowGC, R->topShadowGC, 166 botShadowGC, topShadowGC,
169 0, 0, 167 0, 0,
170 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */ 168 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
171 R->scrollBar.end + (sbwidth + 1) + sbshadow); 169 scrollBar.end + (sbwidth + 1) + sbshadow);
172/* shadow for scrollbar slider */ 170/* shadow for scrollbar slider */
173 rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win, 171 rxvt_Draw_Shadow(Xdisplay, scrollBar.win,
174 R->topShadowGC, R->botShadowGC, 172 topShadowGC, botShadowGC,
175 sbshadow, R->scrollBar.top, sbwidth, 173 sbshadow, scrollBar.top, sbwidth,
176 scrollbar_len); 174 scrollbar_len);
177 175
178/* 176/*
179 * Redraw scrollbar arrows 177 * Redraw scrollbar arrows
180 */ 178 */
181 rxvt_Draw_button(aR_ sbshadow, sbshadow, 179 Draw_button (sbshadow, sbshadow,
182 (scrollbar_isUp() ? -1 : +1), UP); 180 (scrollbar_isUp() ? -1 : +1), UP);
183 rxvt_Draw_button(aR_ sbshadow, (R->scrollBar.end + 1), 181 Draw_button (sbshadow, (scrollBar.end + 1),
184 (scrollbar_isDn() ? -1 : +1), DN); 182 (scrollbar_isDn() ? -1 : +1), DN);
185 return 1; 183 return 1;
186} 184}
187#endif /* RXVT_SCROLLBAR */ 185#endif /* RXVT_SCROLLBAR */
188/*----------------------- end-of-file (C source) -----------------------*/ 186/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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