| … | |
… | |
| 65 | rxvt_term::bg_destroy () |
65 | rxvt_term::bg_destroy () |
| 66 | { |
66 | { |
| 67 | #ifdef HAVE_AFTERIMAGE |
67 | #ifdef HAVE_AFTERIMAGE |
| 68 | if (original_asim) |
68 | if (original_asim) |
| 69 | safe_asimage_destroy (original_asim); |
69 | safe_asimage_destroy (original_asim); |
|
|
70 | if (asv) |
|
|
71 | destroy_asvisual (asv, 0); |
|
|
72 | if (asimman) |
|
|
73 | destroy_image_manager (asimman, 0); |
| 70 | #endif |
74 | #endif |
| 71 | |
75 | |
| 72 | #ifdef HAVE_PIXBUF |
76 | #ifdef HAVE_PIXBUF |
| 73 | if (pixbuf) |
77 | if (pixbuf) |
| 74 | g_object_unref (pixbuf); |
78 | g_object_unref (pixbuf); |
| … | |
… | |
| 99 | if (bg_flags & BG_IS_TRANSPARENT) |
103 | if (bg_flags & BG_IS_TRANSPARENT) |
| 100 | return true; |
104 | return true; |
| 101 | # endif |
105 | # endif |
| 102 | |
106 | |
| 103 | # ifdef BG_IMAGE_FROM_FILE |
107 | # ifdef BG_IMAGE_FROM_FILE |
| 104 | if (have_image) |
108 | if (bg_flags & BG_IS_FROM_FILE) |
| 105 | { |
109 | { |
| 106 | if (bg_flags & BG_IS_SIZE_SENSITIVE) |
110 | if (bg_flags & BG_IS_SIZE_SENSITIVE) |
| 107 | return true; |
111 | return true; |
| 108 | } |
112 | } |
| 109 | # endif |
113 | # endif |
| … | |
… | |
| 118 | if (bg_flags & BG_IS_TRANSPARENT) |
122 | if (bg_flags & BG_IS_TRANSPARENT) |
| 119 | return true; |
123 | return true; |
| 120 | # endif |
124 | # endif |
| 121 | |
125 | |
| 122 | # ifdef BG_IMAGE_FROM_FILE |
126 | # ifdef BG_IMAGE_FROM_FILE |
| 123 | if (have_image) |
127 | if (bg_flags & BG_IS_FROM_FILE) |
| 124 | { |
128 | { |
| 125 | if (bg_flags & BG_ROOT_ALIGN) |
129 | if (bg_flags & BG_ROOT_ALIGN) |
| 126 | return true; |
130 | return true; |
| 127 | } |
131 | } |
| 128 | # endif |
132 | # endif |
| … | |
… | |
| 868 | if (image) |
872 | if (image) |
| 869 | { |
873 | { |
| 870 | if (original_asim) |
874 | if (original_asim) |
| 871 | safe_asimage_destroy (original_asim); |
875 | safe_asimage_destroy (original_asim); |
| 872 | original_asim = image; |
876 | original_asim = image; |
| 873 | bg_flags |= BG_CLIENT_RENDER; |
877 | bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; |
| 874 | have_image = true; |
|
|
| 875 | return true; |
878 | return true; |
| 876 | } |
879 | } |
| 877 | # endif |
880 | # endif |
| 878 | |
881 | |
| 879 | # ifdef HAVE_PIXBUF |
882 | # ifdef HAVE_PIXBUF |
| … | |
… | |
| 881 | if (image) |
884 | if (image) |
| 882 | { |
885 | { |
| 883 | if (pixbuf) |
886 | if (pixbuf) |
| 884 | g_object_unref (pixbuf); |
887 | g_object_unref (pixbuf); |
| 885 | pixbuf = image; |
888 | pixbuf = image; |
| 886 | have_image = true; |
889 | bg_flags |= BG_IS_FROM_FILE; |
| 887 | return true; |
890 | return true; |
| 888 | } |
891 | } |
| 889 | # endif |
892 | # endif |
| 890 | |
893 | |
| 891 | return false; |
894 | return false; |
| … | |
… | |
| 1350 | bg_flags |= BG_IS_VALID; |
1353 | bg_flags |= BG_IS_VALID; |
| 1351 | } |
1354 | } |
| 1352 | # endif |
1355 | # endif |
| 1353 | |
1356 | |
| 1354 | # ifdef BG_IMAGE_FROM_FILE |
1357 | # ifdef BG_IMAGE_FROM_FILE |
| 1355 | if (have_image |
1358 | if ((bg_flags & BG_IS_FROM_FILE) |
| 1356 | || (tr_flags & BG_EFFECTS_FLAGS)) |
1359 | || (tr_flags & BG_EFFECTS_FLAGS)) |
| 1357 | { |
1360 | { |
| 1358 | if (render_image (tr_flags)) |
1361 | if (render_image (tr_flags)) |
| 1359 | bg_flags |= BG_IS_VALID; |
1362 | bg_flags |= BG_IS_VALID; |
| 1360 | } |
1363 | } |
