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.161 by sf-exg, Thu Aug 11 08:39:10 2011 UTC vs.
Revision 1.186 by sf-exg, Wed Dec 28 11:11:25 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 */
52
53#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
54void 38void
55rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
56{ 40{
57#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
166 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
167 151
168 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
169 return diff * align / 100; 153 return diff * align / 100;
170 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
174 return 0; 158 return 0;
175} 159}
176 160
177static inline int 161static inline int
178make_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)
… …
197{ 181{
198 bool changed = false; 182 bool changed = false;
199 int geom_flags = 0; 183 int geom_flags = 0;
200 int x = 0, y = 0; 184 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
202 unsigned int n; 186 unsigned long new_flags = 0;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
204 const char *ops;
205 187
206 if (geom == NULL) 188 if (geom == NULL)
207 return false; 189 return false;
208 190
209 char str[256]; 191 if (geom[0])
210
211 ops = strchr (geom, ':');
212 if (ops == NULL)
213 n = strlen (geom);
214 else
215 n = ops - geom;
216
217 if (n >= sizeof (str))
218 return false;
219
220 memcpy (str, geom, n);
221 str[n] = '\0';
222 rxvt_strtrim (str);
223
224 if (str[0])
225 { 192 {
226 /* 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_KEEP_ASPECT;
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=keep-aspect"))
233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root-align"))
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_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
249 }
250 else if (!strcasecmp (arr[i], "hscale"))
251 {
252 new_flags |= BG_TILE;
253 w = windowScale;
254 h = noScale;
255 geom_flags |= WidthValue|HeightValue;
256 }
257 else if (!strcasecmp (arr[i], "vscale"))
258 {
259 new_flags |= BG_TILE;
260 h = windowScale;
261 w = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "scale"))
265 {
266 w = h = windowScale;
267 geom_flags |= WidthValue|HeightValue;
268 }
269 else if (!strcasecmp (arr[i], "auto"))
270 {
271 w = h = windowScale;
272 x = y = centerAlign;
273 geom_flags |= WidthValue|HeightValue|XValue|YValue;
274 }
275 else if (!strcasecmp (arr[i], "root"))
276 {
277 new_flags |= BG_TILE|BG_ROOT_ALIGN;
278 w = h = noScale;
279 geom_flags |= WidthValue|HeightValue;
280 }
281
282 else
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
229 290
230 if (!update) 291 if (!update)
231 { 292 {
232 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
242 w = h; 303 w = h;
243 304
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 305 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 306 }
246 307
247 if (ops)
248 {
249 char **arr = rxvt_strsplit (':', ops + 1);
250
251 for (int i = 0; arr[i]; i++)
252 {
253 if (!strcasecmp (arr[i], "style=tiled"))
254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 else if (!strcasecmp (arr[i], "propscale"))
300 {
301 new_flags |= BG_PROP_SCALE;
302 }
303 else if (!strcasecmp (arr[i], "hscale"))
304 {
305 w = windowScale;
306 h = noScale;
307 geom_flags |= WidthValue|HeightValue;
308 }
309 else if (!strcasecmp (arr[i], "vscale"))
310 {
311 h = windowScale;
312 w = noScale;
313 geom_flags |= WidthValue|HeightValue;
314 }
315 else if (!strcasecmp (arr[i], "scale"))
316 {
317 w = h = windowScale;
318 geom_flags |= WidthValue|HeightValue;
319 }
320 else if (!strcasecmp (arr[i], "auto"))
321 {
322 w = h = windowScale;
323 x = y = centerAlign;
324 geom_flags |= WidthValue|HeightValue|XValue|YValue;
325 }
326 else if (!strcasecmp (arr[i], "root"))
327 {
328 new_flags |= BG_TILE|BG_ROOT_ALIGN;
329 w = h = noScale;
330 geom_flags |= WidthValue|HeightValue;
331 }
332 } /* done parsing ops */
333
334 rxvt_free_strsplit (arr);
335 }
336
337 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 308 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
338 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 309 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
339 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 310 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
340 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 311 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
341 312
… …
352rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 323rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
353{ 324{
354 int target_width = szHint.width; 325 int target_width = szHint.width;
355 int target_height = szHint.height; 326 int target_height = szHint.height;
356 327
328 w = h_scale * target_width / 100;
329 h = v_scale * target_height / 100;
330
357 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
358 { 332 {
359 float scale = (float)target_width / image_width; 333 float scale = (float)w / image_width;
360 min_it (scale, (float)target_height / image_height); 334 min_it (scale, (float)h / image_height);
361 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
362 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
363 } 337 }
364 else
365 {
366 w = h_scale * target_width / 100;
367 h = v_scale * target_height / 100;
368 }
369 338
370 if (!w) w = image_width; 339 if (!w) w = image_width;
371 if (!h) h = image_height; 340 if (!h) h = image_height;
372 341
373 if (bg_flags & BG_ROOT_ALIGN) 342 if (bg_flags & BG_ROOT_ALIGN)
… …
381 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
382 } 351 }
383 352
384 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 353 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
385 if (!(bg_flags & BG_TILE) 354 if (!(bg_flags & BG_TILE)
386 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 355 || h_scale || v_scale
387 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 356 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
388 || w > target_width || h > target_height) 357 || w > target_width || h > target_height)
389 bg_flags |= BG_IS_SIZE_SENSITIVE; 358 bg_flags |= BG_IS_SIZE_SENSITIVE;
390} 359}
391 360
… …
418 } 387 }
419 388
420 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 389 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
421 { 390 {
422 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 391 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
423 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 392 ASA_XImage,
424 100, ASIMAGE_QUALITY_DEFAULT); 393 100, ASIMAGE_QUALITY_DEFAULT);
425 if (tmp) 394 if (tmp)
426 { 395 {
427 destroy_asimage (&background); 396 destroy_asimage (&background);
428 background = tmp; 397 background = tmp;
… …
447 416
448 if (!original_asim 417 if (!original_asim
449 || (!(bg_flags & BG_ROOT_ALIGN) 418 || (!(bg_flags & BG_ROOT_ALIGN)
450 && (x >= target_width 419 && (x >= target_width
451 || y >= target_height 420 || y >= target_height
452 || (x + w <= 0) 421 || x + w <= 0
453 || (y + h <= 0)))) 422 || y + h <= 0)))
454 { 423 {
455 if (background) 424 if (background)
456 { 425 {
457 new_pmap_width = background->width; 426 new_pmap_width = background->width;
458 new_pmap_height = background->height; 427 new_pmap_height = background->height;
… …
472 } 441 }
473 else 442 else
474 { 443 {
475 result = original_asim; 444 result = original_asim;
476 445
477 if ((w != original_asim->width) 446 if (w != original_asim->width
478 || (h != original_asim->height)) 447 || h != original_asim->height)
479 { 448 {
480 result = scale_asimage (asv, original_asim, 449 result = scale_asimage (asv, original_asim,
481 w, h, 450 w, h,
482 background ? ASA_ASImage : ASA_XImage, 451 ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 452 100, ASIMAGE_QUALITY_DEFAULT);
484 } 453 }
485 454
486 if (background == NULL) 455 if (background == NULL)
487 { 456 {
… …
737 get_image_geometry (image_width, image_height, w, h, x, y); 706 get_image_geometry (image_width, image_height, w, h, x, y);
738 707
739 if (!(bg_flags & BG_ROOT_ALIGN) 708 if (!(bg_flags & BG_ROOT_ALIGN)
740 && (x >= target_width 709 && (x >= target_width
741 || y >= target_height 710 || y >= target_height
742 || (x + w <= 0) 711 || x + w <= 0
743 || (y + h <= 0))) 712 || y + h <= 0))
744 return false; 713 return false;
745 714
746 result = pixbuf; 715 result = pixbuf;
747 716
748 if ((w != image_width) 717 if (w != image_width
749 || (h != image_height)) 718 || h != image_height)
750 { 719 {
751 result = gdk_pixbuf_scale_simple (pixbuf, 720 result = gdk_pixbuf_scale_simple (pixbuf,
752 w, h, 721 w, h,
753 GDK_INTERP_BILINEAR); 722 GDK_INTERP_BILINEAR);
754 } 723 }
… …
883rxvt_term::bg_set_file (const char *file) 852rxvt_term::bg_set_file (const char *file)
884{ 853{
885 if (!file || !*file) 854 if (!file || !*file)
886 return false; 855 return false;
887 856
857 bool ret = false;
888 if (const char *p = strchr (file, ';')) 858 const char *p = strchr (file, ';');
859
860 if (p)
889 { 861 {
890 size_t len = p - file; 862 size_t len = p - file;
891 char *f = rxvt_temp_buf<char> (len + 1); 863 char *f = rxvt_temp_buf<char> (len + 1);
892 memcpy (f, file, len); 864 memcpy (f, file, len);
893 f[len] = '\0'; 865 f[len] = '\0';
… …
902 { 874 {
903 if (original_asim) 875 if (original_asim)
904 safe_asimage_destroy (original_asim); 876 safe_asimage_destroy (original_asim);
905 original_asim = image; 877 original_asim = image;
906 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
907 return true; 879 ret = true;
908 } 880 }
909# endif 881# endif
910 882
911# ifdef HAVE_PIXBUF 883# ifdef HAVE_PIXBUF
912 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
914 { 886 {
915 if (pixbuf) 887 if (pixbuf)
916 g_object_unref (pixbuf); 888 g_object_unref (pixbuf);
917 pixbuf = image; 889 pixbuf = image;
918 bg_flags |= BG_IS_FROM_FILE; 890 bg_flags |= BG_IS_FROM_FILE;
919 return true; 891 ret = true;
920 } 892 }
921# endif 893# endif
922 894
895 if (ret)
896 {
897 if (p)
898 bg_set_geometry (p + 1);
899 else
900 bg_set_default_geometry ();
901 }
902
923 return false; 903 return ret;
924} 904}
925 905
926# endif /* BG_IMAGE_FROM_FILE */ 906# endif /* BG_IMAGE_FROM_FILE */
927 907
928# ifdef ENABLE_TRANSPARENCY 908# ifdef ENABLE_TRANSPARENCY
… …
975} 955}
976 956
977void 957void
978rxvt_term::set_tint_shade_flags () 958rxvt_term::set_tint_shade_flags ()
979{ 959{
980 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 960 rgba c;
981 bool has_shade = shade != 100; 961 bool has_shade = shade != 100;
982 962
983 bg_flags &= ~BG_TINT_FLAGS; 963 bg_flags &= ~BG_TINT_FLAGS;
984 964
985 if (bg_flags & BG_TINT_SET) 965 if (bg_flags & BG_TINT_SET)
… …
1011} 991}
1012 992
1013bool 993bool
1014rxvt_term::bg_set_shade (const char *shade_str) 994rxvt_term::bg_set_shade (const char *shade_str)
1015{ 995{
1016 int new_shade = (shade_str) ? atoi (shade_str) : 100; 996 int new_shade = atoi (shade_str);
1017 997
1018 clamp_it (new_shade, -100, 200); 998 clamp_it (new_shade, -100, 200);
1019 if (new_shade < 0) 999 if (new_shade < 0)
1020 new_shade = 200 - (100 + new_shade); 1000 new_shade = 200 - (100 + new_shade);
1021 1001
… …
1055bool 1035bool
1056rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1036rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1057{ 1037{
1058 bool ret = false; 1038 bool ret = false;
1059#if XRENDER 1039#if XRENDER
1040 if (!(bg_flags & BG_HAS_RENDER_CONV))
1041 return false;
1042
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1043 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double)); 1044 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1045 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063 1046
1064 XRenderPictureAttributes pa; 1047 XRenderPictureAttributes pa;
… …
1137 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1120 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1138 ret = true; 1121 ret = true;
1139 XFreeGC (dpy, gc); 1122 XFreeGC (dpy, gc);
1140 } 1123 }
1141 } 1124 }
1142 else
1143 {
1144# if XRENDER 1125# if XRENDER
1126 else if (bg_flags & BG_HAS_RENDER)
1127 {
1145 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1128 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1146 1129
1147 if (bg_flags & BG_TINT_SET) 1130 if (bg_flags & BG_TINT_SET)
1148 tint.get (c); 1131 tint.get (c);
1149 1132
… …
1204 ret = true; 1187 ret = true;
1205 1188
1206 XRenderFreePicture (dpy, mask_pic); 1189 XRenderFreePicture (dpy, mask_pic);
1207 XRenderFreePicture (dpy, overlay_pic); 1190 XRenderFreePicture (dpy, overlay_pic);
1208 XRenderFreePicture (dpy, back_pic); 1191 XRenderFreePicture (dpy, back_pic);
1192 }
1209# endif 1193# endif
1210 }
1211 1194
1212 return ret; 1195 return ret;
1213} 1196}
1214 1197
1215/* 1198/*
… …
1299 bg_pmap_width = window_width; 1282 bg_pmap_width = window_width;
1300 bg_pmap_height = window_height; 1283 bg_pmap_height = window_height;
1301 } 1284 }
1302 1285
1303 /* straightforward pixmap copy */ 1286 /* straightforward pixmap copy */
1304 while (sx < 0) sx += root_width; 1287 while (sx < 0) sx += root_pmap_width;
1305 while (sy < 0) sy += root_height; 1288 while (sy < 0) sy += root_pmap_height;
1306 1289
1307 gcv.tile = recoded_root_pmap; 1290 gcv.tile = recoded_root_pmap;
1308 gcv.fill_style = FillTiled; 1291 gcv.fill_style = FillTiled;
1309 gcv.ts_x_origin = -sx; 1292 gcv.ts_x_origin = -sx;
1310 gcv.ts_y_origin = -sy; 1293 gcv.ts_y_origin = -sy;
… …
1316 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1299 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1317 XFreeGC (dpy, gc); 1300 XFreeGC (dpy, gc);
1318 1301
1319 if (!(bg_flags & BG_CLIENT_RENDER)) 1302 if (!(bg_flags & BG_CLIENT_RENDER))
1320 { 1303 {
1321 if ((bg_flags & BG_NEEDS_BLUR) 1304 if (bg_flags & BG_NEEDS_BLUR)
1322 && (bg_flags & BG_HAS_RENDER_CONV))
1323 { 1305 {
1324 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1325 result &= ~BG_NEEDS_BLUR; 1307 result &= ~BG_NEEDS_BLUR;
1326 } 1308 }
1327 if ((bg_flags & BG_NEEDS_TINT) 1309 if (bg_flags & BG_NEEDS_TINT)
1328 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1329 { 1310 {
1330 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1311 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1331 result &= ~BG_NEEDS_TINT; 1312 result &= ~BG_NEEDS_TINT;
1332 } 1313 }
1333 } /* server side rendering completed */ 1314 } /* server side rendering completed */
… …
1347 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1328 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1348 1329
1349 root_pixmap = new_root_pixmap; 1330 root_pixmap = new_root_pixmap;
1350} 1331}
1351# endif /* ENABLE_TRANSPARENCY */ 1332# endif /* ENABLE_TRANSPARENCY */
1352
1353#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1354static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1355# endif
1356 1333
1357bool 1334bool
1358rxvt_term::bg_render () 1335rxvt_term::bg_render ()
1359{ 1336{
1360 unsigned long tr_flags = 0; 1337 unsigned long tr_flags = 0;
… …
1365 { 1342 {
1366 /* we need to re-generate transparency pixmap in that case ! */ 1343 /* we need to re-generate transparency pixmap in that case ! */
1367 tr_flags = make_transparency_pixmap (); 1344 tr_flags = make_transparency_pixmap ();
1368 if (tr_flags == 0) 1345 if (tr_flags == 0)
1369 return false; 1346 return false;
1370 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1371 bg_flags |= BG_IS_VALID; 1347 bg_flags |= BG_IS_VALID;
1372 } 1348 }
1373# endif 1349# endif
1374 1350
1375# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1376 if ((bg_flags & BG_IS_FROM_FILE) 1352 if ((bg_flags & BG_IS_FROM_FILE)
… …
1382# endif 1358# endif
1383 1359
1384# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1385 XImage *result = NULL; 1361 XImage *result = NULL;
1386 1362
1387 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1363 if (tr_flags & BG_NEEDS_TINT)
1388 { 1364 {
1389 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);
1390 } 1366 }
1391 1367
1392 if (result) 1368 if (result)
1393 { 1369 {
1394 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1395 if (tr_flags & BG_NEEDS_TINT) 1371 //if (tr_flags & BG_NEEDS_TINT)
1396 { 1372 if (1)
1397 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1398 if (bg_flags & BG_TINT_SET)
1399 tint.get (c);
1400 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1373 tint_ximage (DefaultVisual (dpy, display->screen), result);
1401 }
1402 1374
1403 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1375 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1404 1376
1405 if (gc) 1377 if (gc)
1406 { 1378 {
1407 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1408 1380
1409 XFreeGC (dpy, gc); 1381 XFreeGC (dpy, gc);
1410 bg_flags |= BG_IS_VALID;
1411 } 1382 }
1412 1383
1413 XDestroyImage (result); 1384 XDestroyImage (result);
1414 } 1385 }
1415# endif 1386# endif
… …
1456} 1427}
1457 1428
1458#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1459 1430
1460#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1461/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1462 1433
1463static void 1434static inline void
1464shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1435fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1436{
1437 for (int i = 0; i <= mask >> sh; i++)
1438 {
1439 uint32_t tmp;
1440 tmp = i * high;
1441 tmp += (mask >> sh) * low;
1442 lookup[i] = (tmp / 0xffff) << sh;
1443 }
1444}
1445
1446void
1447rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1465{ 1448{
1466 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1467 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1468 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1469 rgba low; 1452 unsigned short low;
1470 rgba high;
1471 int i;
1472 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1473 1454
1474 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1475 1456
1476 /* for convenience */ 1457 /* for convenience */
… …
1535 break; 1516 break;
1536 default: 1517 default:
1537 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1538 } 1519 }
1539 1520
1521 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1522
1523 if (bg_flags & BG_TINT_SET)
1524 tint.get (c);
1525
1540 /* prepare limits for color transformation (each channel is handled separately) */ 1526 /* prepare limits for color transformation (each channel is handled separately) */
1541 if (shade > 100) 1527 if (shade > 100)
1542 { 1528 {
1543 shade = 200 - shade;
1544
1545 high.r = c.r * shade / 100;
1546 high.g = c.g * shade / 100;
1547 high.b = c.b * shade / 100;
1548
1549 low.r = 65535 * (100 - shade) / 100; 1529 c.r = c.r * (200 - shade) / 100;
1550 low.g = 65535 * (100 - shade) / 100; 1530 c.g = c.g * (200 - shade) / 100;
1551 low.b = 65535 * (100 - shade) / 100; 1531 c.b = c.b * (200 - shade) / 100;
1532
1533 low = 0xffff * (shade - 100) / 100;
1552 } 1534 }
1553 else 1535 else
1554 { 1536 {
1555 high.r = c.r * shade / 100; 1537 c.r = c.r * shade / 100;
1556 high.g = c.g * shade / 100; 1538 c.g = c.g * shade / 100;
1557 high.b = c.b * shade / 100; 1539 c.b = c.b * shade / 100;
1558 1540
1559 low.r = low.g = low.b = 0; 1541 low = 0;
1560 } 1542 }
1561 1543
1562 /* fill our lookup tables */ 1544 /* fill our lookup tables */
1563 for (i = 0; i <= mask_r>>sh_r; i++) 1545 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1564 { 1546 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1565 uint32_t tmp; 1547 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1566 tmp = i * high.r;
1567 tmp += (mask_r>>sh_r) * low.r;
1568 lookup_r[i] = (tmp/65535)<<sh_r;
1569 }
1570 for (i = 0; i <= mask_g>>sh_g; i++)
1571 {
1572 uint32_t tmp;
1573 tmp = i * high.g;
1574 tmp += (mask_g>>sh_g) * low.g;
1575 lookup_g[i] = (tmp/65535)<<sh_g;
1576 }
1577 for (i = 0; i <= mask_b>>sh_b; i++)
1578 {
1579 uint32_t tmp;
1580 tmp = i * high.b;
1581 tmp += (mask_b>>sh_b) * low.b;
1582 lookup_b[i] = (tmp/65535)<<sh_b;
1583 }
1584 1548
1585 /* apply table to input image (replacing colors by newly calculated ones) */ 1549 /* apply table to input image (replacing colors by newly calculated ones) */
1586 if (ximage->bits_per_pixel == 32 1550 if (ximage->bits_per_pixel == 32
1587 && (ximage->depth == 24 || ximage->depth == 32) 1551 && (ximage->depth == 24 || ximage->depth == 32)
1588 && ximage->byte_order == host_byte_order) 1552 && ximage->byte_order == host_byte_order)

Diff Legend

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