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

Diff Legend

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