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.106 by sf-exg, Mon Nov 1 11:37:02 2010 UTC vs.
Revision 1.120 by sf-exg, Thu Nov 18 17:29:25 2010 UTC

… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
29#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
30 38
31#if DO_TIMING_TEST 39#if DO_TIMING_TEST
32# include <sys/time.h> 40# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
58 * 66 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 70 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 71 *
82 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 74 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
168 return true; 158 return true;
169 } 159 }
170# endif 160# endif
171 161
172 return false; 162 return false;
173}; 163}
174 164
175bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
176{ 166{
177# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 168 if (original_asim)
… …
248 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
249 return src_pos; 239 return src_pos;
250} 240}
251 241
252bool 242bool
253bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 244{
245 bool changed = false;
255 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
256 int x = 0, y = 0; 247 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
258 unsigned int n; 249 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 251 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 253
263 if (geom == NULL) 254 if (geom == NULL)
264 return false; 255 return false;
265 256
266 char str[MAXLEN_GEOM]; 257 char str[MAXLEN_GEOM];
267 258
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 259 ops = strchr (geom, ':');
271 260 if (ops == NULL)
261 n = strlen (geom);
262 else
272 n = (p - geom); 263 n = ops - geom;
264
273 if (n < MAXLEN_GEOM) 265 if (n < MAXLEN_GEOM)
274 { 266 {
275 char *ops;
276 new_flags |= geometrySet;
277
278 memcpy (str, geom, n); 267 memcpy (str, geom, n);
279 str[n] = '\0'; 268 str[n] = '\0';
269 rxvt_strtrim (str);
270
280 if (str[0] == ':') 271 if (str[0])
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295
296 if (ops > str || ops == NULL)
297 { 272 {
298 /* we have geometry string - let's handle it prior to applying ops */ 273 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 274 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 275 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 276
277 if (!update)
357 { 278 {
358 /* default geometry - scaled and centered */ 279 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 280 x = y = defaultAlign;
281 else if (!(geom_flags & YValue))
282 y = x;
283
284 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 285 w = h = defaultScale;
361 } 286 else if (!(geom_flags & HeightValue))
287 h = w;
288 else if (!(geom_flags & WidthValue))
289 w = h;
362 290
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
365 293
366 if (ops) 294 if (ops)
367 { 295 {
368 while (*ops) 296 while (*ops)
369 { 297 {
… …
416 344
417 while (*ops != ':' && *ops != '\0') ++ops; 345 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 346 } /* done parsing ops */
419 } 347 }
420 348
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 349 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 350 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 351 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 352 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 } 353 }
426 354
427 if (new_flags != flags) 355 if (new_flags != flags)
428 { 356 {
429 flags = new_flags; 357 flags = new_flags;
430 changed++; 358 changed = true;
431 } 359 }
432 360
433 return (changed > 0); 361 return changed;
434} 362}
435 363
436void 364void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 365bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 366{
… …
661 if (result) 589 if (result)
662 { 590 {
663 XGCValues gcv; 591 XGCValues gcv;
664 GC gc; 592 GC gc;
665 593
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 594 /* create Pixmap */
678 if (pixmap == None) 595 if (pixmap == None
596 || pmap_width != new_pmap_width
597 || pmap_height != new_pmap_height
598 || pmap_depth != target->depth)
679 { 599 {
600 if (pixmap)
601 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 602 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 603 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 604 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 605 pmap_depth = target->depth;
684 } 606 }
… …
729 return false; 651 return false;
730 652
731 if (!pixbuf) 653 if (!pixbuf)
732 return false; 654 return false;
733 655
734#if !XRENDER
735 if (background_flags) 656 if (background_flags
657 && !(flags & HAS_RENDER))
736 return false; 658 return false;
737#endif
738 659
739 GdkPixbuf *result; 660 GdkPixbuf *result;
740 661
741 int image_width = gdk_pixbuf_get_width (pixbuf); 662 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 663 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 714 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 715 new_pmap_height = min (image_height, target_height);
795 } 716 }
796 } 717 }
797 718
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None) 719 if (pixmap == None
720 || pmap_width != new_pmap_width
721 || pmap_height != new_pmap_height
722 || pmap_depth != target->depth)
810 { 723 {
724 if (pixmap)
725 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 726 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 727 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 728 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 729 pmap_depth = target->depth;
815 } 730 }
… …
909# endif /* HAVE_PIXBUF */ 824# endif /* HAVE_PIXBUF */
910 825
911bool 826bool
912bgPixmap_t::set_file (const char *file) 827bgPixmap_t::set_file (const char *file)
913{ 828{
914 assert (file); 829 if (!file || !*file)
830 return false;
915 831
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 832 if (const char *p = strchr (file, ';'))
919 { 833 {
920 size_t len = p - file; 834 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 835 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 836 memcpy (f, file, len);
923 f[len] = '\0'; 837 f[len] = '\0';
924 file = f; 838 file = f;
925 } 839 }
926 840
927# ifdef HAVE_AFTERIMAGE 841# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 842 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 843 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 844 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 845 if (image)
932 { 846 {
933 if (original_asim) 847 if (original_asim)
934 safe_asimage_destroy (original_asim); 848 safe_asimage_destroy (original_asim);
935 original_asim = image; 849 original_asim = image;
936 have_image = true; 850 have_image = true;
937 return true; 851 return true;
938 } 852 }
939# endif 853# endif
940 854
941# ifdef HAVE_PIXBUF 855# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 856 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 857 if (image)
944 { 858 {
945 if (pixbuf) 859 if (pixbuf)
946 g_object_unref (pixbuf); 860 g_object_unref (pixbuf);
947 pixbuf = image; 861 pixbuf = image;
948 have_image = true; 862 have_image = true;
949 return true; 863 return true;
950 } 864 }
951# endif 865# endif
952 }
953 866
954 return false; 867 return false;
955} 868}
956 869
957# endif /* BG_IMAGE_FROM_FILE */ 870# endif /* BG_IMAGE_FROM_FILE */
… …
970} 883}
971 884
972bool 885bool
973bgPixmap_t::set_blur_radius (const char *geom) 886bgPixmap_t::set_blur_radius (const char *geom)
974{ 887{
975 int changed = 0; 888 bool changed = false;
976 unsigned int hr, vr; 889 unsigned int hr, vr;
977 int junk; 890 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 891 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 892
980 if (!(geom_flags & WidthValue)) 893 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 898 min_it (hr, 128);
986 min_it (vr, 128); 899 min_it (vr, 128);
987 900
988 if (h_blurRadius != hr) 901 if (h_blurRadius != hr)
989 { 902 {
990 ++changed; 903 changed = true;
991 h_blurRadius = hr; 904 h_blurRadius = hr;
992 } 905 }
993 906
994 if (v_blurRadius != vr) 907 if (v_blurRadius != vr)
995 { 908 {
996 ++changed; 909 changed = true;
997 v_blurRadius = vr; 910 v_blurRadius = vr;
998 } 911 }
999 912
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 913 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 914 flags &= ~blurNeeded;
1002 else 915 else
1003 flags |= blurNeeded; 916 flags |= blurNeeded;
1004 917
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 918 return changed;
1018} 919}
1019 920
1020static inline unsigned long 921static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 922compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 923{
… …
1041 { 942 {
1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 943 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 944 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1044 { 945 {
1045 flags |= bgPixmap_t::tintNeeded; 946 flags |= bgPixmap_t::tintNeeded;
1046 }
1047 }
1048
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XRENDER
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 } 947 }
1059 } 948 }
1060 949
1061 return flags; 950 return flags;
1062} 951}
… …
1261 1150
1262 if (mask_pic && overlay_pic && back_pic) 1151 if (mask_pic && overlay_pic && back_pic)
1263 { 1152 {
1264 XRenderColor mask_c; 1153 XRenderColor mask_c;
1265 1154
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1267 mask_c.alpha = 0xffff; 1156 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1158
1270 mask_c.alpha = 0; 1159 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1160 mask_c.red = 0xffff - c.r;
… …
1338 Pixmap recoded_root_pmap = root_pixmap; 1227 Pixmap recoded_root_pmap = root_pixmap;
1339 1228
1340 if (root_pixmap != None && root_depth != target->depth) 1229 if (root_pixmap != None && root_depth != target->depth)
1341 { 1230 {
1342#if XRENDER 1231#if XRENDER
1232 if (flags & HAS_RENDER)
1233 {
1343 XRenderPictureAttributes pa; 1234 XRenderPictureAttributes pa;
1344 1235
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1236 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1237 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347 1238
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); 1239 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1240 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1241 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351 1242
1352 if (src && dst) 1243 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1244 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1245 else
1246 {
1247 XFreePixmap (dpy, recoded_root_pmap);
1248 root_pixmap = None;
1249 }
1250
1251 XRenderFreePicture (dpy, src);
1252 XRenderFreePicture (dpy, dst);
1253 }
1354 else 1254 else
1355 { 1255#endif
1356 XFreePixmap (dpy, recoded_root_pmap);
1357 root_pixmap = None;
1358 }
1359
1360 XRenderFreePicture (dpy, src);
1361 XRenderFreePicture (dpy, dst);
1362#else
1363 root_pixmap = None; 1256 root_pixmap = None;
1364#endif
1365 } 1257 }
1366 1258
1367 if (root_pixmap == None) 1259 if (root_pixmap == None)
1368 return 0; 1260 return 0;
1369 1261
… …
1386 if (gc) 1278 if (gc)
1387 { 1279 {
1388 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1280 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1389 result |= transpPmapTiled; 1281 result |= transpPmapTiled;
1390 XFreeGC (dpy, gc); 1282 XFreeGC (dpy, gc);
1391 }
1392 1283
1393 if (tiled_root_pmap != None)
1394 {
1395 if (!need_client_side_rendering ()) 1284 if (!need_client_side_rendering ())
1396 { 1285 {
1397 if ((flags & blurNeeded) 1286 if ((flags & blurNeeded)
1398 && (flags & blurServerSide)) 1287 && (flags & HAS_RENDER_CONV))
1399 { 1288 {
1400 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1289 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1401 result |= transpPmapBlurred; 1290 result |= transpPmapBlurred;
1402 } 1291 }
1403 if ((flags & tintNeeded) 1292 if ((flags & tintNeeded)
1404 && (flags & tintServerSide)) 1293 && (flags & (tintWholesome | HAS_RENDER)))
1405 { 1294 {
1406 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1295 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1407 result |= transpPmapTinted; 1296 result |= transpPmapTinted;
1408 } 1297 }
1409 } /* server side rendering completed */ 1298 } /* server side rendering completed */
… …
1414 pixmap = tiled_root_pmap; 1303 pixmap = tiled_root_pmap;
1415 pmap_width = window_width; 1304 pmap_width = window_width;
1416 pmap_height = window_height; 1305 pmap_height = window_height;
1417 pmap_depth = target->depth; 1306 pmap_depth = target->depth;
1418 } 1307 }
1308 else
1309 XFreePixmap (dpy, tiled_root_pmap);
1419 1310
1420 if (recoded_root_pmap != root_pixmap) 1311 if (recoded_root_pmap != root_pixmap)
1421 XFreePixmap (dpy, recoded_root_pmap); 1312 XFreePixmap (dpy, recoded_root_pmap);
1422 1313
1423 return result; 1314 return result;
… …
1432 1323
1433 root_pixmap = new_root_pixmap; 1324 root_pixmap = new_root_pixmap;
1434} 1325}
1435# endif /* ENABLE_TRANSPARENCY */ 1326# endif /* ENABLE_TRANSPARENCY */
1436 1327
1437# ifndef HAVE_AFTERIMAGE 1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1438static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1329static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1439# endif 1330# endif
1440 1331
1441bool 1332bool
1442bgPixmap_t::render () 1333bgPixmap_t::render ()
1443{ 1334{
… …
1466 if (render_image (background_flags)) 1357 if (render_image (background_flags))
1467 flags = flags & ~isInvalid; 1358 flags = flags & ~isInvalid;
1468 } 1359 }
1469# endif 1360# endif
1470 1361
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1471 XImage *result = NULL; 1363 XImage *result = NULL;
1472 1364
1473 if (background_flags && (flags & isInvalid)) 1365 if (background_flags && (flags & isInvalid))
1474 { 1366 {
1475 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1476 } 1368 }
1477 1369
1478 if (result) 1370 if (result)
1479 { 1371 {
1480# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1481 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1482 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1483 { 1374 {
1484 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1485 if (flags & tintSet) 1376 if (flags & tintSet)
1486 tint.get (c); 1377 tint.get (c);
1487 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1378 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1488 } 1379 }
1489# endif
1490 1380
1491 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1492 1382
1493 if (gc) 1383 if (gc)
1494 { 1384 {
… …
1498 flags = flags & ~isInvalid; 1388 flags = flags & ~isInvalid;
1499 } 1389 }
1500 1390
1501 XDestroyImage (result); 1391 XDestroyImage (result);
1502 } 1392 }
1393# endif
1503 1394
1504 if (flags & isInvalid) 1395 if (flags & isInvalid)
1505 { 1396 {
1506 if (pixmap != None) 1397 if (pixmap != None)
1507 { 1398 {
… …
1519 1410
1520void 1411void
1521bgPixmap_t::set_target (rxvt_term *new_target) 1412bgPixmap_t::set_target (rxvt_term *new_target)
1522{ 1413{
1523 target = new_target; 1414 target = new_target;
1415
1416 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1417#if XRENDER
1418 int major, minor;
1419 if (XRenderQueryVersion (target->dpy, &major, &minor))
1420 flags |= HAS_RENDER;
1421 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1422 if (filters)
1423 {
1424 for (int i = 0; i < filters->nfilter; i++)
1425 if (!strcmp (filters->filter[i], FilterConvolution))
1426 flags |= HAS_RENDER_CONV;
1427
1428 XFree (filters);
1429 }
1430#endif
1524} 1431}
1525 1432
1526void 1433void
1527bgPixmap_t::apply () 1434bgPixmap_t::apply ()
1528{ 1435{
1529 if (target) 1436 if (target == NULL)
1530 { 1437 return;
1438
1531 if (pixmap != None) 1439 if (pixmap != None)
1532 { 1440 {
1533 /* set target's background to pixmap */ 1441 /* set target's background to pixmap */
1534# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1535 if (flags & isTransparent) 1443 if (flags & isTransparent)
1536 { 1444 {
1537 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1445 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1538 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1446 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1539 1447
1540 if (target->scrollBar.win) 1448 if (target->scrollBar.win)
1541 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1449 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1542 } 1450 }
1543 else 1451 else
1544# endif 1452# endif
1545 { 1453 {
1546 /* force old pixmap dereference in case it was transparent before :*/ 1454 /* force old pixmap dereference in case it was transparent before :*/
1547 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1548 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1549 /* do we also need to set scrollbar's background here ? */
1550
1551 if (target->scrollBar.win)
1552 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1553 }
1554 }
1555 else
1556 {
1557 /* set target background to a pixel */
1558 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1455 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1559 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1456 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1560 /* do we also need to set scrollbar's background here ? */ 1457 /* do we also need to set scrollbar's background here ? */
1458
1561 if (target->scrollBar.win) 1459 if (target->scrollBar.win)
1562 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1460 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1563 } 1461 }
1462 }
1463 else
1464 {
1465 /* set target background to a pixel */
1466 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1467 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1468 /* do we also need to set scrollbar's background here ? */
1469 if (target->scrollBar.win)
1470 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1471 }
1564 1472
1565 /* don't want Expose on the parent or vt. It is better to use 1473 /* don't want Expose on the parent or vt. It is better to use
1566 scr_touch or we get a great deal of flicker otherwise: */ 1474 scr_touch or we get a great deal of flicker otherwise: */
1567 XClearWindow (target->dpy, target->parent[0]); 1475 XClearWindow (target->dpy, target->parent[0]);
1568 1476
1569 if (target->scrollBar.state && target->scrollBar.win) 1477 if (target->scrollBar.state && target->scrollBar.win)
1570 { 1478 {
1571 target->scrollBar.state = STATE_IDLE; 1479 target->scrollBar.state = STATE_IDLE;
1572 target->scrollBar.show (0); 1480 target->scrollBar.show (0);
1573 } 1481 }
1574 1482
1575 target->want_refresh = 1; 1483 target->want_refresh = 1;
1576 flags |= hasChanged; 1484 flags |= hasChanged;
1577 }
1578} 1485}
1579 1486
1580#endif /* HAVE_BG_PIXMAP */ 1487#endif /* HAVE_BG_PIXMAP */
1581 1488
1582#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1583/* taken from aterm-0.4.2 */ 1490/* taken from aterm-0.4.2 */
1584 1491
1585static void 1492static void
1586ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1587{ 1494{
1588 int sh_r, sh_g, sh_b; 1495 int sh_r, sh_g, sh_b;
1589 uint32_t mask_r, mask_g, mask_b; 1496 uint32_t mask_r, mask_g, mask_b;
1590 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1591 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1498 rgba low;
1592 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1499 rgba high;
1593 int i; 1500 int i;
1594 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1595 1502
1596 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1597 1504
… …
1662 /* prepare limits for color transformation (each channel is handled separately) */ 1569 /* prepare limits for color transformation (each channel is handled separately) */
1663 if (shade > 100) 1570 if (shade > 100)
1664 { 1571 {
1665 shade = 200 - shade; 1572 shade = 200 - shade;
1666 1573
1667 lower_lim_r = 65535-rm; 1574 high.r = (65535 - c.r) * shade / 100;
1668 lower_lim_g = 65535-gm; 1575 high.g = (65535 - c.g) * shade / 100;
1669 lower_lim_b = 65535-bm; 1576 high.b = (65535 - c.b) * shade / 100;
1670 1577
1671 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1578 low.r = 65535 - high.r;
1672 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1579 low.g = 65535 - high.g;
1673 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1580 low.b = 65535 - high.b;
1674
1675 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1676 } 1581 }
1677 else 1582 else
1678 { 1583 {
1584 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100;
1586 high.b = c.b * shade / 100;
1679 1587
1680 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1588 low.r = low.g = low.b = 0;
1681
1682 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1683 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1684 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1685 } 1589 }
1686 1590
1687 /* fill our lookup tables */ 1591 /* fill our lookup tables */
1688 for (i = 0; i <= mask_r>>sh_r; i++) 1592 for (i = 0; i <= mask_r>>sh_r; i++)
1689 { 1593 {
1690 uint32_t tmp; 1594 uint32_t tmp;
1691 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1595 tmp = i * high.r;
1692 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1596 tmp += (mask_r>>sh_r) * low.r;
1693 lookup_r[i] = (tmp/65535)<<sh_r; 1597 lookup_r[i] = (tmp/65535)<<sh_r;
1694 } 1598 }
1695 for (i = 0; i <= mask_g>>sh_g; i++) 1599 for (i = 0; i <= mask_g>>sh_g; i++)
1696 { 1600 {
1697 uint32_t tmp; 1601 uint32_t tmp;
1698 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1602 tmp = i * high.g;
1699 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1603 tmp += (mask_g>>sh_g) * low.g;
1700 lookup_g[i] = (tmp/65535)<<sh_g; 1604 lookup_g[i] = (tmp/65535)<<sh_g;
1701 } 1605 }
1702 for (i = 0; i <= mask_b>>sh_b; i++) 1606 for (i = 0; i <= mask_b>>sh_b; i++)
1703 { 1607 {
1704 uint32_t tmp; 1608 uint32_t tmp;
1705 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1609 tmp = i * high.b;
1706 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1610 tmp += (mask_b>>sh_b) * low.b;
1707 lookup_b[i] = (tmp/65535)<<sh_b; 1611 lookup_b[i] = (tmp/65535)<<sh_b;
1708 } 1612 }
1709 1613
1710 /* apply table to input image (replacing colors by newly calculated ones) */ 1614 /* apply table to input image (replacing colors by newly calculated ones) */
1711 if (srcImage->bits_per_pixel == 32 1615 if (srcImage->bits_per_pixel == 32

Diff Legend

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