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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.155 by sf-exg, Mon May 30 18:39:02 2011 UTC vs.
Revision 1.174 by sf-exg, Wed Nov 23 16:53:53 2011 UTC

… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 * auto Same as 100x100+50+50
61 */
62
63#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
64void 38void
65rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
66{ 40{
67#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
176 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
177 151
178 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
179 return diff * align / 100; 153 return diff * align / 100;
180 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
181 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
182 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
183 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
184 return 0; 158 return 0;
185} 159}
186 160
187static inline int 161static inline int
188make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
207{ 181{
208 bool changed = false; 182 bool changed = false;
209 int geom_flags = 0; 183 int geom_flags = 0;
210 int x = 0, y = 0; 184 int x = 0, y = 0;
211 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
212 unsigned int n;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
214 const char *ops;
215 187
216 if (geom == NULL) 188 if (geom == NULL)
217 return false; 189 return false;
218 190
219 char str[256]; 191 if (geom[0])
220
221 ops = strchr (geom, ':');
222 if (ops == NULL)
223 n = strlen (geom);
224 else
225 n = ops - geom;
226
227 if (n >= sizeof (str))
228 return false;
229
230 memcpy (str, geom, n);
231 str[n] = '\0';
232 rxvt_strtrim (str);
233
234 if (str[0])
235 { 192 {
236 /* we have geometry string - let's handle it prior to applying ops */ 193 char **arr = rxvt_strsplit (':', geom);
194
195 for (int i = 0; arr[i]; i++)
196 {
197 if (!strcasecmp (arr[i], "style=tiled"))
198 {
199 new_flags = BG_TILE;
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_PROP_SCALE;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
239 286
240 if (!update) 287 if (!update)
241 { 288 {
242 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
252 w = h; 299 w = h;
253 300
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 302 }
256 303
257 if (ops)
258 {
259 char **arr = rxvt_strsplit (':', ops + 1);
260
261 for (int i = 0; arr[i]; i++)
262 {
263 if (!strcasecmp (arr[i], "tile"))
264 {
265 w = h = noScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "propscale"))
269 {
270 new_flags |= BG_PROP_SCALE;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 if (w == 0) w = windowScale;
275
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 if (h == 0) h = windowScale;
282
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 if (h == 0) h = windowScale;
289 if (w == 0) w = windowScale;
290
291 geom_flags |= WidthValue|HeightValue;
292 }
293 else if (!strcasecmp (arr[i], "auto"))
294 {
295 w = h = windowScale;
296 x = y = centerAlign;
297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
299 else if (!strcasecmp (arr[i], "root"))
300 {
301 new_flags |= BG_ROOT_ALIGN;
302 w = h = noScale;
303 geom_flags |= WidthValue|HeightValue;
304 }
305 } /* done parsing ops */
306
307 rxvt_free_strsplit (arr);
308 }
309
310 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)
311 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 305 || check_set_scale_value (geom_flags, HeightValue, v_scale, h)
312 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 306 || check_set_align_value (geom_flags, XValue, h_align, x)
313 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 307 || check_set_align_value (geom_flags, YValue, v_align, y))
308 changed = true;
314 309
315 if (new_flags != bg_flags) 310 if (new_flags != bg_flags)
316 { 311 {
317 bg_flags = new_flags; 312 bg_flags = new_flags;
318 changed = true; 313 changed = true;
… …
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 320rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 321{
327 int target_width = szHint.width; 322 int target_width = szHint.width;
328 int target_height = szHint.height; 323 int target_height = szHint.height;
329 324
325 w = h_scale * target_width / 100;
326 h = v_scale * target_height / 100;
327
330 if (bg_flags & BG_PROP_SCALE) 328 if (bg_flags & BG_PROP_SCALE)
331 { 329 {
332 float scale = (float)target_width / image_width; 330 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 331 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 332 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 333 h = image_height * scale + 0.5;
336 } 334 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 335
343 if (!w) w = image_width; 336 if (!w) w = image_width;
344 if (!h) h = image_height; 337 if (!h) h = image_height;
345 338
346 if (bg_flags & BG_ROOT_ALIGN) 339 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 346 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 347 y = make_align_position (v_align, target_height, h);
355 } 348 }
356 349
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 350 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 351 if (!(bg_flags & BG_TILE)
352 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 353 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 354 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 355 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 356}
363 357
… …
390 } 384 }
391 385
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 386 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 387 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 388 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 389 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 390 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 391 if (tmp)
398 { 392 {
399 destroy_asimage (&background); 393 destroy_asimage (&background);
400 background = tmp; 394 background = tmp;
… …
419 413
420 if (!original_asim 414 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 415 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 416 && (x >= target_width
423 || y >= target_height 417 || y >= target_height
424 || (x + w <= 0) 418 || x + w <= 0
425 || (y + h <= 0)))) 419 || y + h <= 0)))
426 { 420 {
427 if (background) 421 if (background)
428 { 422 {
429 new_pmap_width = background->width; 423 new_pmap_width = background->width;
430 new_pmap_height = background->height; 424 new_pmap_height = background->height;
… …
444 } 438 }
445 else 439 else
446 { 440 {
447 result = original_asim; 441 result = original_asim;
448 442
449 if ((w != original_asim->width) 443 if (w != original_asim->width
450 || (h != original_asim->height)) 444 || h != original_asim->height)
451 { 445 {
452 result = scale_asimage (asv, original_asim, 446 result = scale_asimage (asv, original_asim,
453 w, h, 447 w, h,
454 background ? ASA_ASImage : ASA_XImage, 448 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 449 100, ASIMAGE_QUALITY_DEFAULT);
456 } 450 }
457 451
458 if (background == NULL) 452 if (background == NULL)
459 { 453 {
460 if (h_scale == 0 || v_scale == 0) 454 if (bg_flags & BG_TILE)
461 { 455 {
462 /* if tiling - pixmap has to be sized exactly as the image, 456 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 457 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 458 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 459 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 484 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 485 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 486 layers[0].tint = background_tint;
493 layers[1].im = result; 487 layers[1].im = result;
494 488
495 if (h_scale == 0 || v_scale == 0) 489 if (bg_flags & BG_TILE)
496 { 490 {
497 /* tile horizontally */ 491 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 492 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 493 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 494 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 498 /* clip horizontally */
505 layers[1].dst_x = x; 499 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 500 layers[1].clip_width = result->width;
507 } 501 }
508 502
509 if (h_scale == 0 || v_scale == 0) 503 if (bg_flags & BG_TILE)
510 { 504 {
511 while (y > 0) y -= (int)result->height; 505 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 506 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 507 layers[1].clip_height = result->height + target_height;
514 } 508 }
… …
564 558
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 559 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 560 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 561 if (background == NULL)
568 { 562 {
569 if (!(h_scale == 0 || v_scale == 0)) 563 if (!(bg_flags & BG_TILE))
570 { 564 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 565 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
572 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 566 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 567 }
574 568
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 703 get_image_geometry (image_width, image_height, w, h, x, y);
710 704
711 if (!(bg_flags & BG_ROOT_ALIGN) 705 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 706 && (x >= target_width
713 || y >= target_height 707 || y >= target_height
714 || (x + w <= 0) 708 || x + w <= 0
715 || (y + h <= 0))) 709 || y + h <= 0))
716 return false; 710 return false;
717 711
718 result = pixbuf; 712 result = pixbuf;
719 713
720 if ((w != image_width) 714 if (w != image_width
721 || (h != image_height)) 715 || h != image_height)
722 { 716 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 717 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 718 w, h,
725 GDK_INTERP_BILINEAR); 719 GDK_INTERP_BILINEAR);
726 } 720 }
… …
742 root_pmap = bg_pixmap; 736 root_pmap = bg_pixmap;
743 bg_pixmap = None; 737 bg_pixmap = None;
744 } 738 }
745 else 739 else
746 { 740 {
747 if (h_scale == 0 || v_scale == 0) 741 if (bg_flags & BG_TILE)
748 { 742 {
749 new_pmap_width = min (image_width, target_width); 743 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 744 new_pmap_height = min (image_height, target_height);
751 } 745 }
752 } 746 }
… …
765 gcv.foreground = pix_colors[Color_bg]; 759 gcv.foreground = pix_colors[Color_bg];
766 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 760 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
767 761
768 if (gc) 762 if (gc)
769 { 763 {
770 if (h_scale == 0 || v_scale == 0) 764 if (bg_flags & BG_TILE)
771 { 765 {
772 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 766 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
773 pixbuf_to_pixmap (result, tile, gc, 767 pixbuf_to_pixmap (result, tile, gc,
774 0, 0, 768 0, 0,
775 0, 0, 769 0, 0,
… …
855rxvt_term::bg_set_file (const char *file) 849rxvt_term::bg_set_file (const char *file)
856{ 850{
857 if (!file || !*file) 851 if (!file || !*file)
858 return false; 852 return false;
859 853
854 bool ret = false;
860 if (const char *p = strchr (file, ';')) 855 const char *p = strchr (file, ';');
856
857 if (p)
861 { 858 {
862 size_t len = p - file; 859 size_t len = p - file;
863 char *f = rxvt_temp_buf<char> (len + 1); 860 char *f = rxvt_temp_buf<char> (len + 1);
864 memcpy (f, file, len); 861 memcpy (f, file, len);
865 f[len] = '\0'; 862 f[len] = '\0';
… …
874 { 871 {
875 if (original_asim) 872 if (original_asim)
876 safe_asimage_destroy (original_asim); 873 safe_asimage_destroy (original_asim);
877 original_asim = image; 874 original_asim = image;
878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 875 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
879 return true; 876 ret = true;
880 } 877 }
881# endif 878# endif
882 879
883# ifdef HAVE_PIXBUF 880# ifdef HAVE_PIXBUF
884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 881 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
886 { 883 {
887 if (pixbuf) 884 if (pixbuf)
888 g_object_unref (pixbuf); 885 g_object_unref (pixbuf);
889 pixbuf = image; 886 pixbuf = image;
890 bg_flags |= BG_IS_FROM_FILE; 887 bg_flags |= BG_IS_FROM_FILE;
891 return true; 888 ret = true;
892 } 889 }
893# endif 890# endif
894 891
892 if (ret)
893 {
894 if (p)
895 bg_set_geometry (p + 1);
896 else
897 bg_set_default_geometry ();
898 }
899
895 return false; 900 return ret;
896} 901}
897 902
898# endif /* BG_IMAGE_FROM_FILE */ 903# endif /* BG_IMAGE_FROM_FILE */
899 904
900# ifdef ENABLE_TRANSPARENCY 905# ifdef ENABLE_TRANSPARENCY
… …
1337 { 1342 {
1338 /* we need to re-generate transparency pixmap in that case ! */ 1343 /* we need to re-generate transparency pixmap in that case ! */
1339 tr_flags = make_transparency_pixmap (); 1344 tr_flags = make_transparency_pixmap ();
1340 if (tr_flags == 0) 1345 if (tr_flags == 0)
1341 return false; 1346 return false;
1342 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1343 bg_flags |= BG_IS_VALID; 1347 bg_flags |= BG_IS_VALID;
1344 } 1348 }
1345# endif 1349# endif
1346 1350
1347# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1348 if ((bg_flags & BG_IS_FROM_FILE) 1352 if ((bg_flags & BG_IS_FROM_FILE)
… …
1354# endif 1358# endif
1355 1359
1356# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1357 XImage *result = NULL; 1361 XImage *result = NULL;
1358 1362
1359 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1363 if (tr_flags & BG_NEEDS_TINT)
1360 { 1364 {
1361 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1362 } 1366 }
1363 1367
1364 if (result) 1368 if (result)
1365 { 1369 {
1366 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1367 if (tr_flags & BG_NEEDS_TINT) 1371 //if (tr_flags & BG_NEEDS_TINT)
1372 if (1)
1368 { 1373 {
1369 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1370 if (bg_flags & BG_TINT_SET) 1375 if (bg_flags & BG_TINT_SET)
1371 tint.get (c); 1376 tint.get (c);
1372 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1377 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1377 if (gc) 1382 if (gc)
1378 { 1383 {
1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1384 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1380 1385
1381 XFreeGC (dpy, gc); 1386 XFreeGC (dpy, gc);
1382 bg_flags |= BG_IS_VALID;
1383 } 1387 }
1384 1388
1385 XDestroyImage (result); 1389 XDestroyImage (result);
1386 } 1390 }
1387# endif 1391# endif
… …
1428} 1432}
1429 1433
1430#endif /* HAVE_BG_PIXMAP */ 1434#endif /* HAVE_BG_PIXMAP */
1431 1435
1432#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1433/* taken from aterm-0.4.2 */ 1437/* based on code from aterm-0.4.2 */
1434 1438
1435static void 1439static void
1436shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1437{ 1441{
1438 int sh_r, sh_g, sh_b; 1442 int sh_r, sh_g, sh_b;

Diff Legend

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