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.19 by root, Mon Aug 23 18:48:03 2004 UTC vs.
Revision 1.33 by root, Mon Feb 20 22:40:35 2006 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
9 * 10 *
10 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
24 25
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27#include "xpm.intpro" /* PROTOS for internal routines */
28 28
29#ifdef XPM_BACKGROUND 29#ifdef XPM_BACKGROUND
30
31static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight);
30 32
31/* 33/*
32 * These GEOM strings indicate absolute size/position: 34 * These GEOM strings indicate absolute size/position:
33 * @ `WxH+X+Y' 35 * @ `WxH+X+Y'
34 * @ `WxH+X' -> Y = X 36 * @ `WxH+X' -> Y = X
… …
49 * @ `?' 51 * @ `?'
50 */ 52 */
51int 53int
52rxvt_term::scale_pixmap (const char *geom) 54rxvt_term::scale_pixmap (const char *geom)
53{ 55{
54 int flags, changed = 0; 56 int flags, changed = 0;
55 int x = 0, y = 0; 57 int x = 0, y = 0;
56 unsigned int w = 0, h = 0; 58 unsigned int w = 0, h = 0;
57 unsigned int n; 59 unsigned int n;
58 char *p, *str; 60 char *p;
59 bgPixmap_t *bgpixmap = & (bgPixmap); 61 bgPixmap_t *bgpixmap = & (bgPixmap);
60 62
61#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
62 64
63 if (geom == NULL) 65 if (geom == NULL)
64 return 0; 66 return 0;
65 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 67
68 char str[MAXLEN_GEOM];
69
66 if (!strcmp (geom, "?")) 70 if (!strcmp (geom, "?"))
67 { 71 {
68 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
69 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999), 73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
70 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999)); 74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
71 process_xterm_seq (XTerm_title, str, CHAR_ST); 75 process_xterm_seq (XTerm_title, str, CHAR_ST);
72 free (str);
73 return 0; 76 return 0;
74 } 77 }
75 78
76 if ((p = strchr (geom, ';')) == NULL) 79 if ((p = strchr (geom, ';')) == NULL)
77 p = strchr (geom, '\0'); 80 p = strchr (geom, '\0');
81
78 n = (p - geom); 82 n = (p - geom);
79 if (n <= MAXLEN_GEOM) 83 if (n <= MAXLEN_GEOM)
80 { 84 {
81 strncpy (str, geom, n); 85 strncpy (str, geom, n);
82 str[n] = '\0'; 86 str[n] = '\0';
83 87
84 flags = XParseGeometry (str, &x, &y, &w, &h); 88 flags = XParseGeometry (str, &x, &y, &w, &h);
89
85 if (!flags) 90 if (!flags)
86 { 91 {
87 flags |= WidthValue; 92 flags |= WidthValue;
88 w = 0; 93 w = 0;
89 } /* default is tile */ 94 } /* default is tile */
95
90 if (flags & WidthValue) 96 if (flags & WidthValue)
91 { 97 {
92 if (! (flags & XValue)) 98 if (!(flags & XValue))
93 x = 50; 99 x = 50;
100
94 if (! (flags & HeightValue)) 101 if (!(flags & HeightValue))
95 h = w; 102 h = w;
103
96 if (w && !h) 104 if (w && !h)
97 { 105 {
98 w = (bgpixmap->w * w) / 100; 106 w = (bgpixmap->w * w) / 100;
99 h = bgpixmap->h; 107 h = bgpixmap->h;
100 } 108 }
101 else if (h && !w) 109 else if (h && !w)
102 { 110 {
103 w = bgpixmap->w; 111 w = bgpixmap->w;
104 h = (bgpixmap->h * h) / 100; 112 h = (bgpixmap->h * h) / 100;
105 } 113 }
106 if (w > 1000) 114
107 w = 1000; 115 min_it (w, 32767);
108 if (h > 1000) 116 min_it (h, 32767);
109 h = 1000; 117
110 if (bgpixmap->w != (short)w) 118 if (bgpixmap->w != (short)w)
111 { 119 {
112 bgpixmap->w = (short)w; 120 bgpixmap->w = (short)w;
113 changed++; 121 changed++;
114 } 122 }
123
115 if (bgpixmap->h != (short)h) 124 if (bgpixmap->h != (short)h)
116 { 125 {
117 bgpixmap->h = (short)h; 126 bgpixmap->h = (short)h;
118 changed++; 127 changed++;
119 } 128 }
120 } 129 }
130
121 if (! (flags & YValue)) 131 if (!(flags & YValue))
122 { 132 {
123 if (flags & XNegative) 133 if (flags & XNegative)
124 flags |= YNegative; 134 flags |= YNegative;
135
125 y = x; 136 y = x;
126 } 137 }
127 138
128 if (! (flags & WidthValue) && geom[0] != '=') 139 if (!(flags & WidthValue) && geom[0] != '=')
129 { 140 {
130 x += bgpixmap->x; 141 x += bgpixmap->x;
131 y += bgpixmap->y; 142 y += bgpixmap->y;
132 } 143 }
133 else 144
134 { 145 if (xpmAttr.width && xpmAttr.height)
135 if (flags & XNegative)
136 x += 100;
137 if (flags & YNegative)
138 y += 100;
139 } 146 {
140 MIN_IT (x, 100); 147 x = MOD(x, xpmAttr.width);
141 MIN_IT (y, 100); 148 y = MOD(y, xpmAttr.height);
142 MAX_IT (x, 0); 149 }
143 MAX_IT (y, 0); 150
144 if (bgpixmap->x != x) 151 if (bgpixmap->x != x)
145 { 152 {
146 bgpixmap->x = x; 153 bgpixmap->x = x;
147 changed++; 154 changed++;
148 } 155 }
156
149 if (bgpixmap->y != y) 157 if (bgpixmap->y != y)
150 { 158 {
151 bgpixmap->y = y; 159 bgpixmap->y = y;
152 changed++; 160 changed++;
153 } 161 }
154 } 162 }
155 free (str); 163
156 return changed; 164 return changed;
157} 165}
158 166
159void 167void
160rxvt_term::resize_pixmap () 168rxvt_term::resize_pixmap ()
161{ 169{
162 XGCValues gcvalue; 170 XGCValues gcvalue;
163 GC gc; 171 GC gc;
164 unsigned int width = TermWin_TotalWidth ();
165 unsigned int height = TermWin_TotalHeight ();
166 172
167 if (TermWin.pixmap != None) 173 if (pixmap != None)
168 XFreePixmap (display->display, TermWin.pixmap); 174 XFreePixmap (dpy, pixmap);
169 175
170 if (bgPixmap.pixmap == None) 176 if (bgPixmap.pixmap == None)
171 { /* So be it: I'm not using pixmaps */ 177 { /* So be it: I'm not using pixmaps */
172 TermWin.pixmap = None; 178 pixmap = None;
179
173 if (! (options & Opt_transparent) || am_transparent == 0) 180 if (!OPTION (Opt_transparent) || !am_transparent)
174 XSetWindowBackground (display->display, TermWin.vt, 181 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
175 pix_colors[Color_bg]); 182
176 return; 183 return;
177 } 184 }
178 185
179 gcvalue.foreground = pix_colors[Color_bg]; 186 gcvalue.foreground = pix_colors[Color_bg];
180 gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 187 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
181 188
182 if (bgPixmap.pixmap != None) 189 if (bgPixmap.pixmap != None)
183 { /* we have a specified pixmap */ 190 { /* we have a specified pixmap */
184 unsigned int w = bgPixmap.w, h = bgPixmap.h, 191 unsigned int w = bgPixmap.w, h = bgPixmap.h,
185 x = bgPixmap.x, y = bgPixmap.y; 192 x = bgPixmap.x, y = bgPixmap.y;
186 unsigned int xpmh = xpmAttr.height, 193 unsigned int xpmh = xpmAttr.height,
187 xpmw = xpmAttr.width; 194 xpmw = xpmAttr.width;
188 195
189 /* 196 /*
190 * don't zoom pixmap too much nor expand really small pixmaps 197 * don't zoom pixmap too much nor expand really small pixmaps
191 */ 198 */
192 if (w > 1000 || h > 1000) 199 if (w > 32767 || h > 32767)
193 w = 1; 200 w = 1;
194 else if (width > (10 * xpmw) 201 else if (width > (10 * xpmw)
195 || height > (10 * xpmh)) 202 || height > (10 * xpmh))
196 w = 0; /* tile */ 203 w = 0; /* tile */
197 204
198 if (w == 0) 205 if (!w)
199 { 206 {
200 /* basic X tiling - let the X server do it */ 207 /* basic X tiling - let the X server do it */
201 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 208 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
202 xpmw, xpmh, 209
203 (unsigned int)display->depth); 210 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
204 XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc, 211 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
205 0, 0, xpmw, xpmh, 0, 0); 212 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
213 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
206 } 214 }
207 else 215 else
208 { 216 {
209 float incr, p; 217 float incr, p;
210 Pixmap tmp; 218 Pixmap tmp;
211 219
212 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 220 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
213 width, height,
214 (unsigned int)display->depth);
215 /* 221 /*
216 * horizontal scaling 222 * horizontal scaling
217 */ 223 */
218 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 224 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
219 225
220 tmp = XCreatePixmap (display->display, TermWin.vt, 226 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
221 width, xpmh, (unsigned int)display->depth);
222 XFillRectangle (display->display, tmp, gc, 0, 0, width, 227 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
223 xpmh);
224 228
225 for ( /*nil */ ; x < w; x++, p += incr) 229 for ( /*nil */ ; x < w; x++, p += incr)
226 { 230 {
227 if (p >= xpmw) 231 if (p >= xpmw)
228 p = 0; 232 p = 0;
233
229 /* copy one column from the original pixmap to the tmp pixmap */ 234 /* copy one column from the original pixmap to the tmp pixmap */
230 XCopyArea (display->display, bgPixmap.pixmap, tmp, gc, 235 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
231 (int)p, 0, 1, xpmh, (int)x, 0);
232 } 236 }
233 237
234 /* 238 /*
235 * vertical scaling 239 * vertical scaling
236 */ 240 */
237 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 241 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
238 242
239 if (y > 0) 243 if (y > 0)
240 XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width, 244 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
241 y); 245
242 if (h < height) 246 if (h < height)
243 XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h, 247 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
244 width, height - h + 1); 248
245 for ( /*nil */ ; y < h; y++, p += incr) 249 for ( /*nil */ ; y < h; y++, p += incr)
246 { 250 {
247 if (p >= xpmh) 251 if (p >= xpmh)
248 p = 0; 252 p = 0;
253
249 /* copy one row from the tmp pixmap to the main pixmap */ 254 /* copy one row from the tmp pixmap to the main pixmap */
250 XCopyArea (display->display, tmp, TermWin.pixmap, gc, 255 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
251 0, (int)p, width, 1, 0, (int)y);
252 } 256 }
257
253 XFreePixmap (display->display, tmp); 258 XFreePixmap (dpy, tmp);
254 } 259 }
255 } 260 }
256 261
257 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 262 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
263
258 XFreeGC (display->display, gc); 264 XFreeGC (dpy, gc);
259 am_transparent = 0; 265 am_transparent = 0;
260
261 XClearWindow (display->display, TermWin.vt);
262
263 XSync (display->display, False);
264} 266}
265 267
266/* 268/*
267 * Calculate tiling sizes and increments 269 * Calculate tiling sizes and increments
268 * At start, p == 0, incr == xpmwidthheight 270 * At start, p == 0, incr == xpmwidthheight
269 */ 271 */
270/* INTPROTO */
271static void 272static void
272rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 273rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
273{ 274{
274 unsigned int cwh, cxy; 275 unsigned int cwh, cxy;
275 float cincr, cp; 276 float cincr, cp;
… …
341} 342}
342 343
343Pixmap 344Pixmap
344rxvt_term::set_bgPixmap (const char *file) 345rxvt_term::set_bgPixmap (const char *file)
345{ 346{
346 char *f; 347 char *f;
347 348
348 assert (file != NULL); 349 assert (file != NULL);
349 350
350 if (bgPixmap.pixmap != None) 351 if (bgPixmap.pixmap != None)
351 { 352 {
352 XFreePixmap (display->display, bgPixmap.pixmap); 353 XFreePixmap (dpy, bgPixmap.pixmap);
353 bgPixmap.pixmap = None; 354 bgPixmap.pixmap = None;
354 } 355 }
355 356
356 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 357 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
357 358
358 if (*file != '\0') 359 if (*file != '\0')
359 { 360 {
360 /* XWindowAttributes attr; */ 361 /* XWindowAttributes attr; */
361 362
362 /* 363 /*
363 * we already have the required attributes 364 * we already have the required attributes
364 */ 365 */
365 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */ 366 /* XGetWindowAttributes (dpy, vt, &attr); */
366 367
367 xpmAttr.closeness = 30000; 368 xpmAttr.closeness = 30000;
368 xpmAttr.colormap = display->cmap; 369 xpmAttr.colormap = cmap;
369 xpmAttr.visual = display->visual; 370 xpmAttr.visual = visual;
370 xpmAttr.depth = display->depth; 371 xpmAttr.depth = depth;
371 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 372 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
372 XpmDepth | XpmSize | XpmReturnPixels); 373 | XpmDepth | XpmSize | XpmReturnPixels);
373 374
374 /* search environment variables here too */ 375 /* search environment variables here too */
375 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 376 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
376 if (f == NULL 377 if (f == NULL
377 || XpmReadFileToPixmap (display->display, display->root, f, 378 || XpmReadFileToPixmap (dpy, display->root, f,
378 &bgPixmap.pixmap, NULL, 379 &bgPixmap.pixmap, NULL,
379 &xpmAttr)) 380 &xpmAttr))
380 { 381 {
381 char *p; 382 char *p;
382 383
383 /* semi-colon delimited */ 384 /* semi-colon delimited */
384 if ((p = strchr (file, ';')) == NULL) 385 if ((p = strchr (file, ';')) == NULL)

Diff Legend

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