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.20 by root, Tue Jan 3 02:43:33 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
31/* draw triangular button with a shadow of SHADOW (1 or 2) pixels */ 30/* draw triangular button with a shadow of MENU_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 { 63 }
64 else
65 {
64 pt[0].y = pt[1].y = y; 66 pt[0].y = pt[1].y = y;
65 pt[2].y = y + sz - 1; 67 pt[2].y = y + sz - 1;
66 } 68 }
69
67 XFillPolygon(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC, 70 XFillPolygon (display->display, scrollBar.win, scrollbarGC,
68 pt, 3, Convex, CoordModeOrigin); 71 pt, 3, Convex, CoordModeOrigin);
69 72
70/* draw base */ 73 /* draw base */
71 XDrawLine(R->Xdisplay, R->scrollBar.win, (dirn == UP ? bot : top), 74 XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top),
72 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 75 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
73 76
74/* draw shadow on left */ 77 /* draw shadow on left */
75 pt[1].x = x + sz2 - 1; 78 pt[1].x = x + sz2 - 1;
76 pt[1].y = y + (dirn == UP ? 0 : sz - 1); 79 pt[1].y = y + (dirn == UP ? 0 : sz - 1);
77 XDrawLine(R->Xdisplay, R->scrollBar.win, top, 80 XDrawLine (display->display, scrollBar.win, top,
78 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 81 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
79 82
80#if (SHADOW > 1) 83#if (MENU_SHADOW > 1)
81/* doubled */ 84 /* doubled */
82 pt[0].x++; 85 pt[0].x++;
86
83 if (dirn == UP) { 87 if (dirn == UP)
84 pt[0].y--;
85 pt[1].y++;
86 } else {
87 pt[0].y++;
88 pt[1].y--;
89 } 88 {
89 pt[0].y--;
90 pt[1].y++;
91 }
92 else
93 {
94 pt[0].y++;
95 pt[1].y--;
96 }
97
90 XDrawLine(R->Xdisplay, R->scrollBar.win, top, 98 XDrawLine (display->display, scrollBar.win, top,
91 pt[0].x, pt[0].y, pt[1].x, pt[1].y); 99 pt[0].x, pt[0].y, pt[1].x, pt[1].y);
92#endif 100#endif
93/* draw shadow on right */ 101 /* draw shadow on right */
94 pt[1].x = x + sz - 1; 102 pt[1].x = x + sz - 1;
95/* pt[2].x = x + sz2; */ 103 /* pt[2].x = x + sz2; */
96 pt[1].y = y + (dirn == UP ? sz - 1 : 0); 104 pt[1].y = y + (dirn == UP ? sz - 1 : 0);
97 pt[2].y = y + (dirn == UP ? 0 : sz - 1); 105 pt[2].y = y + (dirn == UP ? 0 : sz - 1);
98 XDrawLine(R->Xdisplay, R->scrollBar.win, bot, 106 XDrawLine (display->display, scrollBar.win, bot,
99 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 107 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
108
100#if (SHADOW > 1) 109#if (MENU_SHADOW > 1)
101/* doubled */ 110 /* doubled */
102 pt[1].x--; 111 pt[1].x--;
103 if (dirn == UP) { 112 if (dirn == UP)
104 pt[2].y++;
105 pt[1].y--;
106 } else {
107 pt[2].y--;
108 pt[1].y++;
109 } 113 {
114 pt[2].y++;
115 pt[1].y--;
116 }
117 else
118 {
119 pt[2].y--;
120 pt[1].y++;
121 }
122
110 XDrawLine(R->Xdisplay, R->scrollBar.win, bot, 123 XDrawLine (display->display, scrollBar.win, bot,
111 pt[2].x, pt[2].y, pt[1].x, pt[1].y); 124 pt[2].x, pt[2].y, pt[1].x, pt[1].y);
112#endif 125#endif
113} 126}
114 127
115/* EXTPROTO */
116int 128int
117rxvt_scrollbar_show_rxvt(pR_ int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 129rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
118{ 130{
119 int sbshadow = R->sb_shadow; 131 int sbshadow = sb_shadow;
120 int sbwidth = (int)R->scrollBar.width; 132 int sbwidth = (int)scrollBar.width;
121 133
122 if ((R->scrollBar.init & R_SB_RXVT) == 0) { 134 if ((scrollBar.init & R_SB_RXVT) == 0)
123 XGCValues gcvalue; 135 {
124
125 R->scrollBar.init |= R_SB_RXVT; 136 scrollBar.init |= R_SB_RXVT;
126 gcvalue.foreground = R->PixColors[Color_trough]; 137
127 if (sbshadow) { 138 if (sbshadow)
128 XSetWindowBackground(R->Xdisplay, R->scrollBar.win, 139 {
129 gcvalue.foreground); 140 XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]);
141 XClearWindow (display->display, scrollBar.win);
142 }
143 }
144 else
145 {
146 if (update)
147 {
148 if (last_top < scrollBar.top)
149 XClearArea (display->display, scrollBar.win,
150 sbshadow, last_top,
151 sbwidth, (scrollBar.top - last_top),
152 False);
153
154 if (scrollBar.bot < last_bot)
155 XClearArea (display->display, scrollBar.win,
156 sbshadow, scrollBar.bot,
157 sbwidth, (last_bot - scrollBar.bot),
158 False);
159 }
160 else
130 XClearWindow(R->Xdisplay, R->scrollBar.win); 161 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 } 162 }
146 163
147/* scrollbar slider */ 164 /* scrollbar slider */
148#ifdef SB_BORDER 165#ifdef SB_BORDER
149 { 166 {
150 int xofs; 167 int xofs;
151 168
152 if (R->Options & Opt_scrollBar_right) 169 if (OPTION (Opt_scrollBar_right))
153 xofs = 0; 170 xofs = 0;
154 else 171 else
155 xofs = sbshadow ? sbwidth : sbwidth - 1; 172 xofs = sbshadow ? sbwidth : sbwidth - 1;
156 173
157 XDrawLine(R->Xdisplay, R->scrollBar.win, R->h->botShadowGC, 174 XDrawLine (display->display, scrollBar.win, botShadowGC,
158 xofs, 0, xofs, R->scrollBar.end + sbwidth); 175 xofs, 0, xofs, scrollBar.end + sbwidth);
159 } 176 }
160#endif 177#endif
178
161 XFillRectangle(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC, 179 XFillRectangle (display->display, scrollBar.win, scrollbarGC,
162 sbshadow, R->scrollBar.top, sbwidth, 180 sbshadow, scrollBar.top, sbwidth,
163 scrollbar_len); 181 scrollbar_len);
164 182
165 if (sbshadow) 183 if (sbshadow)
166 /* trough shadow */ 184 /* trough shadow */
167 rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win, 185 rxvt_Draw_Shadow (display->display, scrollBar.win,
168 R->h->botShadowGC, R->h->topShadowGC, 186 botShadowGC, topShadowGC,
169 0, 0, 187 0, 0,
170 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */ 188 sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
171 R->scrollBar.end + (sbwidth + 1) + sbshadow); 189 scrollBar.end + (sbwidth + 1) + sbshadow);
190
172/* shadow for scrollbar slider */ 191 /* shadow for scrollbar slider */
173 rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win, 192 rxvt_Draw_Shadow (display->display, scrollBar.win,
174 R->h->topShadowGC, R->h->botShadowGC, 193 topShadowGC, botShadowGC,
175 sbshadow, R->scrollBar.top, sbwidth, 194 sbshadow, scrollBar.top, sbwidth,
176 scrollbar_len); 195 scrollbar_len);
177 196
178/*
179 * Redraw scrollbar arrows 197 /* Redraw scrollbar arrows */
180 */ 198 Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
181 rxvt_Draw_button(aR_ sbshadow, sbshadow, 199 Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
182 (scrollbar_isUp() ? -1 : +1), UP); 200
183 rxvt_Draw_button(aR_ sbshadow, (R->scrollBar.end + 1),
184 (scrollbar_isDn() ? -1 : +1), DN);
185 return 1; 201 return 1;
186} 202}
187#endif /* RXVT_SCROLLBAR */ 203#endif /* RXVT_SCROLLBAR */
188/*----------------------- end-of-file (C source) -----------------------*/ 204/*----------------------- end-of-file (C source) -----------------------*/
205

Diff Legend

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