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.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC vs.
Revision 1.183 by sf-exg, Sun Dec 25 17:05:53 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;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 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 }
229 288
230 if (!update) 289 if (!update)
231 { 290 {
232 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
242 w = h; 301 w = h;
243 302
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 304 }
246 305
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 new_flags |= BG_TILE;
306 w = windowScale;
307 h = noScale;
308 geom_flags |= WidthValue|HeightValue;
309 }
310 else if (!strcasecmp (arr[i], "vscale"))
311 {
312 new_flags |= BG_TILE;
313 h = windowScale;
314 w = noScale;
315 geom_flags |= WidthValue|HeightValue;
316 }
317 else if (!strcasecmp (arr[i], "scale"))
318 {
319 w = h = windowScale;
320 geom_flags |= WidthValue|HeightValue;
321 }
322 else if (!strcasecmp (arr[i], "auto"))
323 {
324 w = h = windowScale;
325 x = y = centerAlign;
326 geom_flags |= WidthValue|HeightValue|XValue|YValue;
327 }
328 else if (!strcasecmp (arr[i], "root"))
329 {
330 new_flags |= BG_TILE|BG_ROOT_ALIGN;
331 w = h = noScale;
332 geom_flags |= WidthValue|HeightValue;
333 }
334 } /* done parsing ops */
335
336 rxvt_free_strsplit (arr);
337 }
338
339 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;
340 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;
341 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;
342 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;
343 310
… …
354rxvt_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)
355{ 322{
356 int target_width = szHint.width; 323 int target_width = szHint.width;
357 int target_height = szHint.height; 324 int target_height = szHint.height;
358 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
359 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
360 { 330 {
361 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
362 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
363 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
364 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
365 } 335 }
366 else
367 {
368 w = h_scale * target_width / 100;
369 h = v_scale * target_height / 100;
370 }
371 336
372 if (!w) w = image_width; 337 if (!w) w = image_width;
373 if (!h) h = image_height; 338 if (!h) h = image_height;
374 339
375 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
383 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
384 } 349 }
385 350
386 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
387 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
388 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
389 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
390 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
391 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
392} 357}
393 358
… …
420 } 385 }
421 386
422 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
423 { 388 {
424 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,
425 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
426 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
427 if (tmp) 392 if (tmp)
428 { 393 {
429 destroy_asimage (&background); 394 destroy_asimage (&background);
430 background = tmp; 395 background = tmp;
… …
449 414
450 if (!original_asim 415 if (!original_asim
451 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
452 && (x >= target_width 417 && (x >= target_width
453 || y >= target_height 418 || y >= target_height
454 || (x + w <= 0) 419 || x + w <= 0
455 || (y + h <= 0)))) 420 || y + h <= 0)))
456 { 421 {
457 if (background) 422 if (background)
458 { 423 {
459 new_pmap_width = background->width; 424 new_pmap_width = background->width;
460 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
474 } 439 }
475 else 440 else
476 { 441 {
477 result = original_asim; 442 result = original_asim;
478 443
479 if ((w != original_asim->width) 444 if (w != original_asim->width
480 || (h != original_asim->height)) 445 || h != original_asim->height)
481 { 446 {
482 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
483 w, h, 448 w, h,
484 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
485 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
486 } 451 }
487 452
488 if (background == NULL) 453 if (background == NULL)
489 { 454 {
… …
739 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
740 705
741 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
742 && (x >= target_width 707 && (x >= target_width
743 || y >= target_height 708 || y >= target_height
744 || (x + w <= 0) 709 || x + w <= 0
745 || (y + h <= 0))) 710 || y + h <= 0))
746 return false; 711 return false;
747 712
748 result = pixbuf; 713 result = pixbuf;
749 714
750 if ((w != image_width) 715 if (w != image_width
751 || (h != image_height)) 716 || h != image_height)
752 { 717 {
753 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
754 w, h, 719 w, h,
755 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
756 } 721 }
… …
885rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
886{ 851{
887 if (!file || !*file) 852 if (!file || !*file)
888 return false; 853 return false;
889 854
855 bool ret = false;
890 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
891 { 859 {
892 size_t len = p - file; 860 size_t len = p - file;
893 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
894 memcpy (f, file, len); 862 memcpy (f, file, len);
895 f[len] = '\0'; 863 f[len] = '\0';
… …
904 { 872 {
905 if (original_asim) 873 if (original_asim)
906 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
907 original_asim = image; 875 original_asim = image;
908 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
909 return true; 877 ret = true;
910 } 878 }
911# endif 879# endif
912 880
913# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
914 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
916 { 884 {
917 if (pixbuf) 885 if (pixbuf)
918 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
919 pixbuf = image; 887 pixbuf = image;
920 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
921 return true; 889 ret = true;
922 } 890 }
923# endif 891# endif
924 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
925 return false; 901 return ret;
926} 902}
927 903
928# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
929 905
930# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
977} 953}
978 954
979void 955void
980rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
981{ 957{
982 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
983 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
984 960
985 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
986 962
987 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1057bool 1033bool
1058rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1059{ 1035{
1060 bool ret = false; 1036 bool ret = false;
1061#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1062 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1063 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1064 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1065 1044
1066 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
… …
1139 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1140 ret = true; 1119 ret = true;
1141 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1142 } 1121 }
1143 } 1122 }
1144 else
1145 {
1146# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1147 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1148 1127
1149 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1150 tint.get (c); 1129 tint.get (c);
1151 1130
… …
1206 ret = true; 1185 ret = true;
1207 1186
1208 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1209 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1210 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1211# endif 1191# endif
1212 }
1213 1192
1214 return ret; 1193 return ret;
1215} 1194}
1216 1195
1217/* 1196/*
… …
1301 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1302 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1303 } 1282 }
1304 1283
1305 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1306 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1307 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1308 1287
1309 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1310 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1311 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1312 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1318 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1319 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1320 1299
1321 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1322 { 1301 {
1323 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1324 && (bg_flags & BG_HAS_RENDER_CONV))
1325 { 1303 {
1326 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1327 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1328 } 1306 }
1329 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1330 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1331 { 1308 {
1332 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1333 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1334 } 1311 }
1335 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1349 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1350 1327
1351 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1352} 1329}
1353# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1354
1355#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1356static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1357# endif
1358 1331
1359bool 1332bool
1360rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1361{ 1334{
1362 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1367 { 1340 {
1368 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1369 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1370 if (tr_flags == 0) 1343 if (tr_flags == 0)
1371 return false; 1344 return false;
1372 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1373 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1374 } 1346 }
1375# endif 1347# endif
1376 1348
1377# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1378 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1384# endif 1356# endif
1385 1357
1386# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1387 XImage *result = NULL; 1359 XImage *result = NULL;
1388 1360
1389 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1390 { 1362 {
1391 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);
1392 } 1364 }
1393 1365
1394 if (result) 1366 if (result)
1395 { 1367 {
1396 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1397 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1398 { 1370 if (1)
1399 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1400 if (bg_flags & BG_TINT_SET)
1401 tint.get (c);
1402 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1403 }
1404 1372
1405 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1406 1374
1407 if (gc) 1375 if (gc)
1408 { 1376 {
1409 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);
1410 1378
1411 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1412 bg_flags |= BG_IS_VALID;
1413 } 1380 }
1414 1381
1415 XDestroyImage (result); 1382 XDestroyImage (result);
1416 } 1383 }
1417# endif 1384# endif
… …
1458} 1425}
1459 1426
1460#endif /* HAVE_BG_PIXMAP */ 1427#endif /* HAVE_BG_PIXMAP */
1461 1428
1462#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1429#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1463/* taken from aterm-0.4.2 */ 1430/* based on code from aterm-0.4.2 */
1464 1431
1465static void 1432static inline void
1466shade_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)
1467{ 1446{
1468 int sh_r, sh_g, sh_b; 1447 int sh_r, sh_g, sh_b;
1469 uint32_t mask_r, mask_g, mask_b; 1448 uint32_t mask_r, mask_g, mask_b;
1470 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1471 rgba low; 1450 unsigned short low;
1472 rgba high; 1451 rgba high;
1473 int i;
1474 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1452 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1475 1453
1476 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1454 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1477 1455
1478 /* for convenience */ 1456 /* for convenience */
… …
1537 break; 1515 break;
1538 default: 1516 default:
1539 return; /* we do not support this color depth */ 1517 return; /* we do not support this color depth */
1540 } 1518 }
1541 1519
1520 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1521
1522 if (bg_flags & BG_TINT_SET)
1523 tint.get (c);
1524
1542 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1543 if (shade > 100) 1526 if (shade > 100)
1544 { 1527 {
1545 shade = 200 - shade; 1528 high.r = c.r * (200 - shade) / 100;
1529 high.g = c.g * (200 - shade) / 100;
1530 high.b = c.b * (200 - shade) / 100;
1546 1531
1532 low = 0xffff * (shade - 100) / 100;
1533 }
1534 else
1535 {
1547 high.r = c.r * shade / 100; 1536 high.r = c.r * shade / 100;
1548 high.g = c.g * shade / 100; 1537 high.g = c.g * shade / 100;
1549 high.b = c.b * shade / 100; 1538 high.b = c.b * shade / 100;
1550 1539
1551 low.r = 65535 * (100 - shade) / 100; 1540 low = 0;
1552 low.g = 65535 * (100 - shade) / 100;
1553 low.b = 65535 * (100 - shade) / 100;
1554 }
1555 else
1556 {
1557 high.r = c.r * shade / 100;
1558 high.g = c.g * shade / 100;
1559 high.b = c.b * shade / 100;
1560
1561 low.r = low.g = low.b = 0;
1562 } 1541 }
1563 1542
1564 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1565 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1566 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1567 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, high.b);
1568 tmp = i * high.r;
1569 tmp += (mask_r>>sh_r) * low.r;
1570 lookup_r[i] = (tmp/65535)<<sh_r;
1571 }
1572 for (i = 0; i <= mask_g>>sh_g; i++)
1573 {
1574 uint32_t tmp;
1575 tmp = i * high.g;
1576 tmp += (mask_g>>sh_g) * low.g;
1577 lookup_g[i] = (tmp/65535)<<sh_g;
1578 }
1579 for (i = 0; i <= mask_b>>sh_b; i++)
1580 {
1581 uint32_t tmp;
1582 tmp = i * high.b;
1583 tmp += (mask_b>>sh_b) * low.b;
1584 lookup_b[i] = (tmp/65535)<<sh_b;
1585 }
1586 1547
1587 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1588 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1589 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1590 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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