… | |
… | |
150 | int smaller = min (image_size, window_size); |
150 | int smaller = min (image_size, window_size); |
151 | |
151 | |
152 | if (align >= 0 && align <= 100) |
152 | if (align >= 0 && align <= 100) |
153 | return diff * align / 100; |
153 | return diff * align / 100; |
154 | else if (align > 100 && align <= 200) |
154 | else if (align > 100 && align <= 200) |
155 | return ((align - 100) * smaller / 100) + window_size - smaller; |
155 | return (align - 100) * smaller / 100 + window_size - smaller; |
156 | else if (align >= -100 && align < 0) |
156 | else if (align >= -100 && align < 0) |
157 | return ((align + 100) * smaller / 100) - image_size; |
157 | return (align + 100) * smaller / 100 - image_size; |
158 | return 0; |
158 | return 0; |
159 | } |
159 | } |
160 | |
160 | |
161 | static inline int |
161 | static inline int |
162 | make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) |
162 | make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) |
… | |
… | |
181 | { |
181 | { |
182 | bool changed = false; |
182 | bool changed = false; |
183 | int geom_flags = 0; |
183 | int geom_flags = 0; |
184 | int x = 0, y = 0; |
184 | int x = 0, y = 0; |
185 | unsigned int w = 0, h = 0; |
185 | unsigned int w = 0, h = 0; |
186 | unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); |
186 | unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS; |
187 | |
187 | |
188 | if (geom == NULL) |
188 | if (geom == NULL) |
189 | return false; |
189 | return false; |
190 | |
190 | |
191 | if (geom[0]) |
191 | if (geom[0]) |
192 | { |
192 | { |
193 | char **arr = rxvt_strsplit (':', geom); |
193 | char **arr = rxvt_strsplit (':', geom); |
194 | |
194 | |
195 | for (int i = 0; arr[i]; i++) |
195 | for (int i = 0; arr[i]; i++) |
196 | { |
196 | { |
197 | if (!strcasecmp (arr[i], "style=tiled")) |
197 | if (!strcasecmp (arr[i], "style=tiled")) |
198 | { |
198 | { |
199 | new_flags = BG_TILE; |
199 | new_flags = BG_TILE; |
200 | w = h = noScale; |
200 | w = h = noScale; |
… | |
… | |
383 | } |
383 | } |
384 | |
384 | |
385 | if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) |
385 | if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) |
386 | { |
386 | { |
387 | ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, |
387 | ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, |
388 | (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, |
388 | ASA_XImage, |
389 | 100, ASIMAGE_QUALITY_DEFAULT); |
389 | 100, ASIMAGE_QUALITY_DEFAULT); |
390 | if (tmp) |
390 | if (tmp) |
391 | { |
391 | { |
392 | destroy_asimage (&background); |
392 | destroy_asimage (&background); |
393 | background = tmp; |
393 | background = tmp; |
… | |
… | |
412 | |
412 | |
413 | if (!original_asim |
413 | if (!original_asim |
414 | || (!(bg_flags & BG_ROOT_ALIGN) |
414 | || (!(bg_flags & BG_ROOT_ALIGN) |
415 | && (x >= target_width |
415 | && (x >= target_width |
416 | || y >= target_height |
416 | || y >= target_height |
417 | || (x + w <= 0) |
417 | || x + w <= 0 |
418 | || (y + h <= 0)))) |
418 | || y + h <= 0))) |
419 | { |
419 | { |
420 | if (background) |
420 | if (background) |
421 | { |
421 | { |
422 | new_pmap_width = background->width; |
422 | new_pmap_width = background->width; |
423 | new_pmap_height = background->height; |
423 | new_pmap_height = background->height; |
… | |
… | |
437 | } |
437 | } |
438 | else |
438 | else |
439 | { |
439 | { |
440 | result = original_asim; |
440 | result = original_asim; |
441 | |
441 | |
442 | if ((w != original_asim->width) |
442 | if (w != original_asim->width |
443 | || (h != original_asim->height)) |
443 | || h != original_asim->height) |
444 | { |
444 | { |
445 | result = scale_asimage (asv, original_asim, |
445 | result = scale_asimage (asv, original_asim, |
446 | w, h, |
446 | w, h, |
447 | background ? ASA_ASImage : ASA_XImage, |
447 | ASA_XImage, |
448 | 100, ASIMAGE_QUALITY_DEFAULT); |
448 | 100, ASIMAGE_QUALITY_DEFAULT); |
449 | } |
449 | } |
450 | |
450 | |
451 | if (background == NULL) |
451 | if (background == NULL) |
452 | { |
452 | { |
… | |
… | |
702 | get_image_geometry (image_width, image_height, w, h, x, y); |
702 | get_image_geometry (image_width, image_height, w, h, x, y); |
703 | |
703 | |
704 | if (!(bg_flags & BG_ROOT_ALIGN) |
704 | if (!(bg_flags & BG_ROOT_ALIGN) |
705 | && (x >= target_width |
705 | && (x >= target_width |
706 | || y >= target_height |
706 | || y >= target_height |
707 | || (x + w <= 0) |
707 | || x + w <= 0 |
708 | || (y + h <= 0))) |
708 | || y + h <= 0)) |
709 | return false; |
709 | return false; |
710 | |
710 | |
711 | result = pixbuf; |
711 | result = pixbuf; |
712 | |
712 | |
713 | if ((w != image_width) |
713 | if (w != image_width |
714 | || (h != image_height)) |
714 | || h != image_height) |
715 | { |
715 | { |
716 | result = gdk_pixbuf_scale_simple (pixbuf, |
716 | result = gdk_pixbuf_scale_simple (pixbuf, |
717 | w, h, |
717 | w, h, |
718 | GDK_INTERP_BILINEAR); |
718 | GDK_INTERP_BILINEAR); |
719 | } |
719 | } |
… | |
… | |
848 | rxvt_term::bg_set_file (const char *file) |
848 | rxvt_term::bg_set_file (const char *file) |
849 | { |
849 | { |
850 | if (!file || !*file) |
850 | if (!file || !*file) |
851 | return false; |
851 | return false; |
852 | |
852 | |
|
|
853 | bool ret = false; |
853 | if (const char *p = strchr (file, ';')) |
854 | const char *p = strchr (file, ';'); |
|
|
855 | |
|
|
856 | if (p) |
854 | { |
857 | { |
855 | size_t len = p - file; |
858 | size_t len = p - file; |
856 | char *f = rxvt_temp_buf<char> (len + 1); |
859 | char *f = rxvt_temp_buf<char> (len + 1); |
857 | memcpy (f, file, len); |
860 | memcpy (f, file, len); |
858 | f[len] = '\0'; |
861 | f[len] = '\0'; |
… | |
… | |
867 | { |
870 | { |
868 | if (original_asim) |
871 | if (original_asim) |
869 | safe_asimage_destroy (original_asim); |
872 | safe_asimage_destroy (original_asim); |
870 | original_asim = image; |
873 | original_asim = image; |
871 | bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; |
874 | bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; |
872 | return true; |
875 | ret = true; |
873 | } |
876 | } |
874 | # endif |
877 | # endif |
875 | |
878 | |
876 | # ifdef HAVE_PIXBUF |
879 | # ifdef HAVE_PIXBUF |
877 | GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); |
880 | GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); |
… | |
… | |
879 | { |
882 | { |
880 | if (pixbuf) |
883 | if (pixbuf) |
881 | g_object_unref (pixbuf); |
884 | g_object_unref (pixbuf); |
882 | pixbuf = image; |
885 | pixbuf = image; |
883 | bg_flags |= BG_IS_FROM_FILE; |
886 | bg_flags |= BG_IS_FROM_FILE; |
884 | return true; |
887 | ret = true; |
885 | } |
888 | } |
886 | # endif |
889 | # endif |
887 | |
890 | |
|
|
891 | if (ret) |
|
|
892 | { |
|
|
893 | if (p) |
|
|
894 | bg_set_geometry (p + 1); |
|
|
895 | else |
|
|
896 | bg_set_default_geometry (); |
|
|
897 | } |
|
|
898 | |
888 | return false; |
899 | return ret; |
889 | } |
900 | } |
890 | |
901 | |
891 | # endif /* BG_IMAGE_FROM_FILE */ |
902 | # endif /* BG_IMAGE_FROM_FILE */ |
892 | |
903 | |
893 | # ifdef ENABLE_TRANSPARENCY |
904 | # ifdef ENABLE_TRANSPARENCY |
… | |
… | |
1330 | { |
1341 | { |
1331 | /* we need to re-generate transparency pixmap in that case ! */ |
1342 | /* we need to re-generate transparency pixmap in that case ! */ |
1332 | tr_flags = make_transparency_pixmap (); |
1343 | tr_flags = make_transparency_pixmap (); |
1333 | if (tr_flags == 0) |
1344 | if (tr_flags == 0) |
1334 | return false; |
1345 | return false; |
1335 | else if (!(tr_flags & BG_EFFECTS_FLAGS)) |
|
|
1336 | bg_flags |= BG_IS_VALID; |
1346 | bg_flags |= BG_IS_VALID; |
1337 | } |
1347 | } |
1338 | # endif |
1348 | # endif |
1339 | |
1349 | |
1340 | # ifdef BG_IMAGE_FROM_FILE |
1350 | # ifdef BG_IMAGE_FROM_FILE |
1341 | if ((bg_flags & BG_IS_FROM_FILE) |
1351 | if ((bg_flags & BG_IS_FROM_FILE) |
… | |
… | |
1347 | # endif |
1357 | # endif |
1348 | |
1358 | |
1349 | # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
1359 | # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
1350 | XImage *result = NULL; |
1360 | XImage *result = NULL; |
1351 | |
1361 | |
1352 | if (tr_flags && !(bg_flags & BG_IS_VALID)) |
1362 | if (tr_flags & BG_NEEDS_TINT) |
1353 | { |
1363 | { |
1354 | result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); |
1364 | result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); |
1355 | } |
1365 | } |
1356 | |
1366 | |
1357 | if (result) |
1367 | if (result) |
1358 | { |
1368 | { |
1359 | /* our own client-side tinting */ |
1369 | /* our own client-side tinting */ |
1360 | if (tr_flags & BG_NEEDS_TINT) |
1370 | //if (tr_flags & BG_NEEDS_TINT) |
|
|
1371 | if (1) |
1361 | { |
1372 | { |
1362 | rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); |
1373 | rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); |
1363 | if (bg_flags & BG_TINT_SET) |
1374 | if (bg_flags & BG_TINT_SET) |
1364 | tint.get (c); |
1375 | tint.get (c); |
1365 | shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); |
1376 | shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); |
… | |
… | |
1370 | if (gc) |
1381 | if (gc) |
1371 | { |
1382 | { |
1372 | XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); |
1383 | XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); |
1373 | |
1384 | |
1374 | XFreeGC (dpy, gc); |
1385 | XFreeGC (dpy, gc); |
1375 | bg_flags |= BG_IS_VALID; |
|
|
1376 | } |
1386 | } |
1377 | |
1387 | |
1378 | XDestroyImage (result); |
1388 | XDestroyImage (result); |
1379 | } |
1389 | } |
1380 | # endif |
1390 | # endif |
… | |
… | |
1421 | } |
1431 | } |
1422 | |
1432 | |
1423 | #endif /* HAVE_BG_PIXMAP */ |
1433 | #endif /* HAVE_BG_PIXMAP */ |
1424 | |
1434 | |
1425 | #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
1435 | #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) |
1426 | /* taken from aterm-0.4.2 */ |
1436 | /* based on code from aterm-0.4.2 */ |
1427 | |
1437 | |
1428 | static void |
1438 | static void |
1429 | shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) |
1439 | shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) |
1430 | { |
1440 | { |
1431 | int sh_r, sh_g, sh_b; |
1441 | int sh_r, sh_g, sh_b; |