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.10 by pcg, Wed Mar 17 03:47:14 2004 UTC vs.
Revision 1.27 by root, Wed Jan 4 04:42:45 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xpm.c 2 * File: xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xpm.C,v 1.10 2004/03/17 03:47:14 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
8 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
9 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
25 24
26#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
28#include "xpm.intpro" /* PROTOS for internal routines */
29 27
30#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);
31 31
32/* 32/*
33 * These GEOM strings indicate absolute size/position: 33 * These GEOM strings indicate absolute size/position:
34 * @ `WxH+X+Y' 34 * @ `WxH+X+Y'
35 * @ `WxH+X' -> Y = X 35 * @ `WxH+X' -> Y = X
… …
62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")
63 63
64 if (geom == NULL) 64 if (geom == NULL)
65 return 0; 65 return 0;
66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);
67 if (!STRCMP (geom, "?")) 67 if (!strcmp (geom, "?"))
68 { 68 {
69 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 69 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999), 70 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999),
71 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999)); 71 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999));
72 xterm_seq (XTerm_title, str, CHAR_ST); 72 process_xterm_seq (XTerm_title, str, CHAR_ST);
73 free (str); 73 free (str);
74 return 0; 74 return 0;
75 } 75 }
76 76
77 if ((p = STRCHR (geom, ';')) == NULL) 77 if ((p = strchr (geom, ';')) == NULL)
78 p = STRCHR (geom, '\0'); 78 p = strchr (geom, '\0');
79 n = (p - geom); 79 n = (p - geom);
80 if (n <= MAXLEN_GEOM) 80 if (n <= MAXLEN_GEOM)
81 { 81 {
82 STRNCPY (str, geom, n); 82 strncpy (str, geom, n);
83 str[n] = '\0'; 83 str[n] = '\0';
84 84
85 flags = XParseGeometry (str, &x, &y, &w, &h); 85 flags = XParseGeometry (str, &x, &y, &w, &h);
86 if (!flags) 86 if (!flags)
87 { 87 {
… …
136 if (flags & XNegative) 136 if (flags & XNegative)
137 x += 100; 137 x += 100;
138 if (flags & YNegative) 138 if (flags & YNegative)
139 y += 100; 139 y += 100;
140 } 140 }
141 MIN_IT (x, 100); 141 min_it (x, 100);
142 MIN_IT (y, 100); 142 min_it (y, 100);
143 MAX_IT (x, 0); 143 max_it (x, 0);
144 MAX_IT (y, 0); 144 max_it (y, 0);
145 if (bgpixmap->x != x) 145 if (bgpixmap->x != x)
146 { 146 {
147 bgpixmap->x = x; 147 bgpixmap->x = x;
148 changed++; 148 changed++;
149 } 149 }
… …
158} 158}
159 159
160void 160void
161rxvt_term::resize_pixmap () 161rxvt_term::resize_pixmap ()
162{ 162{
163 XGCValues gcvalue; 163 XGCValues gcvalue;
164 GC gc; 164 GC gc;
165 unsigned int width = TermWin_TotalWidth (); 165 dDisp;
166 unsigned int height = TermWin_TotalHeight ();
167 166
168 if (TermWin.pixmap != None) 167 if (pixmap != None)
169 XFreePixmap (display->display, TermWin.pixmap); 168 XFreePixmap (disp, pixmap);
170 169
171 if (bgPixmap.pixmap == None) 170 if (bgPixmap.pixmap == None)
172 { /* So be it: I'm not using pixmaps */ 171 { /* So be it: I'm not using pixmaps */
173 TermWin.pixmap = None; 172 pixmap = None;
173
174 if (! (Options & Opt_transparent) || am_transparent == 0) 174 if (!OPTION (Opt_transparent) || !am_transparent)
175 XSetWindowBackground (display->display, TermWin.vt, 175 XSetWindowBackground (disp, vt, pix_colors[Color_bg]);
176 PixColors[Color_bg]); 176
177 return; 177 return;
178 } 178 }
179 179
180 gcvalue.foreground = PixColors[Color_bg]; 180 gcvalue.foreground = pix_colors[Color_bg];
181 gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 181 gc = XCreateGC (disp, vt, GCForeground, &gcvalue);
182 182
183 if (bgPixmap.pixmap != None) 183 if (bgPixmap.pixmap != None)
184 { /* we have a specified pixmap */ 184 { /* we have a specified pixmap */
185 unsigned int w = bgPixmap.w, h = bgPixmap.h, 185 unsigned int w = bgPixmap.w, h = bgPixmap.h,
186 x = bgPixmap.x, y = bgPixmap.y; 186 x = bgPixmap.x, y = bgPixmap.y;
187 unsigned int xpmh = xpmAttr.height, 187 unsigned int xpmh = xpmAttr.height,
188 xpmw = xpmAttr.width; 188 xpmw = xpmAttr.width;
189 189
190 /* 190 /*
191 * don't zoom pixmap too much nor expand really small pixmaps 191 * don't zoom pixmap too much nor expand really small pixmaps
192 */ 192 */
193 if (w > 1000 || h > 1000) 193 if (w > 1000 || h > 1000)
… …
197 w = 0; /* tile */ 197 w = 0; /* tile */
198 198
199 if (w == 0) 199 if (w == 0)
200 { 200 {
201 /* basic X tiling - let the X server do it */ 201 /* basic X tiling - let the X server do it */
202 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 202 pixmap = XCreatePixmap (disp, vt, xpmw, xpmh,
203 xpmw, xpmh,
204 (unsigned int)XDEPTH); 203 (unsigned int)display->depth);
205 XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc, 204 XCopyArea (disp, bgPixmap.pixmap, pixmap, gc,
206 0, 0, xpmw, xpmh, 0, 0); 205 0, 0, xpmw, xpmh, 0, 0);
207 } 206 }
208 else 207 else
209 { 208 {
210 float incr, p; 209 float incr, p;
211 Pixmap tmp; 210 Pixmap tmp;
212 211
213 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 212 pixmap = XCreatePixmap (disp, vt, width, height,
214 width, height,
215 (unsigned int)XDEPTH); 213 (unsigned int)display->depth);
216 /* 214 /*
217 * horizontal scaling 215 * horizontal scaling
218 */ 216 */
219 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 217 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
220 218
221 tmp = XCreatePixmap (display->display, TermWin.vt, 219 tmp = XCreatePixmap (disp, vt, width, xpmh, (unsigned int)display->depth);
222 width, xpmh, (unsigned int)XDEPTH);
223 XFillRectangle (display->display, tmp, gc, 0, 0, width, 220 XFillRectangle (disp, tmp, gc, 0, 0, width, xpmh);
224 xpmh);
225 221
226 for ( /*nil */ ; x < w; x++, p += incr) 222 for ( /*nil */ ; x < w; x++, p += incr)
227 { 223 {
228 if (p >= xpmw) 224 if (p >= xpmw)
229 p = 0; 225 p = 0;
230 /* copy one column from the original pixmap to the tmp pixmap */ 226 /* copy one column from the original pixmap to the tmp pixmap */
231 XCopyArea (display->display, bgPixmap.pixmap, tmp, gc, 227 XCopyArea (disp, bgPixmap.pixmap, tmp, gc,
232 (int)p, 0, 1, xpmh, (int)x, 0); 228 (int)p, 0, 1, xpmh, (int)x, 0);
233 } 229 }
234 230
235 /* 231 /*
236 * vertical scaling 232 * vertical scaling
237 */ 233 */
238 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 234 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
239 235
240 if (y > 0) 236 if (y > 0)
241 XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width, 237 XFillRectangle (disp, pixmap, gc, 0, 0, width, y);
242 y); 238
243 if (h < height) 239 if (h < height)
244 XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h, 240 XFillRectangle (disp, pixmap, gc, 0, (int)h, width, height - h + 1);
245 width, height - h + 1); 241
246 for ( /*nil */ ; y < h; y++, p += incr) 242 for ( /*nil */ ; y < h; y++, p += incr)
247 { 243 {
248 if (p >= xpmh) 244 if (p >= xpmh)
249 p = 0; 245 p = 0;
246
250 /* copy one row from the tmp pixmap to the main pixmap */ 247 /* copy one row from the tmp pixmap to the main pixmap */
251 XCopyArea (display->display, tmp, TermWin.pixmap, gc, 248 XCopyArea (disp, tmp, pixmap, gc,
252 0, (int)p, width, 1, 0, (int)y); 249 0, (int)p, width, 1, 0, (int)y);
253 } 250 }
251
254 XFreePixmap (display->display, tmp); 252 XFreePixmap (disp, tmp);
255 } 253 }
256 } 254 }
255
257 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 256 XSetWindowBackgroundPixmap (disp, vt, pixmap);
258 XFreeGC (display->display, gc); 257 XFreeGC (disp, gc);
259 am_transparent = 0; 258 am_transparent = 0;
260
261 XClearWindow (display->display, TermWin.vt);
262
263 XSync (display->display, False);
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 }
349
355 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 350 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
356 351
357 if (*file != '\0') 352 if (*file != '\0')
358 { 353 {
359 /* XWindowAttributes attr; */ 354 /* XWindowAttributes attr; */
360 355
361 /* 356 /*
362 * we already have the required attributes 357 * we already have the required attributes
363 */ 358 */
364 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */ 359 /* XGetWindowAttributes (display->display, vt, &attr); */
365 360
366 xpmAttr.closeness = 30000; 361 xpmAttr.closeness = 30000;
367 xpmAttr.colormap = XCMAP; 362 xpmAttr.colormap = display->cmap;
368 xpmAttr.visual = XVISUAL; 363 xpmAttr.visual = display->visual;
369 xpmAttr.depth = XDEPTH; 364 xpmAttr.depth = display->depth;
370 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 365 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual |
371 XpmDepth | XpmSize | XpmReturnPixels); 366 XpmDepth | XpmSize | XpmReturnPixels);
372 367
373 /* search environment variables here too */ 368 /* search environment variables here too */
374 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 369 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
… …
378 &xpmAttr)) 373 &xpmAttr))
379 { 374 {
380 char *p; 375 char *p;
381 376
382 /* semi-colon delimited */ 377 /* semi-colon delimited */
383 if ((p = STRCHR (file, ';')) == NULL) 378 if ((p = strchr (file, ';')) == NULL)
384 p = STRCHR (file, '\0'); 379 p = strchr (file, '\0');
385 380
386 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.", (p - file), file); 381 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
387 } 382 }
388 383
389 free (f); 384 free (f);
390 } 385 }
391 386

Diff Legend

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