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.192 by sf-exg, Fri Dec 30 12:45:56 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);
… …
800 } 819 }
801 820
802#if XRENDER 821#if XRENDER
803 if (tr_flags) 822 if (tr_flags)
804 { 823 {
805 XRenderPictureAttributes pa;
806
807 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825
808 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
809 827
810 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
811 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 828 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
812 829
813 pa.repeat = True; 830 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 831
819 XRenderColor mask_c; 832 XRenderColor mask_c;
820 833
821 mask_c.alpha = 0x8000; 834 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 835 mask_c.red =
823 mask_c.green = 0; 836 mask_c.green =
824 mask_c.blue = 0; 837 mask_c.blue = 0;
825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839
826 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 840 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827 841
828 XRenderFreePicture (dpy, src); 842 XRenderFreePicture (dpy, src);
829 XRenderFreePicture (dpy, dst); 843 XRenderFreePicture (dpy, dst);
830 XRenderFreePicture (dpy, mask); 844 XRenderFreePicture (dpy, mask);
… …
953} 967}
954 968
955void 969void
956rxvt_term::set_tint_shade_flags () 970rxvt_term::set_tint_shade_flags ()
957{ 971{
958 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 972 rgba c;
959 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
960 974
961 bg_flags &= ~BG_TINT_FLAGS; 975 bg_flags &= ~BG_TINT_FLAGS;
962 976
963 if (bg_flags & BG_TINT_SET)
964 {
965 tint.get (c); 977 tint.get (c);
978
966 if (!has_shade 979 if (!has_shade
967 && (c.r <= 0x00ff || c.r >= 0xff00) 980 && (c.r <= 0x00ff || c.r >= 0xff00)
968 && (c.g <= 0x00ff || c.g >= 0xff00) 981 && (c.g <= 0x00ff || c.g >= 0xff00)
969 && (c.b <= 0x00ff || c.b >= 0xff00)) 982 && (c.b <= 0x00ff || c.b >= 0xff00))
970 bg_flags |= BG_TINT_BITAND; 983 bg_flags |= BG_TINT_BITAND;
971 }
972 984
973 if (has_shade || (bg_flags & BG_TINT_SET)) 985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
974 bg_flags |= BG_NEEDS_TINT; 989 bg_flags |= BG_NEEDS_TINT;
975} 990}
976 991
977bool 992bool
978rxvt_term::bg_set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
979{ 994{
980 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 995 if (tint != new_tint)
981 { 996 {
982 tint = new_tint; 997 tint = new_tint;
983 bg_flags |= BG_TINT_SET;
984 set_tint_shade_flags (); 998 set_tint_shade_flags ();
985 return true; 999 return true;
986 } 1000 }
987 1001
988 return false; 1002 return false;
989} 1003}
990 1004
991bool 1005bool
992rxvt_term::bg_set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
993{ 1007{
994 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
995 1009
996 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
997 if (new_shade < 0) 1011 if (new_shade < 0)
998 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
999 1013
… …
1033bool 1047bool
1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1035{ 1049{
1036 bool ret = false; 1050 bool ret = false;
1037#if XRENDER 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1038 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1039 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1040 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1041 1058
1042 XRenderPictureAttributes pa;
1043 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1044 1060
1045 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1046 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1047 1063
1048 if (kernel && params) 1064 if (kernel && params)
1049 { 1065 {
1050 if (h_blurRadius) 1066 if (h_blurRadius)
1051 { 1067 {
… …
1115 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1131 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1116 ret = true; 1132 ret = true;
1117 XFreeGC (dpy, gc); 1133 XFreeGC (dpy, gc);
1118 } 1134 }
1119 } 1135 }
1120 else
1121 {
1122# if XRENDER 1136# if XRENDER
1123 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1137 else if (bg_flags & BG_HAS_RENDER)
1138 {
1139 rgba c;
1124 1140
1125 if (bg_flags & BG_TINT_SET)
1126 tint.get (c); 1141 tint.get (c);
1127 1142
1128 if (shade <= 100) 1143 if (shade <= 100)
1129 { 1144 {
1130 c.r = c.r * shade / 100; 1145 c.r = c.r * shade / 100;
1131 c.g = c.g * shade / 100; 1146 c.g = c.g * shade / 100;
… …
1136 c.r = c.r * (200 - shade) / 100; 1151 c.r = c.r * (200 - shade) / 100;
1137 c.g = c.g * (200 - shade) / 100; 1152 c.g = c.g * (200 - shade) / 100;
1138 c.b = c.b * (200 - shade) / 100; 1153 c.b = c.b * (200 - shade) / 100;
1139 } 1154 }
1140 1155
1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1156 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143 XRenderPictureAttributes pa;
1144 1157
1145 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1158 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1146 1159
1147 pa.repeat = True; 1160 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1148 1161
1149 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1162 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 1163
1158 XRenderColor mask_c; 1164 XRenderColor mask_c;
1159 1165
1160 mask_c.alpha = 0xffff; 1166 mask_c.alpha = 0xffff;
1161 mask_c.red = 1167 mask_c.red =
… …
1166 mask_c.alpha = 0; 1172 mask_c.alpha = 0;
1167 mask_c.red = 0xffff - c.r; 1173 mask_c.red = 0xffff - c.r;
1168 mask_c.green = 0xffff - c.g; 1174 mask_c.green = 0xffff - c.g;
1169 mask_c.blue = 0xffff - c.b; 1175 mask_c.blue = 0xffff - c.b;
1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1177
1171 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1178 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172 1179
1173 if (shade > 100) 1180 if (shade > 100)
1174 { 1181 {
1175 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1176 mask_c.alpha = 0; 1182 mask_c.alpha = 0;
1183 mask_c.red =
1184 mask_c.green =
1185 mask_c.blue = 0xffff * (shade - 100) / 100;
1177 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1186 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1178 1187
1179 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1188 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180 } 1189 }
1181 1190
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/*
… …
1244#if XRENDER 1253#if XRENDER
1245 if (bg_flags & BG_HAS_RENDER) 1254 if (bg_flags & BG_HAS_RENDER)
1246 { 1255 {
1247 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1256 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1248 1257
1249 XRenderPictureAttributes pa;
1250
1251 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1258 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1252 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1259 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1253 1260
1254 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1261 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1255 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1262 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1256 1263
1257 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1264 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1258 1265
1259 XRenderFreePicture (dpy, src); 1266 XRenderFreePicture (dpy, src);
1260 XRenderFreePicture (dpy, dst); 1267 XRenderFreePicture (dpy, dst);
… …
1290 1297
1291 if (gc) 1298 if (gc)
1292 { 1299 {
1293 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1300 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1294 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1301 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1295 XFreeGC (dpy, gc);
1296 1302
1297 if (!(bg_flags & BG_CLIENT_RENDER)) 1303 if (!(bg_flags & BG_CLIENT_RENDER))
1298 { 1304 {
1299 if ((bg_flags & BG_NEEDS_BLUR) 1305 if (bg_flags & BG_NEEDS_BLUR)
1300 && (bg_flags & BG_HAS_RENDER_CONV))
1301 { 1306 {
1302 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1307 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1303 result &= ~BG_NEEDS_BLUR; 1308 result &= ~BG_NEEDS_BLUR;
1304 } 1309 }
1305 if ((bg_flags & BG_NEEDS_TINT) 1310 if (bg_flags & BG_NEEDS_TINT)
1306 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1307 { 1311 {
1308 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1309 result &= ~BG_NEEDS_TINT; 1313 result &= ~BG_NEEDS_TINT;
1310 } 1314 }
1315# ifndef HAVE_AFTERIMAGE
1316 if (result & BG_NEEDS_TINT)
1317 {
1318 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1319 if (ximage)
1320 {
1321 /* our own client-side tinting */
1322 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1323
1324 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1325 XDestroyImage (ximage);
1326 }
1327 }
1328# endif
1311 } /* server side rendering completed */ 1329 } /* server side rendering completed */
1330
1331 XFreeGC (dpy, gc);
1312 } 1332 }
1313 1333
1314 if (recoded_root_pmap != root_pixmap) 1334 if (recoded_root_pmap != root_pixmap)
1315 XFreePixmap (dpy, recoded_root_pmap); 1335 XFreePixmap (dpy, recoded_root_pmap);
1316 1336
… …
1325 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1345 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1326 1346
1327 root_pixmap = new_root_pixmap; 1347 root_pixmap = new_root_pixmap;
1328} 1348}
1329# endif /* ENABLE_TRANSPARENCY */ 1349# 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 1350
1335bool 1351bool
1336rxvt_term::bg_render () 1352rxvt_term::bg_render ()
1337{ 1353{
1338 unsigned long tr_flags = 0; 1354 unsigned long tr_flags = 0;
… …
1356 if (render_image (tr_flags)) 1372 if (render_image (tr_flags))
1357 bg_flags |= BG_IS_VALID; 1373 bg_flags |= BG_IS_VALID;
1358 } 1374 }
1359# endif 1375# endif
1360 1376
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)) 1377 if (!(bg_flags & BG_IS_VALID))
1395 { 1378 {
1396 if (bg_pixmap != None) 1379 if (bg_pixmap != None)
1397 { 1380 {
1398 XFreePixmap (dpy, bg_pixmap); 1381 XFreePixmap (dpy, bg_pixmap);
… …
1410 1393
1411void 1394void
1412rxvt_term::bg_init () 1395rxvt_term::bg_init ()
1413{ 1396{
1414#ifdef ENABLE_TRANSPARENCY 1397#ifdef ENABLE_TRANSPARENCY
1398 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1399 tint.set (this, c);
1415 shade = 100; 1400 shade = 100;
1416#endif 1401#endif
1417 1402
1418 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1403 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1419#if XRENDER 1404#if XRENDER
… …
1447 tmp += (mask >> sh) * low; 1432 tmp += (mask >> sh) * low;
1448 lookup[i] = (tmp / 0xffff) << sh; 1433 lookup[i] = (tmp / 0xffff) << sh;
1449 } 1434 }
1450} 1435}
1451 1436
1452static void 1437void
1453shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1438rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1454{ 1439{
1455 int sh_r, sh_g, sh_b; 1440 int sh_r, sh_g, sh_b;
1456 uint32_t mask_r, mask_g, mask_b; 1441 uint32_t mask_r, mask_g, mask_b;
1457 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1442 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1458 rgba low; 1443 unsigned short low;
1459 rgba high;
1460 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1444 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1461 1445
1462 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1463 1447
1464 /* for convenience */ 1448 /* for convenience */
… …
1523 break; 1507 break;
1524 default: 1508 default:
1525 return; /* we do not support this color depth */ 1509 return; /* we do not support this color depth */
1526 } 1510 }
1527 1511
1512 rgba c;
1513
1514 tint.get (c);
1515
1528 /* prepare limits for color transformation (each channel is handled separately) */ 1516 /* prepare limits for color transformation (each channel is handled separately) */
1529 if (shade > 100) 1517 if (shade > 100)
1530 { 1518 {
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; 1519 c.r = c.r * (200 - shade) / 100;
1538 low.g = 65535 * (100 - shade) / 100; 1520 c.g = c.g * (200 - shade) / 100;
1539 low.b = 65535 * (100 - shade) / 100; 1521 c.b = c.b * (200 - shade) / 100;
1522
1523 low = 0xffff * (shade - 100) / 100;
1540 } 1524 }
1541 else 1525 else
1542 { 1526 {
1543 high.r = c.r * shade / 100; 1527 c.r = c.r * shade / 100;
1544 high.g = c.g * shade / 100; 1528 c.g = c.g * shade / 100;
1545 high.b = c.b * shade / 100; 1529 c.b = c.b * shade / 100;
1546 1530
1547 low.r = low.g = low.b = 0; 1531 low = 0;
1548 } 1532 }
1549 1533
1550 /* fill our lookup tables */ 1534 /* fill our lookup tables */
1551 fill_lut (lookup_r, mask_r, sh_r, low.r, high.r); 1535 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1552 fill_lut (lookup_g, mask_g, sh_g, low.g, high.g); 1536 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1553 fill_lut (lookup_b, mask_b, sh_b, low.b, high.b); 1537 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1554 1538
1555 /* apply table to input image (replacing colors by newly calculated ones) */ 1539 /* apply table to input image (replacing colors by newly calculated ones) */
1556 if (ximage->bits_per_pixel == 32 1540 if (ximage->bits_per_pixel == 32
1557 && (ximage->depth == 24 || ximage->depth == 32) 1541 && (ximage->depth == 24 || ximage->depth == 32)
1558 && ximage->byte_order == host_byte_order) 1542 && ximage->byte_order == host_byte_order)

Diff Legend

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