ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.20 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.27 by root, Wed Jan 4 04:42:45 2006 UTC

… …
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
27#include "xpm.intpro" /* PROTOS for internal routines */
28 27
29#ifdef XPM_BACKGROUND 28#ifdef XPM_BACKGROUND
29
30static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight);
30 31
31/* 32/*
32 * These GEOM strings indicate absolute size/position: 33 * These GEOM strings indicate absolute size/position:
33 * @ `WxH+X+Y' 34 * @ `WxH+X+Y'
34 * @ `WxH+X' -> Y = X 35 * @ `WxH+X' -> Y = X
… …
135 if (flags & XNegative) 136 if (flags & XNegative)
136 x += 100; 137 x += 100;
137 if (flags & YNegative) 138 if (flags & YNegative)
138 y += 100; 139 y += 100;
139 } 140 }
140 MIN_IT (x, 100); 141 min_it (x, 100);
141 MIN_IT (y, 100); 142 min_it (y, 100);
142 MAX_IT (x, 0); 143 max_it (x, 0);
143 MAX_IT (y, 0); 144 max_it (y, 0);
144 if (bgpixmap->x != x) 145 if (bgpixmap->x != x)
145 { 146 {
146 bgpixmap->x = x; 147 bgpixmap->x = x;
147 changed++; 148 changed++;
148 } 149 }
… …
157} 158}
158 159
159void 160void
160rxvt_term::resize_pixmap () 161rxvt_term::resize_pixmap ()
161{ 162{
162 XGCValues gcvalue; 163 XGCValues gcvalue;
163 GC gc; 164 GC gc;
164 unsigned int width = TermWin_TotalWidth (); 165 dDisp;
165 unsigned int height = TermWin_TotalHeight ();
166 166
167 if (TermWin.pixmap != None) 167 if (pixmap != None)
168 XFreePixmap (display->display, TermWin.pixmap); 168 XFreePixmap (disp, pixmap);
169 169
170 if (bgPixmap.pixmap == None) 170 if (bgPixmap.pixmap == None)
171 { /* So be it: I'm not using pixmaps */ 171 { /* So be it: I'm not using pixmaps */
172 TermWin.pixmap = None; 172 pixmap = None;
173 173
174 if (!(options & Opt_transparent) || !am_transparent) 174 if (!OPTION (Opt_transparent) || !am_transparent)
175 XSetWindowBackground (display->display, TermWin.vt, 175 XSetWindowBackground (disp, vt, pix_colors[Color_bg]);
176 pix_colors[Color_bg]);
177 176
178 return; 177 return;
179 } 178 }
180 179
181 gcvalue.foreground = pix_colors[Color_bg]; 180 gcvalue.foreground = pix_colors[Color_bg];
182 gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 181 gc = XCreateGC (disp, vt, GCForeground, &gcvalue);
183 182
184 if (bgPixmap.pixmap != None) 183 if (bgPixmap.pixmap != None)
185 { /* we have a specified pixmap */ 184 { /* we have a specified pixmap */
186 unsigned int w = bgPixmap.w, h = bgPixmap.h, 185 unsigned int w = bgPixmap.w, h = bgPixmap.h,
187 x = bgPixmap.x, y = bgPixmap.y; 186 x = bgPixmap.x, y = bgPixmap.y;
… …
198 w = 0; /* tile */ 197 w = 0; /* tile */
199 198
200 if (w == 0) 199 if (w == 0)
201 { 200 {
202 /* basic X tiling - let the X server do it */ 201 /* basic X tiling - let the X server do it */
203 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 202 pixmap = XCreatePixmap (disp, vt, xpmw, xpmh,
204 xpmw, xpmh,
205 (unsigned int)display->depth); 203 (unsigned int)display->depth);
206 XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc, 204 XCopyArea (disp, bgPixmap.pixmap, pixmap, gc,
207 0, 0, xpmw, xpmh, 0, 0); 205 0, 0, xpmw, xpmh, 0, 0);
208 } 206 }
209 else 207 else
210 { 208 {
211 float incr, p; 209 float incr, p;
212 Pixmap tmp; 210 Pixmap tmp;
213 211
214 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 212 pixmap = XCreatePixmap (disp, vt, width, height,
215 width, height,
216 (unsigned int)display->depth); 213 (unsigned int)display->depth);
217 /* 214 /*
218 * horizontal scaling 215 * horizontal scaling
219 */ 216 */
220 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 217 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
221 218
222 tmp = XCreatePixmap (display->display, TermWin.vt, 219 tmp = XCreatePixmap (disp, vt, width, xpmh, (unsigned int)display->depth);
223 width, xpmh, (unsigned int)display->depth);
224 XFillRectangle (display->display, tmp, gc, 0, 0, width, 220 XFillRectangle (disp, tmp, gc, 0, 0, width, xpmh);
225 xpmh);
226 221
227 for ( /*nil */ ; x < w; x++, p += incr) 222 for ( /*nil */ ; x < w; x++, p += incr)
228 { 223 {
229 if (p >= xpmw) 224 if (p >= xpmw)
230 p = 0; 225 p = 0;
231 /* copy one column from the original pixmap to the tmp pixmap */ 226 /* copy one column from the original pixmap to the tmp pixmap */
232 XCopyArea (display->display, bgPixmap.pixmap, tmp, gc, 227 XCopyArea (disp, bgPixmap.pixmap, tmp, gc,
233 (int)p, 0, 1, xpmh, (int)x, 0); 228 (int)p, 0, 1, xpmh, (int)x, 0);
234 } 229 }
235 230
236 /* 231 /*
237 * vertical scaling 232 * vertical scaling
238 */ 233 */
239 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 234 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
240 235
241 if (y > 0) 236 if (y > 0)
242 XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width, y); 237 XFillRectangle (disp, pixmap, gc, 0, 0, width, y);
243 238
244 if (h < height) 239 if (h < height)
245 XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h, width, height - h + 1); 240 XFillRectangle (disp, pixmap, gc, 0, (int)h, width, height - h + 1);
246 241
247 for ( /*nil */ ; y < h; y++, p += incr) 242 for ( /*nil */ ; y < h; y++, p += incr)
248 { 243 {
249 if (p >= xpmh) 244 if (p >= xpmh)
250 p = 0; 245 p = 0;
251 246
252 /* copy one row from the tmp pixmap to the main pixmap */ 247 /* copy one row from the tmp pixmap to the main pixmap */
253 XCopyArea (display->display, tmp, TermWin.pixmap, gc, 248 XCopyArea (disp, tmp, pixmap, gc,
254 0, (int)p, width, 1, 0, (int)y); 249 0, (int)p, width, 1, 0, (int)y);
255 } 250 }
256 251
257 XFreePixmap (display->display, tmp); 252 XFreePixmap (disp, tmp);
258 } 253 }
259 } 254 }
260 255
261 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 256 XSetWindowBackgroundPixmap (disp, vt, pixmap);
262 XFreeGC (display->display, gc); 257 XFreeGC (disp, gc);
263 am_transparent = 0; 258 am_transparent = 0;
264} 259}
265 260
266/* 261/*
267 * Calculate tiling sizes and increments 262 * Calculate tiling sizes and increments
268 * At start, p == 0, incr == xpmwidthheight 263 * At start, p == 0, incr == xpmwidthheight
269 */ 264 */
270/* INTPROTO */
271static void 265static void
272rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 266rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
273{ 267{
274 unsigned int cwh, cxy; 268 unsigned int cwh, cxy;
275 float cincr, cp; 269 float cincr, cp;
… …
341} 335}
342 336
343Pixmap 337Pixmap
344rxvt_term::set_bgPixmap (const char *file) 338rxvt_term::set_bgPixmap (const char *file)
345{ 339{
346 char *f; 340 char *f;
347 341
348 assert (file != NULL); 342 assert (file != NULL);
349 343
350 if (bgPixmap.pixmap != None) 344 if (bgPixmap.pixmap != None)
351 { 345 {
352 XFreePixmap (display->display, bgPixmap.pixmap); 346 XFreePixmap (display->display, bgPixmap.pixmap);
353 bgPixmap.pixmap = None; 347 bgPixmap.pixmap = None;
354 } 348 }
355 349
356 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 350 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
357 351
358 if (*file != '\0') 352 if (*file != '\0')
359 { 353 {
360 /* XWindowAttributes attr; */ 354 /* XWindowAttributes attr; */
361 355
362 /* 356 /*
363 * we already have the required attributes 357 * we already have the required attributes
364 */ 358 */
365 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */ 359 /* XGetWindowAttributes (display->display, vt, &attr); */
366 360
367 xpmAttr.closeness = 30000; 361 xpmAttr.closeness = 30000;
368 xpmAttr.colormap = display->cmap; 362 xpmAttr.colormap = display->cmap;
369 xpmAttr.visual = display->visual; 363 xpmAttr.visual = display->visual;
370 xpmAttr.depth = display->depth; 364 xpmAttr.depth = display->depth;

Diff Legend

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