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

Diff Legend

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