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.179 by sf-exg, Sat Dec 24 09:44:10 2011 UTC vs.
Revision 1.189 by sf-exg, Thu Dec 29 16:45:22 2011 UTC

… …
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
38# if XRENDER
39static Picture
40create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
41{
42 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
43
44 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
45 XRenderPictureAttributes pa;
46 pa.repeat = True;
47 pa.component_alpha = component_alpha;
48 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
49
50 XFreePixmap (dpy, pixmap);
51
52 return mask;
53}
54# endif
55
38void 56void
39rxvt_term::bg_destroy () 57rxvt_term::bg_destroy ()
40{ 58{
41#ifdef HAVE_AFTERIMAGE 59#ifdef HAVE_AFTERIMAGE
42 if (original_asim) 60 if (original_asim)
… …
181{ 199{
182 bool changed = false; 200 bool changed = false;
183 int geom_flags = 0; 201 int geom_flags = 0;
184 int x = 0, y = 0; 202 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS; 204 unsigned long new_flags = 0;
187 205
188 if (geom == NULL) 206 if (geom == NULL)
189 return false; 207 return false;
190 208
191 if (geom[0]) 209 if (geom[0])
… …
284 } /* done parsing ops */ 302 } /* done parsing ops */
285 303
286 rxvt_free_strsplit (arr); 304 rxvt_free_strsplit (arr);
287 } 305 }
288 306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
308
289 if (!update) 309 if (!update)
290 { 310 {
291 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
292 x = y = defaultAlign; 312 x = y = defaultAlign;
293 else if (!(geom_flags & YValue)) 313 else if (!(geom_flags & YValue))
… …
372 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
373 { 393 {
374 ShadingInfo as_shade; 394 ShadingInfo as_shade;
375 as_shade.shading = shade; 395 as_shade.shading = shade;
376 396
377 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
378 if (bg_flags & BG_TINT_SET)
379 tint.get (c); 398 tint.get (c);
380 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
381 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
382 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
383 402
384 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
… …
808 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 827 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
809 828
810 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 829 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
811 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 830 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
812 831
813 pa.repeat = True; 832 Picture mask = create_xrender_mask (dpy, vt, False, False);
814 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
815 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
816 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
817 XFreePixmap (dpy, mask_pmap);
818 833
819 XRenderColor mask_c; 834 XRenderColor mask_c;
820 835
821 mask_c.alpha = 0x8000; 836 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 837 mask_c.red = 0;
… …
953} 968}
954 969
955void 970void
956rxvt_term::set_tint_shade_flags () 971rxvt_term::set_tint_shade_flags ()
957{ 972{
958 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 973 rgba c;
959 bool has_shade = shade != 100; 974 bool has_shade = shade != 100;
960 975
961 bg_flags &= ~BG_TINT_FLAGS; 976 bg_flags &= ~BG_TINT_FLAGS;
962 977
963 if (bg_flags & BG_TINT_SET)
964 {
965 tint.get (c); 978 tint.get (c);
979
966 if (!has_shade 980 if (!has_shade
967 && (c.r <= 0x00ff || c.r >= 0xff00) 981 && (c.r <= 0x00ff || c.r >= 0xff00)
968 && (c.g <= 0x00ff || c.g >= 0xff00) 982 && (c.g <= 0x00ff || c.g >= 0xff00)
969 && (c.b <= 0x00ff || c.b >= 0xff00)) 983 && (c.b <= 0x00ff || c.b >= 0xff00))
970 bg_flags |= BG_TINT_BITAND; 984 bg_flags |= BG_TINT_BITAND;
971 }
972 985
973 if (has_shade || (bg_flags & BG_TINT_SET)) 986 if (has_shade
987 || c.r < 0xff00
988 || c.g < 0xff00
989 || c.b < 0xff00)
974 bg_flags |= BG_NEEDS_TINT; 990 bg_flags |= BG_NEEDS_TINT;
975} 991}
976 992
977bool 993bool
978rxvt_term::bg_set_tint (rxvt_color &new_tint) 994rxvt_term::bg_set_tint (rxvt_color &new_tint)
979{ 995{
980 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 996 if (tint != new_tint)
981 { 997 {
982 tint = new_tint; 998 tint = new_tint;
983 bg_flags |= BG_TINT_SET;
984 set_tint_shade_flags (); 999 set_tint_shade_flags ();
985 return true; 1000 return true;
986 } 1001 }
987 1002
988 return false; 1003 return false;
989} 1004}
990 1005
991bool 1006bool
992rxvt_term::bg_set_shade (const char *shade_str) 1007rxvt_term::bg_set_shade (const char *shade_str)
993{ 1008{
994 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1009 int new_shade = atoi (shade_str);
995 1010
996 clamp_it (new_shade, -100, 200); 1011 clamp_it (new_shade, -100, 200);
997 if (new_shade < 0) 1012 if (new_shade < 0)
998 new_shade = 200 - (100 + new_shade); 1013 new_shade = 200 - (100 + new_shade);
999 1014
… …
1033bool 1048bool
1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1049rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1035{ 1050{
1036 bool ret = false; 1051 bool ret = false;
1037#if XRENDER 1052#if XRENDER
1053 if (!(bg_flags & BG_HAS_RENDER_CONV))
1054 return false;
1055
1038 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1056 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1039 double *kernel = (double *)malloc (size * sizeof (double)); 1057 double *kernel = (double *)malloc (size * sizeof (double));
1040 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1058 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1041 1059
1042 XRenderPictureAttributes pa; 1060 XRenderPictureAttributes pa;
… …
1115 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1133 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1116 ret = true; 1134 ret = true;
1117 XFreeGC (dpy, gc); 1135 XFreeGC (dpy, gc);
1118 } 1136 }
1119 } 1137 }
1120 else
1121 {
1122# if XRENDER 1138# if XRENDER
1123 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1139 else if (bg_flags & BG_HAS_RENDER)
1140 {
1141 rgba c;
1124 1142
1125 if (bg_flags & BG_TINT_SET)
1126 tint.get (c); 1143 tint.get (c);
1127 1144
1128 if (shade <= 100) 1145 if (shade <= 100)
1129 { 1146 {
1130 c.r = c.r * shade / 100; 1147 c.r = c.r * shade / 100;
1131 c.g = c.g * shade / 100; 1148 c.g = c.g * shade / 100;
… …
1136 c.r = c.r * (200 - shade) / 100; 1153 c.r = c.r * (200 - shade) / 100;
1137 c.g = c.g * (200 - shade) / 100; 1154 c.g = c.g * (200 - shade) / 100;
1138 c.b = c.b * (200 - shade) / 100; 1155 c.b = c.b * (200 - shade) / 100;
1139 } 1156 }
1140 1157
1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1158 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143 XRenderPictureAttributes pa; 1159 XRenderPictureAttributes pa;
1144 1160
1145 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1161 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1146 1162
1147 pa.repeat = True; 1163 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1148 1164
1149 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1165 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1150 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1151 XFreePixmap (dpy, overlay_pmap);
1152
1153 pa.component_alpha = True;
1154 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1155 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1156 XFreePixmap (dpy, mask_pmap);
1157 1166
1158 XRenderColor mask_c; 1167 XRenderColor mask_c;
1159 1168
1160 mask_c.alpha = 0xffff; 1169 mask_c.alpha = 0xffff;
1161 mask_c.red = 1170 mask_c.red =
… …
1182 ret = true; 1191 ret = true;
1183 1192
1184 XRenderFreePicture (dpy, mask_pic); 1193 XRenderFreePicture (dpy, mask_pic);
1185 XRenderFreePicture (dpy, overlay_pic); 1194 XRenderFreePicture (dpy, overlay_pic);
1186 XRenderFreePicture (dpy, back_pic); 1195 XRenderFreePicture (dpy, back_pic);
1196 }
1187# endif 1197# endif
1188 }
1189 1198
1190 return ret; 1199 return ret;
1191} 1200}
1192 1201
1193/* 1202/*
… …
1290 1299
1291 if (gc) 1300 if (gc)
1292 { 1301 {
1293 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1302 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1294 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1303 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1295 XFreeGC (dpy, gc);
1296 1304
1297 if (!(bg_flags & BG_CLIENT_RENDER)) 1305 if (!(bg_flags & BG_CLIENT_RENDER))
1298 { 1306 {
1299 if ((bg_flags & BG_NEEDS_BLUR) 1307 if (bg_flags & BG_NEEDS_BLUR)
1300 && (bg_flags & BG_HAS_RENDER_CONV))
1301 { 1308 {
1302 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1303 result &= ~BG_NEEDS_BLUR; 1310 result &= ~BG_NEEDS_BLUR;
1304 } 1311 }
1305 if ((bg_flags & BG_NEEDS_TINT) 1312 if (bg_flags & BG_NEEDS_TINT)
1306 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1307 { 1313 {
1308 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1309 result &= ~BG_NEEDS_TINT; 1315 result &= ~BG_NEEDS_TINT;
1310 } 1316 }
1317# ifndef HAVE_AFTERIMAGE
1318 if (result & BG_NEEDS_TINT)
1319 {
1320 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1321 if (ximage)
1322 {
1323 /* our own client-side tinting */
1324 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1325
1326 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1327 XDestroyImage (ximage);
1328 }
1329 }
1330# endif
1311 } /* server side rendering completed */ 1331 } /* server side rendering completed */
1332
1333 XFreeGC (dpy, gc);
1312 } 1334 }
1313 1335
1314 if (recoded_root_pmap != root_pixmap) 1336 if (recoded_root_pmap != root_pixmap)
1315 XFreePixmap (dpy, recoded_root_pmap); 1337 XFreePixmap (dpy, recoded_root_pmap);
1316 1338
… …
1325 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1347 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1326 1348
1327 root_pixmap = new_root_pixmap; 1349 root_pixmap = new_root_pixmap;
1328} 1350}
1329# endif /* ENABLE_TRANSPARENCY */ 1351# endif /* ENABLE_TRANSPARENCY */
1330
1331#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1332static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1333# endif
1334 1352
1335bool 1353bool
1336rxvt_term::bg_render () 1354rxvt_term::bg_render ()
1337{ 1355{
1338 unsigned long tr_flags = 0; 1356 unsigned long tr_flags = 0;
… …
1356 if (render_image (tr_flags)) 1374 if (render_image (tr_flags))
1357 bg_flags |= BG_IS_VALID; 1375 bg_flags |= BG_IS_VALID;
1358 } 1376 }
1359# endif 1377# endif
1360 1378
1361# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1362 XImage *result = NULL;
1363
1364 if (tr_flags & BG_NEEDS_TINT)
1365 {
1366 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1367 }
1368
1369 if (result)
1370 {
1371 /* our own client-side tinting */
1372 //if (tr_flags & BG_NEEDS_TINT)
1373 if (1)
1374 {
1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1376 if (bg_flags & BG_TINT_SET)
1377 tint.get (c);
1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1379 }
1380
1381 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1382
1383 if (gc)
1384 {
1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1386
1387 XFreeGC (dpy, gc);
1388 }
1389
1390 XDestroyImage (result);
1391 }
1392# endif
1393
1394 if (!(bg_flags & BG_IS_VALID)) 1379 if (!(bg_flags & BG_IS_VALID))
1395 { 1380 {
1396 if (bg_pixmap != None) 1381 if (bg_pixmap != None)
1397 { 1382 {
1398 XFreePixmap (dpy, bg_pixmap); 1383 XFreePixmap (dpy, bg_pixmap);
… …
1410 1395
1411void 1396void
1412rxvt_term::bg_init () 1397rxvt_term::bg_init ()
1413{ 1398{
1414#ifdef ENABLE_TRANSPARENCY 1399#ifdef ENABLE_TRANSPARENCY
1400 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1401 tint.set (this, c);
1415 shade = 100; 1402 shade = 100;
1416#endif 1403#endif
1417 1404
1418 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1405 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1419#if XRENDER 1406#if XRENDER
… …
1447 tmp += (mask >> sh) * low; 1434 tmp += (mask >> sh) * low;
1448 lookup[i] = (tmp / 0xffff) << sh; 1435 lookup[i] = (tmp / 0xffff) << sh;
1449 } 1436 }
1450} 1437}
1451 1438
1452static void 1439void
1453shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1440rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1454{ 1441{
1455 int sh_r, sh_g, sh_b; 1442 int sh_r, sh_g, sh_b;
1456 uint32_t mask_r, mask_g, mask_b; 1443 uint32_t mask_r, mask_g, mask_b;
1457 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1458 rgba low; 1445 unsigned short low;
1459 rgba high;
1460 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1446 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1461 1447
1462 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1448 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1463 1449
1464 /* for convenience */ 1450 /* for convenience */
… …
1523 break; 1509 break;
1524 default: 1510 default:
1525 return; /* we do not support this color depth */ 1511 return; /* we do not support this color depth */
1526 } 1512 }
1527 1513
1514 rgba c;
1515
1516 tint.get (c);
1517
1528 /* prepare limits for color transformation (each channel is handled separately) */ 1518 /* prepare limits for color transformation (each channel is handled separately) */
1529 if (shade > 100) 1519 if (shade > 100)
1530 { 1520 {
1531 shade = 200 - shade;
1532
1533 high.r = c.r * shade / 100;
1534 high.g = c.g * shade / 100;
1535 high.b = c.b * shade / 100;
1536
1537 low.r = 65535 * (100 - shade) / 100; 1521 c.r = c.r * (200 - shade) / 100;
1538 low.g = 65535 * (100 - shade) / 100; 1522 c.g = c.g * (200 - shade) / 100;
1539 low.b = 65535 * (100 - shade) / 100; 1523 c.b = c.b * (200 - shade) / 100;
1524
1525 low = 0xffff * (shade - 100) / 100;
1540 } 1526 }
1541 else 1527 else
1542 { 1528 {
1543 high.r = c.r * shade / 100; 1529 c.r = c.r * shade / 100;
1544 high.g = c.g * shade / 100; 1530 c.g = c.g * shade / 100;
1545 high.b = c.b * shade / 100; 1531 c.b = c.b * shade / 100;
1546 1532
1547 low.r = low.g = low.b = 0; 1533 low = 0;
1548 } 1534 }
1549 1535
1550 /* fill our lookup tables */ 1536 /* fill our lookup tables */
1551 fill_lut (lookup_r, mask_r, sh_r, low.r, high.r); 1537 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1552 fill_lut (lookup_g, mask_g, sh_g, low.g, high.g); 1538 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1553 fill_lut (lookup_b, mask_b, sh_b, low.b, high.b); 1539 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1554 1540
1555 /* apply table to input image (replacing colors by newly calculated ones) */ 1541 /* apply table to input image (replacing colors by newly calculated ones) */
1556 if (ximage->bits_per_pixel == 32 1542 if (ximage->bits_per_pixel == 32
1557 && (ximage->depth == 24 || ximage->depth == 32) 1543 && (ximage->depth == 24 || ximage->depth == 32)
1558 && ximage->byte_order == host_byte_order) 1544 && ximage->byte_order == host_byte_order)

Diff Legend

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