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.159 by sf-exg, Wed Aug 10 07:34:35 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 * scale Scale both up and down
58 */
59
60#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
61void 38void
62rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
63{ 40{
64#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
173 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
174 151
175 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
176 return diff * align / 100; 153 return diff * align / 100;
177 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
178 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
179 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
180 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
181 return 0; 158 return 0;
182} 159}
183 160
184static inline int 161static inline int
185make_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)
… …
204{ 181{
205 bool changed = false; 182 bool changed = false;
206 int geom_flags = 0; 183 int geom_flags = 0;
207 int x = 0, y = 0; 184 int x = 0, y = 0;
208 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
209 unsigned int n;
210 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
211 const char *ops;
212 187
213 if (geom == NULL) 188 if (geom == NULL)
214 return false; 189 return false;
215 190
216 char str[256]; 191 if (geom[0])
217
218 ops = strchr (geom, ':');
219 if (ops == NULL)
220 n = strlen (geom);
221 else
222 n = ops - geom;
223
224 if (n >= sizeof (str))
225 return false;
226
227 memcpy (str, geom, n);
228 str[n] = '\0';
229 rxvt_strtrim (str);
230
231 if (str[0])
232 { 192 {
233 /* 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
234 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
235 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
236 288
237 if (!update) 289 if (!update)
238 { 290 {
239 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
240 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
249 w = h; 301 w = h;
250 302
251 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
252 } 304 }
253 305
254 if (ops)
255 {
256 char **arr = rxvt_strsplit (':', ops + 1);
257
258 for (int i = 0; arr[i]; i++)
259 {
260 if (!strcasecmp (arr[i], "tile"))
261 {
262 new_flags |= BG_TILE;
263 w = h = noScale;
264 geom_flags |= WidthValue|HeightValue;
265 }
266 else if (!strcasecmp (arr[i], "propscale"))
267 {
268 new_flags |= BG_PROP_SCALE;
269 }
270 else if (!strcasecmp (arr[i], "scale"))
271 {
272 if (h == 0) h = windowScale;
273 if (w == 0) w = windowScale;
274
275 geom_flags |= WidthValue|HeightValue;
276 }
277 else if (!strcasecmp (arr[i], "center"))
278 {
279 w = h = noScale;
280 x = y = centerAlign;
281 geom_flags |= WidthValue|HeightValue|XValue|YValue;
282 }
283 else if (!strcasecmp (arr[i], "root"))
284 {
285 new_flags |= BG_TILE|BG_ROOT_ALIGN;
286 w = h = noScale;
287 geom_flags |= WidthValue|HeightValue;
288 }
289 } /* done parsing ops */
290
291 rxvt_free_strsplit (arr);
292 }
293
294 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;
295 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;
296 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;
297 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;
298 310
… …
309rxvt_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)
310{ 322{
311 int target_width = szHint.width; 323 int target_width = szHint.width;
312 int target_height = szHint.height; 324 int target_height = szHint.height;
313 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
314 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
315 { 330 {
316 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
317 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
318 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
319 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
320 } 335 }
321 else
322 {
323 w = h_scale * target_width / 100;
324 h = v_scale * target_height / 100;
325 }
326 336
327 if (!w) w = image_width; 337 if (!w) w = image_width;
328 if (!h) h = image_height; 338 if (!h) h = image_height;
329 339
330 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
338 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
339 } 349 }
340 350
341 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
342 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
343 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
344 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
345 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
346 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
347} 357}
348 358
… …
375 } 385 }
376 386
377 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
378 { 388 {
379 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,
380 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
381 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
382 if (tmp) 392 if (tmp)
383 { 393 {
384 destroy_asimage (&background); 394 destroy_asimage (&background);
385 background = tmp; 395 background = tmp;
… …
404 414
405 if (!original_asim 415 if (!original_asim
406 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
407 && (x >= target_width 417 && (x >= target_width
408 || y >= target_height 418 || y >= target_height
409 || (x + w <= 0) 419 || x + w <= 0
410 || (y + h <= 0)))) 420 || y + h <= 0)))
411 { 421 {
412 if (background) 422 if (background)
413 { 423 {
414 new_pmap_width = background->width; 424 new_pmap_width = background->width;
415 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
429 } 439 }
430 else 440 else
431 { 441 {
432 result = original_asim; 442 result = original_asim;
433 443
434 if ((w != original_asim->width) 444 if (w != original_asim->width
435 || (h != original_asim->height)) 445 || h != original_asim->height)
436 { 446 {
437 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
438 w, h, 448 w, h,
439 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
440 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
441 } 451 }
442 452
443 if (background == NULL) 453 if (background == NULL)
444 { 454 {
… …
694 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
695 705
696 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
697 && (x >= target_width 707 && (x >= target_width
698 || y >= target_height 708 || y >= target_height
699 || (x + w <= 0) 709 || x + w <= 0
700 || (y + h <= 0))) 710 || y + h <= 0))
701 return false; 711 return false;
702 712
703 result = pixbuf; 713 result = pixbuf;
704 714
705 if ((w != image_width) 715 if (w != image_width
706 || (h != image_height)) 716 || h != image_height)
707 { 717 {
708 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
709 w, h, 719 w, h,
710 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
711 } 721 }
… …
840rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
841{ 851{
842 if (!file || !*file) 852 if (!file || !*file)
843 return false; 853 return false;
844 854
855 bool ret = false;
845 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
846 { 859 {
847 size_t len = p - file; 860 size_t len = p - file;
848 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
849 memcpy (f, file, len); 862 memcpy (f, file, len);
850 f[len] = '\0'; 863 f[len] = '\0';
… …
859 { 872 {
860 if (original_asim) 873 if (original_asim)
861 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
862 original_asim = image; 875 original_asim = image;
863 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
864 return true; 877 ret = true;
865 } 878 }
866# endif 879# endif
867 880
868# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
869 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
871 { 884 {
872 if (pixbuf) 885 if (pixbuf)
873 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
874 pixbuf = image; 887 pixbuf = image;
875 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
876 return true; 889 ret = true;
877 } 890 }
878# endif 891# endif
879 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
880 return false; 901 return ret;
881} 902}
882 903
883# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
884 905
885# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
932} 953}
933 954
934void 955void
935rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
936{ 957{
937 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
938 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
939 960
940 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
941 962
942 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1012bool 1033bool
1013rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1014{ 1035{
1015 bool ret = false; 1036 bool ret = false;
1016#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1017 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1018 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1019 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1020 1044
1021 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
… …
1094 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1095 ret = true; 1119 ret = true;
1096 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1097 } 1121 }
1098 } 1122 }
1099 else
1100 {
1101# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1102 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1103 1127
1104 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1105 tint.get (c); 1129 tint.get (c);
1106 1130
… …
1161 ret = true; 1185 ret = true;
1162 1186
1163 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1164 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1165 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1166# endif 1191# endif
1167 }
1168 1192
1169 return ret; 1193 return ret;
1170} 1194}
1171 1195
1172/* 1196/*
… …
1256 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1257 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1258 } 1282 }
1259 1283
1260 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1261 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1262 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1263 1287
1264 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1265 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1266 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1267 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1273 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1274 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1275 1299
1276 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1277 { 1301 {
1278 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1279 && (bg_flags & BG_HAS_RENDER_CONV))
1280 { 1303 {
1281 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1282 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1283 } 1306 }
1284 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1285 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1286 { 1308 {
1287 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1288 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1289 } 1311 }
1290 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1304 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1305 1327
1306 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1307} 1329}
1308# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1309
1310#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1311static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1312# endif
1313 1331
1314bool 1332bool
1315rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1316{ 1334{
1317 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1322 { 1340 {
1323 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1324 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1325 if (tr_flags == 0) 1343 if (tr_flags == 0)
1326 return false; 1344 return false;
1327 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1328 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1329 } 1346 }
1330# endif 1347# endif
1331 1348
1332# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1333 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1339# endif 1356# endif
1340 1357
1341# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1342 XImage *result = NULL; 1359 XImage *result = NULL;
1343 1360
1344 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1345 { 1362 {
1346 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);
1347 } 1364 }
1348 1365
1349 if (result) 1366 if (result)
1350 { 1367 {
1351 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1352 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1353 { 1370 if (1)
1354 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1355 if (bg_flags & BG_TINT_SET)
1356 tint.get (c);
1357 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1358 }
1359 1372
1360 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1361 1374
1362 if (gc) 1375 if (gc)
1363 { 1376 {
1364 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);
1365 1378
1366 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1367 bg_flags |= BG_IS_VALID;
1368 } 1380 }
1369 1381
1370 XDestroyImage (result); 1382 XDestroyImage (result);
1371 } 1383 }
1372# endif 1384# endif
… …
1413} 1425}
1414 1426
1415#endif /* HAVE_BG_PIXMAP */ 1427#endif /* HAVE_BG_PIXMAP */
1416 1428
1417#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1429#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1418/* taken from aterm-0.4.2 */ 1430/* based on code from aterm-0.4.2 */
1419 1431
1420static void 1432static inline void
1421shade_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)
1422{ 1446{
1423 int sh_r, sh_g, sh_b; 1447 int sh_r, sh_g, sh_b;
1424 uint32_t mask_r, mask_g, mask_b; 1448 uint32_t mask_r, mask_g, mask_b;
1425 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1426 rgba low; 1450 unsigned short low;
1427 rgba high;
1428 int i;
1429 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1451 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1430 1452
1431 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1432 1454
1433 /* for convenience */ 1455 /* for convenience */
… …
1492 break; 1514 break;
1493 default: 1515 default:
1494 return; /* we do not support this color depth */ 1516 return; /* we do not support this color depth */
1495 } 1517 }
1496 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
1497 /* prepare limits for color transformation (each channel is handled separately) */ 1524 /* prepare limits for color transformation (each channel is handled separately) */
1498 if (shade > 100) 1525 if (shade > 100)
1499 { 1526 {
1500 shade = 200 - shade;
1501
1502 high.r = c.r * shade / 100;
1503 high.g = c.g * shade / 100;
1504 high.b = c.b * shade / 100;
1505
1506 low.r = 65535 * (100 - shade) / 100; 1527 c.r = c.r * (200 - shade) / 100;
1507 low.g = 65535 * (100 - shade) / 100; 1528 c.g = c.g * (200 - shade) / 100;
1508 low.b = 65535 * (100 - shade) / 100; 1529 c.b = c.b * (200 - shade) / 100;
1530
1531 low = 0xffff * (shade - 100) / 100;
1509 } 1532 }
1510 else 1533 else
1511 { 1534 {
1512 high.r = c.r * shade / 100; 1535 c.r = c.r * shade / 100;
1513 high.g = c.g * shade / 100; 1536 c.g = c.g * shade / 100;
1514 high.b = c.b * shade / 100; 1537 c.b = c.b * shade / 100;
1515 1538
1516 low.r = low.g = low.b = 0; 1539 low = 0;
1517 } 1540 }
1518 1541
1519 /* fill our lookup tables */ 1542 /* fill our lookup tables */
1520 for (i = 0; i <= mask_r>>sh_r; i++) 1543 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1521 { 1544 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1522 uint32_t tmp; 1545 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1523 tmp = i * high.r;
1524 tmp += (mask_r>>sh_r) * low.r;
1525 lookup_r[i] = (tmp/65535)<<sh_r;
1526 }
1527 for (i = 0; i <= mask_g>>sh_g; i++)
1528 {
1529 uint32_t tmp;
1530 tmp = i * high.g;
1531 tmp += (mask_g>>sh_g) * low.g;
1532 lookup_g[i] = (tmp/65535)<<sh_g;
1533 }
1534 for (i = 0; i <= mask_b>>sh_b; i++)
1535 {
1536 uint32_t tmp;
1537 tmp = i * high.b;
1538 tmp += (mask_b>>sh_b) * low.b;
1539 lookup_b[i] = (tmp/65535)<<sh_b;
1540 }
1541 1546
1542 /* apply table to input image (replacing colors by newly calculated ones) */ 1547 /* apply table to input image (replacing colors by newly calculated ones) */
1543 if (ximage->bits_per_pixel == 32 1548 if (ximage->bits_per_pixel == 32
1544 && (ximage->depth == 24 || ximage->depth == 32) 1549 && (ximage->depth == 24 || ximage->depth == 32)
1545 && ximage->byte_order == host_byte_order) 1550 && ximage->byte_order == host_byte_order)

Diff Legend

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