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

Diff Legend

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