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.156 by sf-exg, Tue Aug 9 18:41:31 2011 UTC vs.
Revision 1.184 by sf-exg, Sun Dec 25 17:07:00 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_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
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
239 288
240 if (!update) 289 if (!update)
241 { 290 {
242 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
252 w = h; 301 w = h;
253 302
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 304 }
256 305
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 new_flags |= BG_TILE;
266 w = h = noScale;
267 geom_flags |= WidthValue|HeightValue;
268 }
269 else if (!strcasecmp (arr[i], "propscale"))
270 {
271 new_flags |= BG_PROP_SCALE;
272 }
273 else if (!strcasecmp (arr[i], "hscale"))
274 {
275 if (w == 0) w = windowScale;
276
277 h = noScale;
278 geom_flags |= WidthValue|HeightValue;
279 }
280 else if (!strcasecmp (arr[i], "vscale"))
281 {
282 if (h == 0) h = windowScale;
283
284 w = noScale;
285 geom_flags |= WidthValue|HeightValue;
286 }
287 else if (!strcasecmp (arr[i], "scale"))
288 {
289 if (h == 0) h = windowScale;
290 if (w == 0) w = windowScale;
291
292 geom_flags |= WidthValue|HeightValue;
293 }
294 else if (!strcasecmp (arr[i], "auto"))
295 {
296 w = h = windowScale;
297 x = y = centerAlign;
298 geom_flags |= WidthValue|HeightValue|XValue|YValue;
299 }
300 else if (!strcasecmp (arr[i], "root"))
301 {
302 new_flags |= BG_TILE|BG_ROOT_ALIGN;
303 w = h = noScale;
304 geom_flags |= WidthValue|HeightValue;
305 }
306 } /* done parsing ops */
307
308 rxvt_free_strsplit (arr);
309 }
310
311 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
312 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
313 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
314 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
315 310
… …
326rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
327{ 322{
328 int target_width = szHint.width; 323 int target_width = szHint.width;
329 int target_height = szHint.height; 324 int target_height = szHint.height;
330 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
331 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
332 { 330 {
333 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
334 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
335 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
336 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
337 } 335 }
338 else
339 {
340 w = h_scale * target_width / 100;
341 h = v_scale * target_height / 100;
342 }
343 336
344 if (!w) w = image_width; 337 if (!w) w = image_width;
345 if (!h) h = image_height; 338 if (!h) h = image_height;
346 339
347 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
355 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
356 } 349 }
357 350
358 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
359 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
360 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
361 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
362 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
363 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
364} 357}
365 358
… …
392 } 385 }
393 386
394 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
395 { 388 {
396 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
397 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
398 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
399 if (tmp) 392 if (tmp)
400 { 393 {
401 destroy_asimage (&background); 394 destroy_asimage (&background);
402 background = tmp; 395 background = tmp;
… …
421 414
422 if (!original_asim 415 if (!original_asim
423 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
424 && (x >= target_width 417 && (x >= target_width
425 || y >= target_height 418 || y >= target_height
426 || (x + w <= 0) 419 || x + w <= 0
427 || (y + h <= 0)))) 420 || y + h <= 0)))
428 { 421 {
429 if (background) 422 if (background)
430 { 423 {
431 new_pmap_width = background->width; 424 new_pmap_width = background->width;
432 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
446 } 439 }
447 else 440 else
448 { 441 {
449 result = original_asim; 442 result = original_asim;
450 443
451 if ((w != original_asim->width) 444 if (w != original_asim->width
452 || (h != original_asim->height)) 445 || h != original_asim->height)
453 { 446 {
454 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
455 w, h, 448 w, h,
456 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
457 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
458 } 451 }
459 452
460 if (background == NULL) 453 if (background == NULL)
461 { 454 {
… …
711 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
712 705
713 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
714 && (x >= target_width 707 && (x >= target_width
715 || y >= target_height 708 || y >= target_height
716 || (x + w <= 0) 709 || x + w <= 0
717 || (y + h <= 0))) 710 || y + h <= 0))
718 return false; 711 return false;
719 712
720 result = pixbuf; 713 result = pixbuf;
721 714
722 if ((w != image_width) 715 if (w != image_width
723 || (h != image_height)) 716 || h != image_height)
724 { 717 {
725 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
726 w, h, 719 w, h,
727 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
728 } 721 }
… …
857rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
858{ 851{
859 if (!file || !*file) 852 if (!file || !*file)
860 return false; 853 return false;
861 854
855 bool ret = false;
862 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
863 { 859 {
864 size_t len = p - file; 860 size_t len = p - file;
865 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
866 memcpy (f, file, len); 862 memcpy (f, file, len);
867 f[len] = '\0'; 863 f[len] = '\0';
… …
876 { 872 {
877 if (original_asim) 873 if (original_asim)
878 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
879 original_asim = image; 875 original_asim = image;
880 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
881 return true; 877 ret = true;
882 } 878 }
883# endif 879# endif
884 880
885# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
886 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
888 { 884 {
889 if (pixbuf) 885 if (pixbuf)
890 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
891 pixbuf = image; 887 pixbuf = image;
892 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
893 return true; 889 ret = true;
894 } 890 }
895# endif 891# endif
896 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
897 return false; 901 return ret;
898} 902}
899 903
900# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
901 905
902# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
949} 953}
950 954
951void 955void
952rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
953{ 957{
954 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
955 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
956 960
957 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
958 962
959 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1029bool 1033bool
1030rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1031{ 1035{
1032 bool ret = false; 1036 bool ret = false;
1033#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1034 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1035 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1036 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1037 1044
1038 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
… …
1111 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1112 ret = true; 1119 ret = true;
1113 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1114 } 1121 }
1115 } 1122 }
1116 else
1117 {
1118# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1119 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1120 1127
1121 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1122 tint.get (c); 1129 tint.get (c);
1123 1130
… …
1178 ret = true; 1185 ret = true;
1179 1186
1180 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1181 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1182 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1183# endif 1191# endif
1184 }
1185 1192
1186 return ret; 1193 return ret;
1187} 1194}
1188 1195
1189/* 1196/*
… …
1273 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1274 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1275 } 1282 }
1276 1283
1277 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1278 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1279 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1280 1287
1281 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1282 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1283 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1284 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1290 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1291 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1292 1299
1293 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1294 { 1301 {
1295 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1296 && (bg_flags & BG_HAS_RENDER_CONV))
1297 { 1303 {
1298 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1299 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1300 } 1306 }
1301 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1302 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1303 { 1308 {
1304 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1305 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1306 } 1311 }
1307 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1321 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1322 1327
1323 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1324} 1329}
1325# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1326
1327#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1328static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1329# endif
1330 1331
1331bool 1332bool
1332rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1333{ 1334{
1334 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1339 { 1340 {
1340 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1341 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1342 if (tr_flags == 0) 1343 if (tr_flags == 0)
1343 return false; 1344 return false;
1344 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1345 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1346 } 1346 }
1347# endif 1347# endif
1348 1348
1349# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1350 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1356# endif 1356# endif
1357 1357
1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1359 XImage *result = NULL; 1359 XImage *result = NULL;
1360 1360
1361 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1362 { 1362 {
1363 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1363 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1364 } 1364 }
1365 1365
1366 if (result) 1366 if (result)
1367 { 1367 {
1368 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1369 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1370 { 1370 if (1)
1371 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1372 if (bg_flags & BG_TINT_SET)
1373 tint.get (c);
1374 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1375 }
1376 1372
1377 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1378 1374
1379 if (gc) 1375 if (gc)
1380 { 1376 {
1381 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1377 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1382 1378
1383 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1384 bg_flags |= BG_IS_VALID;
1385 } 1380 }
1386 1381
1387 XDestroyImage (result); 1382 XDestroyImage (result);
1388 } 1383 }
1389# endif 1384# endif
… …
1430} 1425}
1431 1426
1432#endif /* HAVE_BG_PIXMAP */ 1427#endif /* HAVE_BG_PIXMAP */
1433 1428
1434#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1429#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1435/* taken from aterm-0.4.2 */ 1430/* based on code from aterm-0.4.2 */
1436 1431
1437static void 1432static inline void
1438shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1433fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1434{
1435 for (int i = 0; i <= mask >> sh; i++)
1436 {
1437 uint32_t tmp;
1438 tmp = i * high;
1439 tmp += (mask >> sh) * low;
1440 lookup[i] = (tmp / 0xffff) << sh;
1441 }
1442}
1443
1444void
1445rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1439{ 1446{
1440 int sh_r, sh_g, sh_b; 1447 int sh_r, sh_g, sh_b;
1441 uint32_t mask_r, mask_g, mask_b; 1448 uint32_t mask_r, mask_g, mask_b;
1442 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1443 rgba low; 1450 unsigned short low;
1444 rgba high;
1445 int i;
1446 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1451 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1447 1452
1448 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1449 1454
1450 /* for convenience */ 1455 /* for convenience */
… …
1509 break; 1514 break;
1510 default: 1515 default:
1511 return; /* we do not support this color depth */ 1516 return; /* we do not support this color depth */
1512 } 1517 }
1513 1518
1519 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1520
1521 if (bg_flags & BG_TINT_SET)
1522 tint.get (c);
1523
1514 /* prepare limits for color transformation (each channel is handled separately) */ 1524 /* prepare limits for color transformation (each channel is handled separately) */
1515 if (shade > 100) 1525 if (shade > 100)
1516 { 1526 {
1517 shade = 200 - shade;
1518
1519 high.r = c.r * shade / 100;
1520 high.g = c.g * shade / 100;
1521 high.b = c.b * shade / 100;
1522
1523 low.r = 65535 * (100 - shade) / 100; 1527 c.r = c.r * (200 - shade) / 100;
1524 low.g = 65535 * (100 - shade) / 100; 1528 c.g = c.g * (200 - shade) / 100;
1525 low.b = 65535 * (100 - shade) / 100; 1529 c.b = c.b * (200 - shade) / 100;
1530
1531 low = 0xffff * (shade - 100) / 100;
1526 } 1532 }
1527 else 1533 else
1528 { 1534 {
1529 high.r = c.r * shade / 100; 1535 c.r = c.r * shade / 100;
1530 high.g = c.g * shade / 100; 1536 c.g = c.g * shade / 100;
1531 high.b = c.b * shade / 100; 1537 c.b = c.b * shade / 100;
1532 1538
1533 low.r = low.g = low.b = 0; 1539 low = 0;
1534 } 1540 }
1535 1541
1536 /* fill our lookup tables */ 1542 /* fill our lookup tables */
1537 for (i = 0; i <= mask_r>>sh_r; i++) 1543 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1538 { 1544 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1539 uint32_t tmp; 1545 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1540 tmp = i * high.r;
1541 tmp += (mask_r>>sh_r) * low.r;
1542 lookup_r[i] = (tmp/65535)<<sh_r;
1543 }
1544 for (i = 0; i <= mask_g>>sh_g; i++)
1545 {
1546 uint32_t tmp;
1547 tmp = i * high.g;
1548 tmp += (mask_g>>sh_g) * low.g;
1549 lookup_g[i] = (tmp/65535)<<sh_g;
1550 }
1551 for (i = 0; i <= mask_b>>sh_b; i++)
1552 {
1553 uint32_t tmp;
1554 tmp = i * high.b;
1555 tmp += (mask_b>>sh_b) * low.b;
1556 lookup_b[i] = (tmp/65535)<<sh_b;
1557 }
1558 1546
1559 /* apply table to input image (replacing colors by newly calculated ones) */ 1547 /* apply table to input image (replacing colors by newly calculated ones) */
1560 if (ximage->bits_per_pixel == 32 1548 if (ximage->bits_per_pixel == 32
1561 && (ximage->depth == 24 || ximage->depth == 32) 1549 && (ximage->depth == 24 || ximage->depth == 32)
1562 && ximage->byte_order == host_byte_order) 1550 && ximage->byte_order == host_byte_order)

Diff Legend

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