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.26 by root, Sat Dec 31 17:16:17 2005 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.
… …
50 * @ `?' 51 * @ `?'
51 */ 52 */
52int 53int
53rxvt_term::scale_pixmap (const char *geom) 54rxvt_term::scale_pixmap (const char *geom)
54{ 55{
55 int flags, changed = 0; 56 int flags, changed = 0;
56 int x = 0, y = 0; 57 int x = 0, y = 0;
57 unsigned int w = 0, h = 0; 58 unsigned int w = 0, h = 0;
58 unsigned int n; 59 unsigned int n;
59 char *p, *str; 60 char *p;
60 bgPixmap_t *bgpixmap = & (bgPixmap); 61 bgPixmap_t *bgpixmap = & (bgPixmap);
61 62
62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
63 64
64 if (geom == NULL) 65 if (geom == NULL)
65 return 0; 66 return 0;
66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 67
68 char str[MAXLEN_GEOM];
69
67 if (!strcmp (geom, "?")) 70 if (!strcmp (geom, "?"))
68 { 71 {
69 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999), 73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
71 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999)); 74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
72 process_xterm_seq (XTerm_title, str, CHAR_ST); 75 process_xterm_seq (XTerm_title, str, CHAR_ST);
73 free (str);
74 return 0; 76 return 0;
75 } 77 }
76 78
77 if ((p = strchr (geom, ';')) == NULL) 79 if ((p = strchr (geom, ';')) == NULL)
78 p = strchr (geom, '\0'); 80 p = strchr (geom, '\0');
81
79 n = (p - geom); 82 n = (p - geom);
80 if (n <= MAXLEN_GEOM) 83 if (n <= MAXLEN_GEOM)
81 { 84 {
82 strncpy (str, geom, n); 85 strncpy (str, geom, n);
83 str[n] = '\0'; 86 str[n] = '\0';
84 87
85 flags = XParseGeometry (str, &x, &y, &w, &h); 88 flags = XParseGeometry (str, &x, &y, &w, &h);
89
86 if (!flags) 90 if (!flags)
87 { 91 {
88 flags |= WidthValue; 92 flags |= WidthValue;
89 w = 0; 93 w = 0;
90 } /* default is tile */ 94 } /* default is tile */
95
91 if (flags & WidthValue) 96 if (flags & WidthValue)
92 { 97 {
93 if (! (flags & XValue)) 98 if (!(flags & XValue))
94 x = 50; 99 x = 50;
100
95 if (! (flags & HeightValue)) 101 if (!(flags & HeightValue))
96 h = w; 102 h = w;
103
97 if (w && !h) 104 if (w && !h)
98 { 105 {
99 w = (bgpixmap->w * w) / 100; 106 w = (bgpixmap->w * w) / 100;
100 h = bgpixmap->h; 107 h = bgpixmap->h;
101 } 108 }
102 else if (h && !w) 109 else if (h && !w)
103 { 110 {
104 w = bgpixmap->w; 111 w = bgpixmap->w;
105 h = (bgpixmap->h * h) / 100; 112 h = (bgpixmap->h * h) / 100;
106 } 113 }
107 if (w > 1000) 114
108 w = 1000; 115 min_it (w, 32767);
109 if (h > 1000) 116 min_it (h, 32767);
110 h = 1000; 117
111 if (bgpixmap->w != (short)w) 118 if (bgpixmap->w != (short)w)
112 { 119 {
113 bgpixmap->w = (short)w; 120 bgpixmap->w = (short)w;
114 changed++; 121 changed++;
115 } 122 }
123
116 if (bgpixmap->h != (short)h) 124 if (bgpixmap->h != (short)h)
117 { 125 {
118 bgpixmap->h = (short)h; 126 bgpixmap->h = (short)h;
119 changed++; 127 changed++;
120 } 128 }
121 } 129 }
130
122 if (! (flags & YValue)) 131 if (!(flags & YValue))
123 { 132 {
124 if (flags & XNegative) 133 if (flags & XNegative)
125 flags |= YNegative; 134 flags |= YNegative;
135
126 y = x; 136 y = x;
127 } 137 }
128 138
129 if (! (flags & WidthValue) && geom[0] != '=') 139 if (!(flags & WidthValue) && geom[0] != '=')
130 { 140 {
131 x += bgpixmap->x; 141 x += bgpixmap->x;
132 y += bgpixmap->y; 142 y += bgpixmap->y;
133 } 143 }
134 else 144
135 { 145 if (xpmAttr.width && xpmAttr.height)
136 if (flags & XNegative)
137 x += 100;
138 if (flags & YNegative)
139 y += 100;
140 } 146 {
141 min_it (x, 100); 147 x = MOD(x, xpmAttr.width);
142 min_it (y, 100); 148 y = MOD(y, xpmAttr.height);
143 max_it (x, 0); 149 }
144 max_it (y, 0); 150
145 if (bgpixmap->x != x) 151 if (bgpixmap->x != x)
146 { 152 {
147 bgpixmap->x = x; 153 bgpixmap->x = x;
148 changed++; 154 changed++;
149 } 155 }
156
150 if (bgpixmap->y != y) 157 if (bgpixmap->y != y)
151 { 158 {
152 bgpixmap->y = y; 159 bgpixmap->y = y;
153 changed++; 160 changed++;
154 } 161 }
155 } 162 }
156 free (str); 163
157 return changed; 164 return changed;
158} 165}
159 166
160void 167void
161rxvt_term::resize_pixmap () 168rxvt_term::resize_pixmap ()
162{ 169{
163 XGCValues gcvalue; 170 XGCValues gcvalue;
164 GC gc; 171 GC gc;
165 unsigned int width = TermWin_TotalWidth ();
166 unsigned int height = TermWin_TotalHeight ();
167 dDisp;
168 172
169 if (pixmap != None) 173 if (pixmap != None)
170 XFreePixmap (disp, pixmap); 174 XFreePixmap (dpy, pixmap);
171 175
172 if (bgPixmap.pixmap == None) 176 if (bgPixmap.pixmap == None)
173 { /* So be it: I'm not using pixmaps */ 177 { /* So be it: I'm not using pixmaps */
174 pixmap = None; 178 pixmap = None;
175 179
176 if (!OPTION (Opt_transparent) || !am_transparent) 180 if (!OPTION (Opt_transparent) || !am_transparent)
177 XSetWindowBackground (disp, vt, 181 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
178 pix_colors[Color_bg]);
179 182
180 return; 183 return;
181 } 184 }
182 185
183 gcvalue.foreground = pix_colors[Color_bg]; 186 gcvalue.foreground = pix_colors[Color_bg];
184 gc = XCreateGC (disp, vt, GCForeground, &gcvalue); 187 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
185 188
186 if (bgPixmap.pixmap != None) 189 if (bgPixmap.pixmap != None)
187 { /* we have a specified pixmap */ 190 { /* we have a specified pixmap */
188 unsigned int w = bgPixmap.w, h = bgPixmap.h, 191 unsigned int w = bgPixmap.w, h = bgPixmap.h,
189 x = bgPixmap.x, y = bgPixmap.y; 192 x = bgPixmap.x, y = bgPixmap.y;
190 unsigned int xpmh = xpmAttr.height, 193 unsigned int xpmh = xpmAttr.height,
191 xpmw = xpmAttr.width; 194 xpmw = xpmAttr.width;
192 195
193 /* 196 /*
194 * don't zoom pixmap too much nor expand really small pixmaps 197 * don't zoom pixmap too much nor expand really small pixmaps
195 */ 198 */
196 if (w > 1000 || h > 1000) 199 if (w > 32767 || h > 32767)
197 w = 1; 200 w = 1;
198 else if (width > (10 * xpmw) 201 else if (width > (10 * xpmw)
199 || height > (10 * xpmh)) 202 || height > (10 * xpmh))
200 w = 0; /* tile */ 203 w = 0; /* tile */
201 204
202 if (w == 0) 205 if (!w)
203 { 206 {
204 /* basic X tiling - let the X server do it */ 207 /* basic X tiling - let the X server do it */
205 pixmap = XCreatePixmap (disp, vt, 208 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
206 xpmw, xpmh, 209
207 (unsigned int)display->depth); 210 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
208 XCopyArea (disp, bgPixmap.pixmap, pixmap, gc, 211 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
209 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);
210 } 214 }
211 else 215 else
212 { 216 {
213 float incr, p; 217 float incr, p;
214 Pixmap tmp; 218 Pixmap tmp;
215 219
216 pixmap = XCreatePixmap (disp, vt, 220 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
217 width, height,
218 (unsigned int)display->depth);
219 /* 221 /*
220 * horizontal scaling 222 * horizontal scaling
221 */ 223 */
222 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 224 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
223 225
224 tmp = XCreatePixmap (disp, vt, 226 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
225 width, xpmh, (unsigned int)display->depth);
226 XFillRectangle (disp, tmp, gc, 0, 0, width, 227 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
227 xpmh);
228 228
229 for ( /*nil */ ; x < w; x++, p += incr) 229 for ( /*nil */ ; x < w; x++, p += incr)
230 { 230 {
231 if (p >= xpmw) 231 if (p >= xpmw)
232 p = 0; 232 p = 0;
233
233 /* copy one column from the original pixmap to the tmp pixmap */ 234 /* copy one column from the original pixmap to the tmp pixmap */
234 XCopyArea (disp, bgPixmap.pixmap, tmp, gc, 235 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
235 (int)p, 0, 1, xpmh, (int)x, 0);
236 } 236 }
237 237
238 /* 238 /*
239 * vertical scaling 239 * vertical scaling
240 */ 240 */
241 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 241 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
242 242
243 if (y > 0) 243 if (y > 0)
244 XFillRectangle (disp, pixmap, gc, 0, 0, width, y); 244 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
245 245
246 if (h < height) 246 if (h < height)
247 XFillRectangle (disp, pixmap, gc, 0, (int)h, width, height - h + 1); 247 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
248 248
249 for ( /*nil */ ; y < h; y++, p += incr) 249 for ( /*nil */ ; y < h; y++, p += incr)
250 { 250 {
251 if (p >= xpmh) 251 if (p >= xpmh)
252 p = 0; 252 p = 0;
253 253
254 /* copy one row from the tmp pixmap to the main pixmap */ 254 /* copy one row from the tmp pixmap to the main pixmap */
255 XCopyArea (disp, tmp, pixmap, gc, 255 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
256 0, (int)p, width, 1, 0, (int)y);
257 } 256 }
258 257
259 XFreePixmap (disp, tmp); 258 XFreePixmap (dpy, tmp);
260 } 259 }
261 } 260 }
262 261
263 XSetWindowBackgroundPixmap (disp, vt, pixmap); 262 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
263
264 XFreeGC (disp, gc); 264 XFreeGC (dpy, gc);
265 am_transparent = 0; 265 am_transparent = 0;
266} 266}
267 267
268/* 268/*
269 * Calculate tiling sizes and increments 269 * Calculate tiling sizes and increments
… …
348 348
349 assert (file != NULL); 349 assert (file != NULL);
350 350
351 if (bgPixmap.pixmap != None) 351 if (bgPixmap.pixmap != None)
352 { 352 {
353 XFreePixmap (display->display, bgPixmap.pixmap); 353 XFreePixmap (dpy, bgPixmap.pixmap);
354 bgPixmap.pixmap = None; 354 bgPixmap.pixmap = None;
355 } 355 }
356 356
357 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 357 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
358 358
359 if (*file != '\0') 359 if (*file != '\0')
360 { 360 {
361 /* XWindowAttributes attr; */ 361 /* XWindowAttributes attr; */
362 362
363 /* 363 /*
364 * we already have the required attributes 364 * we already have the required attributes
365 */ 365 */
366 /* XGetWindowAttributes (display->display, vt, &attr); */ 366 /* XGetWindowAttributes (dpy, vt, &attr); */
367 367
368 xpmAttr.closeness = 30000; 368 xpmAttr.closeness = 30000;
369 xpmAttr.colormap = display->cmap; 369 xpmAttr.colormap = cmap;
370 xpmAttr.visual = display->visual; 370 xpmAttr.visual = visual;
371 xpmAttr.depth = display->depth; 371 xpmAttr.depth = depth;
372 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 372 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
373 XpmDepth | XpmSize | XpmReturnPixels); 373 | XpmDepth | XpmSize | XpmReturnPixels);
374 374
375 /* search environment variables here too */ 375 /* search environment variables here too */
376 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 376 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
377 if (f == NULL 377 if (f == NULL
378 || XpmReadFileToPixmap (display->display, display->root, f, 378 || XpmReadFileToPixmap (dpy, display->root, f,
379 &bgPixmap.pixmap, NULL, 379 &bgPixmap.pixmap, NULL,
380 &xpmAttr)) 380 &xpmAttr))
381 { 381 {
382 char *p; 382 char *p;
383 383
384 /* semi-colon delimited */ 384 /* semi-colon delimited */
385 if ((p = strchr (file, ';')) == NULL) 385 if ((p = strchr (file, ';')) == NULL)

Diff Legend

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