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.158 by sf-exg, Wed Aug 10 07:28:36 2011 UTC vs.
Revision 1.182 by sf-exg, Sun Dec 25 17:01:21 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], "root"))
278 {
279 new_flags |= BG_TILE|BG_ROOT_ALIGN;
280 w = h = noScale;
281 geom_flags |= WidthValue|HeightValue;
282 }
283 } /* done parsing ops */
284
285 rxvt_free_strsplit (arr);
286 }
287
288 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;
289 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;
290 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;
291 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;
292 310
… …
303rxvt_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)
304{ 322{
305 int target_width = szHint.width; 323 int target_width = szHint.width;
306 int target_height = szHint.height; 324 int target_height = szHint.height;
307 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
308 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
309 { 330 {
310 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
311 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
312 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
313 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
314 } 335 }
315 else
316 {
317 w = h_scale * target_width / 100;
318 h = v_scale * target_height / 100;
319 }
320 336
321 if (!w) w = image_width; 337 if (!w) w = image_width;
322 if (!h) h = image_height; 338 if (!h) h = image_height;
323 339
324 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
332 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
333 } 349 }
334 350
335 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
336 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
337 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
338 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
339 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
340 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
341} 357}
342 358
… …
369 } 385 }
370 386
371 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
372 { 388 {
373 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,
374 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
375 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
376 if (tmp) 392 if (tmp)
377 { 393 {
378 destroy_asimage (&background); 394 destroy_asimage (&background);
379 background = tmp; 395 background = tmp;
… …
398 414
399 if (!original_asim 415 if (!original_asim
400 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
401 && (x >= target_width 417 && (x >= target_width
402 || y >= target_height 418 || y >= target_height
403 || (x + w <= 0) 419 || x + w <= 0
404 || (y + h <= 0)))) 420 || y + h <= 0)))
405 { 421 {
406 if (background) 422 if (background)
407 { 423 {
408 new_pmap_width = background->width; 424 new_pmap_width = background->width;
409 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
423 } 439 }
424 else 440 else
425 { 441 {
426 result = original_asim; 442 result = original_asim;
427 443
428 if ((w != original_asim->width) 444 if (w != original_asim->width
429 || (h != original_asim->height)) 445 || h != original_asim->height)
430 { 446 {
431 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
432 w, h, 448 w, h,
433 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
434 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
435 } 451 }
436 452
437 if (background == NULL) 453 if (background == NULL)
438 { 454 {
… …
688 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
689 705
690 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
691 && (x >= target_width 707 && (x >= target_width
692 || y >= target_height 708 || y >= target_height
693 || (x + w <= 0) 709 || x + w <= 0
694 || (y + h <= 0))) 710 || y + h <= 0))
695 return false; 711 return false;
696 712
697 result = pixbuf; 713 result = pixbuf;
698 714
699 if ((w != image_width) 715 if (w != image_width
700 || (h != image_height)) 716 || h != image_height)
701 { 717 {
702 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
703 w, h, 719 w, h,
704 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
705 } 721 }
… …
834rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
835{ 851{
836 if (!file || !*file) 852 if (!file || !*file)
837 return false; 853 return false;
838 854
855 bool ret = false;
839 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
840 { 859 {
841 size_t len = p - file; 860 size_t len = p - file;
842 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
843 memcpy (f, file, len); 862 memcpy (f, file, len);
844 f[len] = '\0'; 863 f[len] = '\0';
… …
853 { 872 {
854 if (original_asim) 873 if (original_asim)
855 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
856 original_asim = image; 875 original_asim = image;
857 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
858 return true; 877 ret = true;
859 } 878 }
860# endif 879# endif
861 880
862# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
863 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
865 { 884 {
866 if (pixbuf) 885 if (pixbuf)
867 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
868 pixbuf = image; 887 pixbuf = image;
869 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
870 return true; 889 ret = true;
871 } 890 }
872# endif 891# endif
873 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
874 return false; 901 return ret;
875} 902}
876 903
877# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
878 905
879# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
926} 953}
927 954
928void 955void
929rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
930{ 957{
931 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
932 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
933 960
934 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
935 962
936 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1006bool 1033bool
1007rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1008{ 1035{
1009 bool ret = false; 1036 bool ret = false;
1010#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1011 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1012 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1013 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1014 1044
1015 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
… …
1088 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1089 ret = true; 1119 ret = true;
1090 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1091 } 1121 }
1092 } 1122 }
1093 else
1094 {
1095# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1096 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1097 1127
1098 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1099 tint.get (c); 1129 tint.get (c);
1100 1130
… …
1155 ret = true; 1185 ret = true;
1156 1186
1157 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1158 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1159 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1160# endif 1191# endif
1161 }
1162 1192
1163 return ret; 1193 return ret;
1164} 1194}
1165 1195
1166/* 1196/*
… …
1250 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1251 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1252 } 1282 }
1253 1283
1254 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1255 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1256 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1257 1287
1258 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1259 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1260 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1261 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1267 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1268 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1269 1299
1270 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1271 { 1301 {
1272 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1273 && (bg_flags & BG_HAS_RENDER_CONV))
1274 { 1303 {
1275 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1276 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1277 } 1306 }
1278 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1279 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1280 { 1308 {
1281 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1282 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1283 } 1311 }
1284 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1316 { 1344 {
1317 /* we need to re-generate transparency pixmap in that case ! */ 1345 /* we need to re-generate transparency pixmap in that case ! */
1318 tr_flags = make_transparency_pixmap (); 1346 tr_flags = make_transparency_pixmap ();
1319 if (tr_flags == 0) 1347 if (tr_flags == 0)
1320 return false; 1348 return false;
1321 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1322 bg_flags |= BG_IS_VALID; 1349 bg_flags |= BG_IS_VALID;
1323 } 1350 }
1324# endif 1351# endif
1325 1352
1326# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
1327 if ((bg_flags & BG_IS_FROM_FILE) 1354 if ((bg_flags & BG_IS_FROM_FILE)
… …
1333# endif 1360# endif
1334 1361
1335# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336 XImage *result = NULL; 1363 XImage *result = NULL;
1337 1364
1338 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1365 if (tr_flags & BG_NEEDS_TINT)
1339 { 1366 {
1340 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1341 } 1368 }
1342 1369
1343 if (result) 1370 if (result)
1344 { 1371 {
1345 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1346 if (tr_flags & BG_NEEDS_TINT) 1373 //if (tr_flags & BG_NEEDS_TINT)
1374 if (1)
1347 { 1375 {
1348 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1349 if (bg_flags & BG_TINT_SET) 1377 if (bg_flags & BG_TINT_SET)
1350 tint.get (c); 1378 tint.get (c);
1351 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1356 if (gc) 1384 if (gc)
1357 { 1385 {
1358 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1359 1387
1360 XFreeGC (dpy, gc); 1388 XFreeGC (dpy, gc);
1361 bg_flags |= BG_IS_VALID;
1362 } 1389 }
1363 1390
1364 XDestroyImage (result); 1391 XDestroyImage (result);
1365 } 1392 }
1366# endif 1393# endif
… …
1407} 1434}
1408 1435
1409#endif /* HAVE_BG_PIXMAP */ 1436#endif /* HAVE_BG_PIXMAP */
1410 1437
1411#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1412/* taken from aterm-0.4.2 */ 1439/* based on code from aterm-0.4.2 */
1440
1441static inline void
1442fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1443{
1444 for (int i = 0; i <= mask >> sh; i++)
1445 {
1446 uint32_t tmp;
1447 tmp = i * high;
1448 tmp += (mask >> sh) * low;
1449 lookup[i] = (tmp / 0xffff) << sh;
1450 }
1451}
1413 1452
1414static void 1453static void
1415shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1454shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1416{ 1455{
1417 int sh_r, sh_g, sh_b; 1456 int sh_r, sh_g, sh_b;
1418 uint32_t mask_r, mask_g, mask_b; 1457 uint32_t mask_r, mask_g, mask_b;
1419 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1458 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1420 rgba low; 1459 unsigned short low;
1421 rgba high; 1460 rgba high;
1422 int i;
1423 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1461 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1424 1462
1425 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1463 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1426 1464
1427 /* for convenience */ 1465 /* for convenience */
… …
1495 1533
1496 high.r = c.r * shade / 100; 1534 high.r = c.r * shade / 100;
1497 high.g = c.g * shade / 100; 1535 high.g = c.g * shade / 100;
1498 high.b = c.b * shade / 100; 1536 high.b = c.b * shade / 100;
1499 1537
1500 low.r = 65535 * (100 - shade) / 100; 1538 low = 0xffff * (100 - shade) / 100;
1501 low.g = 65535 * (100 - shade) / 100;
1502 low.b = 65535 * (100 - shade) / 100;
1503 } 1539 }
1504 else 1540 else
1505 { 1541 {
1506 high.r = c.r * shade / 100; 1542 high.r = c.r * shade / 100;
1507 high.g = c.g * shade / 100; 1543 high.g = c.g * shade / 100;
1508 high.b = c.b * shade / 100; 1544 high.b = c.b * shade / 100;
1509 1545
1510 low.r = low.g = low.b = 0; 1546 low = 0;
1511 } 1547 }
1512 1548
1513 /* fill our lookup tables */ 1549 /* fill our lookup tables */
1514 for (i = 0; i <= mask_r>>sh_r; i++) 1550 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1515 { 1551 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1516 uint32_t tmp; 1552 fill_lut (lookup_b, mask_b, sh_b, low, high.b);
1517 tmp = i * high.r;
1518 tmp += (mask_r>>sh_r) * low.r;
1519 lookup_r[i] = (tmp/65535)<<sh_r;
1520 }
1521 for (i = 0; i <= mask_g>>sh_g; i++)
1522 {
1523 uint32_t tmp;
1524 tmp = i * high.g;
1525 tmp += (mask_g>>sh_g) * low.g;
1526 lookup_g[i] = (tmp/65535)<<sh_g;
1527 }
1528 for (i = 0; i <= mask_b>>sh_b; i++)
1529 {
1530 uint32_t tmp;
1531 tmp = i * high.b;
1532 tmp += (mask_b>>sh_b) * low.b;
1533 lookup_b[i] = (tmp/65535)<<sh_b;
1534 }
1535 1553
1536 /* apply table to input image (replacing colors by newly calculated ones) */ 1554 /* apply table to input image (replacing colors by newly calculated ones) */
1537 if (ximage->bits_per_pixel == 32 1555 if (ximage->bits_per_pixel == 32
1538 && (ximage->depth == 24 || ximage->depth == 32) 1556 && (ximage->depth == 24 || ximage->depth == 32)
1539 && ximage->byte_order == host_byte_order) 1557 && ximage->byte_order == host_byte_order)

Diff Legend

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