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.55 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.61 by ayin, Tue Aug 7 15:23:11 2007 UTC

… …
24 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29/*
30 * Pixmap geometry string interpretation :
31 * Each geometry string contains zero or one scale/position
32 * adjustment and may optionally be followed by a colon and one or more
33 * colon-delimited pixmap operations.
34 * The following table shows the valid geometry strings and their
35 * affects on the background image :
36 *
37 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
38 * W and H are percentages of the terminal window size.
39 * X and Y are also percentages; e.g., +50+50 centers
40 * the image in the window.
41 * WxH+X Assumes Y == X
42 * WxH Assumes Y == X == 50 (centers the image)
43 * W+X+Y Assumes H == W
44 * W+X Assumes H == W and Y == X
45 * W Assumes H == W and Y == X == 50
46 *
47 * Adjusting position only :
48 * =+X+Y Set position to X% by Y% (absolute).
49 * =+X Set position to X% by X%.
50 * +X+Y Adjust position horizontally X% and vertically Y%
51 * from current position (relative).
52 * +X Adjust position horizontally X% and vertically X%
53 * from current position.
54 *
55 * Adjusting scale only :
56 * Wx0 Multiply horizontal scaling factor by W%
57 * 0xH Multiply vertical scaling factor by H%
58 * 0x0 No scaling (show image at normal size).
59 *
60 * Pixmap Operations : (should be prepended by a colon)
61 * tile Tile image. Scaling/position modifiers above will affect
62 * the tile size and origin.
63 * propscale When scaling, scale proportionally. That is, maintain the
64 * proper aspect ratio for the image. Any portion of the
65 * background not covered by the image is filled with the
66 * current background color.
67 * hscale Scale horizontally, tile vertically ?
68 * vscale Tile horizontally, scale vertically ?
69 * scale Scale both up and down
70 * auto Same as 100x100+50+50
71 */
72
73#ifdef HAVE_BG_PIXMAP
74bool
75bgPixmap_t::window_size_sensitive ()
76{
29#ifdef XPM_BACKGROUND 77#ifdef XPM_BACKGROUND
78#ifdef HAVE_AFTERIMAGE
79 if (original_asim != NULL)
80#endif
81 {
82 if (h_scale != 0 || v_scale != 0)
83 return true;
84 }
85#endif
86#ifdef ENABLE_TRANSPARENCY
87 if (flags & bgPmap_Transparent)
88 return true;
89#endif
90 return false;
91}
30 92
31/* 93#ifdef XPM_BACKGROUND
32 * These GEOM strings indicate absolute size/position: 94static inline bool
33 * @ `WxH+X+Y' 95check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
34 * @ `WxH+X' -> Y = X
35 * @ `WxH' -> Y = X = 50
36 * @ `W+X+Y' -> H = W
37 * @ `W+X' -> H = W, Y = X
38 * @ `W' -> H = W, X = Y = 50
39 * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged)
40 * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged)
41 * @ `=+X+Y' -> (H, W unchanged)
42 * @ `=+X' -> Y = X (H, W unchanged)
43 *
44 * These GEOM strings adjust position relative to current position:
45 * @ `+X+Y'
46 * @ `+X' -> Y = X
47 *
48 * And this GEOM string is for querying current scale/position:
49 * @ `?'
50 */
51int
52rxvt_term::scale_pixmap (const char *geom)
53{ 96{
97 if (geom_flags & flag)
98 {
99 if (new_value > 1000)
100 new_value = 1000;
101 if (new_value != scale)
102 {
103 scale = new_value;
104 return true;
105 }
106 }
107 return false;
108}
109
110static inline bool
111check_set_align_value (int geom_flags, int flag, int &align, int new_value)
112{
113 if (geom_flags & flag)
114 {
115 if (new_value < -100)
116 new_value = -100;
117 else if (new_value > 200)
118 new_value = 200;
119 if (new_value != align)
120 {
121 align = new_value;
122 return true;
123 }
124 }
125 return false;
126}
127
128static inline int
129make_align_position (int align, int window_size, int image_size)
130{
131 int diff = window_size - image_size;
132 int smaller = MIN (image_size,window_size);
133
134 if (align >= 0 && align <= 50)
135 return diff * align / 100;
136 else if (align > 50 && align <= 100)
137 return window_size - image_size + diff * align / 100;
138 else if (align > 100 && align <= 200 )
139 return ((align - 100) * smaller / 100) + window_size - smaller;
140 else if (align > -100 && align < 0)
141 return ((align + 100) * smaller / 100) - image_size;
142 return 0;
143}
144
145static inline void
146make_clip_rectangle (int pos, int size, int target_size, int &clip_pos, int &clip_size)
147{
148 if (size <= 0)
149 { /* special case - tiling */
150 clip_pos = pos;
151 clip_size = target_size;
152 }
153 else if (pos < 0)
154 {
155 clip_pos = 0;
156 clip_size = MIN (target_size, size + pos);
157 }
158 else
159 {
160 clip_pos = pos;
161 clip_size = size;
162 if (pos < target_size && (int)clip_size > target_size - pos)
163 clip_pos = target_size - pos;
164 }
165}
166
167bool
168bgPixmap_t::handle_geometry (const char *geom)
169{
54 int flags, changed = 0; 170 int geom_flags = 0, changed = 0;
55 int x = 0, y = 0; 171 int x = 0, y = 0;
56 unsigned int w = 0, h = 0; 172 unsigned int w = 0, h = 0;
57 unsigned int n; 173 unsigned int n;
174 unsigned long new_flags = (flags&(~bgPmap_geometryFlags));
58 char *p; 175 char *p;
59 bgPixmap_t *bgpixmap = &bgPixmap; 176#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
60
61#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
62 177
63 if (geom == NULL) 178 if (geom == NULL)
64 return 0; 179 return false;
65 180
66 char str[MAXLEN_GEOM]; 181 char str[MAXLEN_GEOM];
67 182
68 if (!strcmp (geom, "?")) 183 if (!strcmp (geom, "?"))
69 { 184 {
185#if 0 /* TODO: */
70 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 186 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
71 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767), 187 min (h_scale, 32767), min (v_scale, 32767),
72 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767)); 188 min (h_align, 32767), min (v_align, 32767));
73 process_xterm_seq (XTerm_title, str, CHAR_ST); 189 process_xterm_seq (XTerm_title, str, CHAR_ST);
190#endif
74 return 0; 191 return false;
75 } 192 }
76 193 while (isspace(*geom)) ++geom;
77 if ((p = strchr (geom, ';')) == NULL) 194 if ((p = strchr (geom, ';')) == NULL)
78 p = strchr (geom, '\0'); 195 p = strchr (geom, '\0');
79 196
80 n = (p - geom); 197 n = (p - geom);
81 if (n < MAXLEN_GEOM) 198 if (n < MAXLEN_GEOM)
82 { 199 {
200 char *ops;
201 new_flags |= bgPmap_geometrySet;
202
83 strncpy (str, geom, n); 203 strncpy (str, geom, n);
84 str[n] = '\0'; 204 str[n] = '\0';
85 205 if (str[0] == ':')
86 if (strcmp(str, "auto") == 0) 206 ops = &str[0];
87 { 207 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
88 if (!bgpixmap->auto_resize) 208 ops = &str[0];
89 changed++;
90 bgpixmap->auto_resize = True ;
91 w = szHint.width ;
92 h = szHint.height ;
93 flags = WidthValue|HeightValue ;
94 }
95 else 209 else
96 { 210 {
97 bgpixmap->auto_resize = False ; 211 char *tmp;
98 flags = XParseGeometry (str, &x, &y, &w, &h); 212 ops = strchr (str, ':');
99 } 213 if (ops != NULL)
100/* code below is garbage and needs to be rewritten */
101 if (!flags)
102 {
103 flags |= WidthValue;
104 w = 0;
105 } /* default is tile */
106
107 if (flags & WidthValue)
108 {
109 if (!(flags & XValue))
110 x = 50;
111
112 if (!(flags & HeightValue))
113 h = w;
114
115 if (w && !h)
116 { 214 {
117 w = (bgpixmap->w * w) / 100; 215 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
118 h = bgpixmap->h; 216 *(++tmp) = '\0';
217 if (ops == tmp) ++ops;
119 } 218 }
120 else if (h && !w) 219 }
220
221 if (ops > str || ops == NULL)
222 {
223 /* we have geometry string - let's handle it prior to applying ops */
224 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
225
226 if ((geom_flags & XValue) && !(geom_flags & YValue))
121 { 227 {
122 w = bgpixmap->w; 228 y = x;
123 h = (bgpixmap->h * h) / 100; 229 geom_flags |= YValue;
124 } 230 }
125 231
126 min_it (w, 32767); 232 if (flags & bgPmap_geometrySet)
127 min_it (h, 32767); 233 {/* new geometry is an adjustment to the old one ! */
128 234 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
129 if (bgpixmap->w != (short)w) 235 {
236 if (w == 0 && h != 0)
237 {
238 w = h_scale;
239 h = (v_scale * h) / 100;
240 }
241 else if (h == 0 && w != 0)
242 {
243 w = (h_scale * w) / 100;
244 h = v_scale;
245 }
246 }
247 if (geom_flags & XValue)
248 {
249 if (str[0] != '=')
250 {
251 y += v_align;
252 x += h_align;
253 }
254 }
255 }
256 else /* setting up geometry from scratch */
130 { 257 {
131 bgpixmap->w = (short)w; 258 if (!(geom_flags & XValue))
132 changed++; 259 {/* use default geometry - centered */
260 x = y = bgPmap_defaultAlign;
261 }
262 else if (!(geom_flags & YValue))
263 y = x;
264
265 if ((geom_flags & (WidthValue|HeightValue)) == 0)
266 {/* use default geometry - scaled */
267 w = h = bgPmap_defaultScale;
268 }
269 else if (geom_flags & WidthValue)
270 {
271 if (!(geom_flags & HeightValue))
272 h = w;
273 }
274 else
275 w = h;
133 } 276 }
277 } /* done parsing geometry string */
278 else if (!(flags & bgPmap_geometrySet))
279 { /* default geometry - scaled and centered */
280 x = y = bgPmap_defaultAlign;
281 w = h = bgPmap_defaultScale;
282 }
283
284 if (!(flags & bgPmap_geometrySet))
285 geom_flags |= WidthValue|HeightValue|XValue|YValue;
134 286
135 if (bgpixmap->h != (short)h) 287 if (ops)
288 {
289 while (*ops)
136 { 290 {
137 bgpixmap->h = (short)h; 291 while (*ops == ':' || isspace(*ops)) ++ops;
292#define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
293 if (CHECK_GEOM_OPS("tile"))
294 {
295 w = h = 0;
296 geom_flags |= WidthValue|HeightValue;
297 }
298 else if (CHECK_GEOM_OPS("propscale"))
299 {
300 if (w == 0 && h == 0)
301 {
302 w = 100;
303 geom_flags |= WidthValue;
304 }
305 new_flags |= bgPmap_propScale;
306 }
307 else if (CHECK_GEOM_OPS("hscale"))
308 {
309 if (w == 0)
310 w = 100;
311 h = 0;
312 geom_flags |= WidthValue|HeightValue;
313 }
314 else if (CHECK_GEOM_OPS("vscale"))
315 {
316 if (h == 0)
317 h = 100;
318 w = 0;
319 geom_flags |= WidthValue|HeightValue;
320 }
321 else if (CHECK_GEOM_OPS("scale"))
322 {
323 if (h == 0)
324 h = 100;
325 if (w == 0)
326 w = 100;
327 geom_flags |= WidthValue|HeightValue;
328 }
329 else if (CHECK_GEOM_OPS("auto"))
330 {
331 w = h = 100;
332 x = y = 50;
333 geom_flags |= WidthValue|HeightValue|XValue|YValue;
334 }
335#undef CHECK_GEOM_OPS
336 while (*ops != ':' && *ops != '\0') ++ops;
337 } /* done parsing ops */
338 }
339
340 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
341 ++changed;
342 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))
343 ++changed;
344 if (check_set_align_value (geom_flags, XValue, h_align, x))
345 ++changed;
346 if (check_set_align_value (geom_flags, YValue, v_align, y))
347 ++changed;
348 }
349
350 if (new_flags != flags)
351 {
352 flags = new_flags;
138 changed++; 353 changed++;
354 }
355//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
356// flags, h_scale, v_scale, h_align, v_align);
357 return (changed > 0);
358}
359
360#ifdef HAVE_AFTERIMAGE
361bool
362bgPixmap_t::render_asim (rxvt_term *target, ASImage *background, ARGB32 background_tint)
363{
364 if (target == NULL)
365 return false;
366
367 int target_width = (int)target->szHint.width;
368 int target_height = (int)target->szHint.height;
369 int new_pmap_width = target_width, new_pmap_height = target_height;
370 ASImage *result = NULL;
371
372 int x = 0;
373 int y = 0;
374 int w = h_scale * target_width / 100;
375 int h = v_scale * target_height / 100;
376
377 if (original_asim)
378 {
379 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
380 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
381 }
382
383 int dst_x, dst_y;
384 int clip_width, clip_height;
385
386 make_clip_rectangle (x, w, target_width, dst_x, clip_width);
387 make_clip_rectangle (y, h, target_height, dst_y, clip_height);
388
389 /* TODO : actuall scaling code :) */
390 if (dst_x >= target_width || dst_y >= target_height
391 || clip_width <= 0 || clip_height <= 0 || original_asim == NULL)
392 {
393 result = background;
394 dst_x = dst_y = 0;
395 if (background)
396 {
397 new_pmap_width = clip_width = background->width;
398 new_pmap_height = clip_height = background->height;
399 }
400 else
401 new_pmap_width = new_pmap_height = 0;
402 }
403 else
404 {
405 result = original_asim;
406 if ((w > 0 && w != original_asim->width)
407 || (h > 0 && h != original_asim->height))
408 {
409 result = scale_asimage (target->asv, original_asim,
410 w > 0 ? w : original_asim->width,
411 h > 0 ? h : original_asim->height,
412 background ? ASA_ASImage : ASA_XImage,
413 100, ASIMAGE_QUALITY_DEFAULT);
414 }
415 if (background == NULL)
416 {/* if tiling - pixmap has to be sized exactly as the image */
417 if (h_scale == 0)
418 new_pmap_width = result->width;
419 if (v_scale == 0)
420 new_pmap_height = result->height;
421 }
422 else
423 {/* if blending background and image - pixmap has to be sized same as target window */
424 ASImageLayer *layers = create_image_layers (2);
425 ASImage *merged_im = NULL;
426
427 layers[0].im = background;
428 layers[0].clip_width = target_width;
429 layers[0].clip_height = target_height;
430 layers[0].tint = background_tint;
431 layers[1].im = result;
432 if (w <= 0)
433 {/* tile horizontally */
434 layers[1].dst_x = dst_x - (int)result->width;
435 layers[1].clip_width = result->width;
139 } 436 }
437 else
438 {/* clip horizontally */
439 layers[1].dst_x = dst_x;
440 layers[1].clip_width = clip_width;
140 } 441 }
141 442 if (h <= 0)
142 if (!(flags & YValue)) 443 {
444 layers[1].dst_y = dst_y - (int)result->height;
445 layers[1].clip_height = result->height;
446 }
447 else
448 {
449 layers[1].dst_y = dst_y;
450 layers[1].clip_height = clip_height;
451 }
452 if (target->rs[Rs_blendtype])
453 {
454 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
455 if (layers[1].merge_scanlines == NULL)
456 layers[1].merge_scanlines = alphablend_scanlines;
457 }
458 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
459 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
460 if (tmp)
461 {
462 if (result != original_asim)
463 destroy_asimage (&result);
464 result = tmp;
465 dst_x = dst_y = 0;
466 clip_width = target_width;
467 clip_height = target_height;
468 }
469 free (layers);
143 { 470 }
144 if (flags & XNegative) 471 }
145 flags |= YNegative;
146 472
147 y = x; 473 if (pixmap)
474 {
475 if (result == NULL
476 || pmap_width != new_pmap_width
477 || pmap_height != new_pmap_height
478 || pmap_depth != target->depth)
148 } 479 {
149 480 XFreePixmap (target->dpy, pixmap);
150 if (!(flags & WidthValue) && geom[0] != '=') 481 pixmap = None;
151 { 482 }
152 x += bgpixmap->x; 483 }
153 y += bgpixmap->y; 484
485 if (result)
486 {
487 XGCValues gcv;
488 GC gc;
489
490 /* create Pixmap */
491 if (pixmap == None)
154 } 492 {
155 493 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
156 if (bgpixmap->x != x) 494 pmap_width = new_pmap_width;
495 pmap_height = new_pmap_height;
496 pmap_depth = target->depth;
157 { 497 }
158 bgpixmap->x = x; 498 /* fill with background color ( if result's not completely overlapping it)*/
159 changed++; 499 gcv.foreground = target->pix_colors[Color_bg];
500 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
501
502 if (dst_x > 0 || dst_y > 0
503 || dst_x + clip_width < new_pmap_width
504 || dst_y + clip_height < new_pmap_height)
160 } 505 {
161 506 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
162 if (bgpixmap->y != y)
163 { 507 }
164 bgpixmap->y = y; 508 /* put result on pixmap */
165 changed++; 509 asimage2drawable (target->asv, pixmap, result, gc, 0, 0, dst_x, dst_y, clip_width, clip_height, True);
166 } 510
511 /* set target's background to pixmap */
512 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
513
514 XFreeGC (target->dpy, gc);
515 }
516 else
167 } 517 {
518 /* set target background to a pixel */
519 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
520 }
168 521
169 return changed; 522 return true;
170} 523}
524#endif
171 525
172void 526void
173rxvt_term::resize_pixmap () 527rxvt_term::resize_pixmap ()
174{ 528{
175 XGCValues gcvalue; 529 XGCValues gcvalue;
176 GC gc; 530 GC gc;
177 unsigned int w = bgPixmap.w, h = bgPixmap.h; 531 unsigned int w = bgPixmap.h_scale*szHint.width/100;
178 unsigned int x = bgPixmap.x, y = bgPixmap.y; 532 unsigned int h = bgPixmap.v_scale*szHint.height/100;
533 int x = bgPixmap.h_align*szHint.width/100;
534 int y = bgPixmap.v_align*szHint.height/100;
535#ifdef HAVE_AFTERIMAGE
179 ASImage *im = bgPixmap.original_asim; 536 ASImage *im = bgPixmap.original_asim;
180 537#else
538 void *im = NULL;
539#endif
181/* preliminary cleanup - this needs to be integrated with check_our_parents() code */ 540/* preliminary cleanup - this needs to be integrated with check_our_parents() code */
182 if (bgPixmap.pixmap != None) 541 if (bgPixmap.pixmap != None)
183 { 542 {
184 XFreePixmap (dpy, bgPixmap.pixmap); 543 XFreePixmap (dpy, bgPixmap.pixmap);
185 bgPixmap.pixmap = None ; 544 bgPixmap.pixmap = None ;
… …
191 check_our_parents (); 550 check_our_parents ();
192 return; 551 return;
193 } 552 }
194#endif 553#endif
195 554
196 if (bgPixmap.original_asim == NULL) 555 if (im == NULL)
197 { /* So be it: I'm not using pixmaps */ 556 { /* So be it: I'm not using pixmaps */
198 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
199 return; 558 return;
200 } 559 }
201 560
202 gcvalue.foreground = pix_colors[Color_bg]; 561 gcvalue.foreground = pix_colors[Color_bg];
203 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue); 562 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
204 563
205 if (bgPixmap.auto_resize)
206 {
207 w = szHint.width;
208 h = szHint.height;
209 }
210 else
211 { /* don't zoom pixmap too much nor expand really small pixmaps */ 564 /* don't zoom pixmap too much nor expand really small pixmaps */
212 if (w > 16000) 565 if (w > 16000)
213 w = 1; 566 w = 1;
214 if (h > 16000) 567 if (h > 16000)
215 h = 1; 568 h = 1;
216 } 569
217 if (w == 0) w = im->width; 570#ifdef HAVE_AFTERIMAGE
218 else if (w < 10) w *= im->width; 571 if (w == 0)
219 if (h == 0) h = im->height; 572 w = im->width;
220 else if (w < 10) h *= im->height; 573 if (h == 0)
574 h = im->height;
221 575
222 if (w != im->width || h != im->height) 576 if (w != im->width || h != im->height)
223 { 577 {
224 ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT); 578 ASImage *tmp = scale_asimage (asv, im, w, h, (x == 0 && y == 0)?ASA_XImage:ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT);
225 if (tmp != NULL) 579 if (tmp != NULL)
226 im = tmp; 580 im = tmp;
227 } 581 }
582 bgPixmap.pmap_width = MIN(w,szHint.width);
583 bgPixmap.pmap_height = MIN(h,szHint.height);
584#if 0 /* TODO: fix that! */
228 if (x != 0 || y != 0) 585 if (x != 0 || y != 0)
229 { 586 {
230 ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 587 ASImage *tmp = tile_asimage (asv, im, x, y, w, h, TINT_LEAVE_SAME, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
231 if (tmp != NULL) 588 if (tmp != NULL)
232 { 589 {
233 if (im != bgPixmap.original_asim) 590 if (im != bgPixmap.original_asim)
234 destroy_asimage (&im); 591 destroy_asimage (&im);
235 im = tmp; 592 im = tmp;
236 } 593 }
237 } 594 }
238 bgPixmap.pixmap = XCreatePixmap (dpy, vt, w, h, depth); 595#endif
239 bgPixmap.pmap_width = w; 596 bgPixmap.pixmap = XCreatePixmap (dpy, vt, bgPixmap.pmap_width, bgPixmap.pmap_height, depth);
240 bgPixmap.pmap_height = h;
241 bgPixmap.pmap_depth = depth; 597 bgPixmap.pmap_depth = depth;
242 598
243 asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, w, h, True); 599 asimage2drawable (asv, bgPixmap.pixmap, im, gc, 0, 0, 0, 0, bgPixmap.pmap_width, bgPixmap.pmap_height, True);
244 600
245 if (im != bgPixmap.original_asim) 601 if (im != bgPixmap.original_asim)
246 destroy_asimage (&im); 602 destroy_asimage (&im);
247 603#endif
604 if( bgPixmap.pixmap )
248 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap); 605 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
249 606
250 XFreeGC (dpy, gc); 607 XFreeGC (dpy, gc);
251} 608}
252 609
253void 610void
… …
262 XFreePixmap (dpy, bgPixmap.pixmap); 619 XFreePixmap (dpy, bgPixmap.pixmap);
263 bgPixmap.pixmap = None; 620 bgPixmap.pixmap = None;
264 } 621 }
265 622
266 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 623 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
267
268 if (*file != '\0') 624 if (*file != '\0')
269 { 625 {
626#ifdef HAVE_AFTERIMAGE
270 if (asimman == NULL) 627 if (asimman == NULL)
271 asimman = create_generic_imageman(rs[Rs_path]); 628 asimman = create_generic_imageman(rs[Rs_path]);
272 if ((f = strchr (file, ';')) == NULL) 629 if ((f = strchr (file, ';')) == NULL)
273 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 630 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
274 else 631 else
… …
278 strncpy (f, file, len); 635 strncpy (f, file, len);
279 f[len] = '\0'; 636 f[len] = '\0';
280 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 637 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
281 free( f ); 638 free( f );
282 } 639 }
640#endif
283 } 641 }
284 642
285 resize_pixmap (); 643 resize_pixmap ();
286} 644}
287 645
288#endif /* XPM_BACKGROUND */ 646#endif /* XPM_BACKGROUND */
647#endif /* HAVE_BG_PIXMAP */
289 648
290#ifdef ENABLE_TRANSPARENCY 649#ifdef ENABLE_TRANSPARENCY
291#if TINTING && !defined(HAVE_AFTERIMAGE) 650#ifndef HAVE_AFTERIMAGE
292/* taken from aterm-0.4.2 */ 651/* taken from aterm-0.4.2 */
293 652
294typedef uint32_t RUINT32T; 653typedef uint32_t RUINT32T;
295 654
296static void 655static void
… …
602 i = (xa[XA_ESETROOT_PMAP_ID] 961 i = (xa[XA_ESETROOT_PMAP_ID]
603 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 962 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
604 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 963 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
605 &nitems, &bytes_after, &prop) == Success); 964 &nitems, &bytes_after, &prop) == Success);
606 965
607 /* TODO: the below logic needs to be cleaned up */
608 if (!i || prop == NULL 966 if (!i || prop == NULL)
609#if TINTING
610 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
611#ifdef HAVE_AFTERIMAGE
612 && bgPixmap.original_asim == NULL && rs[Rs_blurradius] == NULL
613#endif
614 )
615#endif
616 )
617 rootpixmap = None; 967 rootpixmap = None;
618 else 968 else
619 { 969 {
620 int junk; 970 int junk;
621 unsigned int ujunk; 971 unsigned int ujunk;
… …
640 Bool whole_tint = False, no_tint = True; 990 Bool whole_tint = False, no_tint = True;
641 991
642 while (sx < 0) sx += (int)wrootattr.width; 992 while (sx < 0) sx += (int)wrootattr.width;
643 while (sy < 0) sy += (int)wrootattr.height; 993 while (sy < 0) sy += (int)wrootattr.height;
644 994
645#if TINTING
646 if (rs[Rs_shade]) 995 if (rs[Rs_shade])
647 shade = atoi (rs[Rs_shade]); 996 shade = atoi (rs[Rs_shade]);
648 if (ISSET_PIXCOLOR (Color_tint)) 997 if (ISSET_PIXCOLOR (Color_tint))
649 pix_colors_focused [Color_tint].get (c); 998 pix_colors_focused [Color_tint].get (c);
650#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700) 999#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
… …
652 whole_tint = (IS_COMPONENT_WHOLESOME(c.r) 1001 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
653 && IS_COMPONENT_WHOLESOME(c.g) 1002 && IS_COMPONENT_WHOLESOME(c.g)
654 && IS_COMPONENT_WHOLESOME(c.b)); 1003 && IS_COMPONENT_WHOLESOME(c.b));
655 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); 1004 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
656#undef IS_COMPONENT_WHOLESOME 1005#undef IS_COMPONENT_WHOLESOME
657#endif /* TINTING */
658 /* theer are no performance advantages to reusing same pixmap */ 1006 /* theer are no performance advantages to reusing same pixmap */
659 if (bgPixmap.pixmap != None) 1007 if (bgPixmap.pixmap != None)
660 XFreePixmap (dpy, bgPixmap.pixmap); 1008 XFreePixmap (dpy, bgPixmap.pixmap);
661 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth); 1009 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
662 bgPixmap.pmap_width = szHint.width; 1010 bgPixmap.pmap_width = szHint.width;
… …
677 gcvalue.ts_x_origin = -sx; 1025 gcvalue.ts_x_origin = -sx;
678 gcvalue.ts_y_origin = -sy; 1026 gcvalue.ts_y_origin = -sy;
679 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue); 1027 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
680 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height); 1028 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
681 1029
682#if TINTING
683 if (whole_tint && !no_tint) 1030 if (whole_tint && !no_tint)
684 { 1031 {
685 /* In this case we can tint image server-side getting significant 1032 /* In this case we can tint image server-side getting significant
686 * performance improvements, as we eliminate XImage transfer 1033 * performance improvements, as we eliminate XImage transfer
687 */ 1034 */
… …
689 gcvalue.function = GXand; 1036 gcvalue.function = GXand;
690 gcvalue.fill_style = FillSolid; 1037 gcvalue.fill_style = FillSolid;
691 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue); 1038 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
692 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height); 1039 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
693 } 1040 }
694#endif
695 success = True; 1041 success = True;
696#ifdef HAVE_AFTERIMAGE 1042#ifdef HAVE_AFTERIMAGE
697 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) 1043 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
698 { 1044 {
699 ARGB32 tint = TINT_LEAVE_SAME; 1045 ARGB32 tint = TINT_LEAVE_SAME;
… …
741 layers[0].im = back_im; 1087 layers[0].im = back_im;
742 layers[0].clip_width = szHint.width; 1088 layers[0].clip_width = szHint.width;
743 layers[0].clip_height = szHint.height; 1089 layers[0].clip_height = szHint.height;
744 layers[0].tint = tint; 1090 layers[0].tint = tint;
745 layers[1].im = bgPixmap.original_asim; 1091 layers[1].im = bgPixmap.original_asim;
746 if (bgPixmap.auto_resize) 1092
747 {
748 fore_w = szHint.width;
749 fore_h = szHint.height;
750 }
751 else
752 {
753 fore_w = (bgPixmap.w == 0) ? bgPixmap.original_asim->width : bgPixmap.w; 1093 fore_w = (bgPixmap.h_scale == 0) ? bgPixmap.original_asim->width : bgPixmap.h_scale*szHint.width/100;
754 fore_h = (bgPixmap.h == 0) ? bgPixmap.original_asim->height : bgPixmap.h; 1094 fore_h = (bgPixmap.v_scale == 0) ? bgPixmap.original_asim->height : bgPixmap.v_scale*szHint.height/100;
755 } 1095
756 if (fore_w != bgPixmap.original_asim->width 1096 if (fore_w != bgPixmap.original_asim->width
757 || fore_h != bgPixmap.original_asim->height) 1097 || fore_h != bgPixmap.original_asim->height)
758 { 1098 {
759 layers[1].im = scale_asimage (asv, 1099 layers[1].im = scale_asimage (asv,
760 bgPixmap.original_asim, 1100 bgPixmap.original_asim,
… …
800 } /* back_im != NULL */ 1140 } /* back_im != NULL */
801 else 1141 else
802 success = False; 1142 success = False;
803 } 1143 }
804#else /* HAVE_AFTERIMAGE */ 1144#else /* HAVE_AFTERIMAGE */
805#if TINTING
806 if (!whole_tint && (!no_tint || shade !=100)) 1145 if (!whole_tint && (!no_tint || shade !=100))
807 { 1146 {
808 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); 1147 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
809 success = False; 1148 success = False;
810 if (image != NULL) 1149 if (image != NULL)
… …
817 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); 1156 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
818 XDestroyImage (image); 1157 XDestroyImage (image);
819 success = True; 1158 success = True;
820 } 1159 }
821 } 1160 }
822#endif
823#endif /* HAVE_AFTERIMAGE */ 1161#endif /* HAVE_AFTERIMAGE */
824 PRINT_BACKGROUND_OP_TIME; 1162 PRINT_BACKGROUND_OP_TIME;
825 1163
826 if (gc != NULL) 1164 if (gc != NULL)
827 XFreeGC (dpy, gc); 1165 XFreeGC (dpy, gc);
… …
853 } /* rootpixmap != None */ 1191 } /* rootpixmap != None */
854 1192
855 if (am_pixmap_trans) 1193 if (am_pixmap_trans)
856 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 1194 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
857 else 1195 else
858 { 1196 return;
859 unsigned int n;
860 /*
861 * InheritPixmap transparency
862 */
863 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
864 {
865 oldp = parent[i];
866 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
867 XFree (list);
868
869 if (parent[i] == display->root)
870 {
871 if (oldp != None)
872 pchanged = 1;
873
874 break;
875 }
876
877 if (oldp != parent[i])
878 pchanged = 1;
879 }
880
881 n = 0;
882
883 if (pchanged)
884 for (; n < (unsigned int)i; n++)
885 {
886 XGetWindowAttributes (dpy, parent[n], &wattr);
887
888 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
889 {
890 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
891 break;
892 }
893 }
894
895 if (n > (sizeof (parent) / sizeof (parent[0])))
896 {
897 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
898 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
899 am_transparent = 0;
900 /* XXX: also turn off Opt_transparent? */
901 }
902 else
903 {
904 for (n = 0; n < (unsigned int)i; n++)
905 {
906 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
907 XClearWindow (dpy, parent[n]);
908 }
909
910 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
911 am_transparent = 1;
912 }
913
914 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
915 parent[i] = None;
916 }
917 1197
918 if (scrollBar.win) 1198 if (scrollBar.win)
919 { 1199 {
920 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 1200 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
921 scrollBar.setIdle (); 1201 scrollBar.setIdle ();

Diff Legend

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