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.175 by sf-exg, Mon Dec 5 18:17:17 2011 UTC vs.
Revision 1.187 by sf-exg, Wed Dec 28 13:13:33 2011 UTC

… …
181{ 181{
182 bool changed = false; 182 bool changed = false;
183 int geom_flags = 0; 183 int geom_flags = 0;
184 int x = 0, y = 0; 184 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS; 186 unsigned long new_flags = 0;
187 187
188 if (geom == NULL) 188 if (geom == NULL)
189 return false; 189 return false;
190 190
191 if (geom[0]) 191 if (geom[0])
… …
201 x = y = 0; 201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue; 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 } 203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 { 205 {
206 new_flags = BG_PROP_SCALE; 206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale; 207 w = h = windowScale;
208 x = y = centerAlign; 208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue; 209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 } 210 }
211 else if (!strcasecmp (arr[i], "style=stretched")) 211 else if (!strcasecmp (arr[i], "style=stretched"))
… …
227 w = h = noScale; 227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue; 228 geom_flags = WidthValue|HeightValue;
229 } 229 }
230 else if (!strcasecmp (arr[i], "op=tile")) 230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE; 231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale")) 232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_PROP_SCALE; 233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root")) 234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN; 235 new_flags |= BG_ROOT_ALIGN;
236 236
237 // deprecated 237 // deprecated
238 else if (!strcasecmp (arr[i], "tile")) 238 else if (!strcasecmp (arr[i], "tile"))
239 { 239 {
… …
241 w = h = noScale; 241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue; 242 geom_flags |= WidthValue|HeightValue;
243 } 243 }
244 else if (!strcasecmp (arr[i], "propscale")) 244 else if (!strcasecmp (arr[i], "propscale"))
245 { 245 {
246 new_flags |= BG_PROP_SCALE; 246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
247 } 249 }
248 else if (!strcasecmp (arr[i], "hscale")) 250 else if (!strcasecmp (arr[i], "hscale"))
249 { 251 {
250 new_flags |= BG_TILE; 252 new_flags |= BG_TILE;
251 w = windowScale; 253 w = windowScale;
… …
281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
282 } /* done parsing ops */ 284 } /* done parsing ops */
283 285
284 rxvt_free_strsplit (arr); 286 rxvt_free_strsplit (arr);
285 } 287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
286 290
287 if (!update) 291 if (!update)
288 { 292 {
289 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
290 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
322 int target_height = szHint.height; 326 int target_height = szHint.height;
323 327
324 w = h_scale * target_width / 100; 328 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100; 329 h = v_scale * target_height / 100;
326 330
327 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
328 { 332 {
329 float scale = (float)w / image_width; 333 float scale = (float)w / image_width;
330 min_it (scale, (float)h / image_height); 334 min_it (scale, (float)h / image_height);
331 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
332 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
… …
370 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
371 { 375 {
372 ShadingInfo as_shade; 376 ShadingInfo as_shade;
373 as_shade.shading = shade; 377 as_shade.shading = shade;
374 378
375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
376 if (bg_flags & BG_TINT_SET)
377 tint.get (c); 380 tint.get (c);
378 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
379 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
380 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
381 384
382 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
… …
951} 954}
952 955
953void 956void
954rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
955{ 958{
956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
957 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
958 961
959 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
960 963
961 if (bg_flags & BG_TINT_SET)
962 {
963 tint.get (c); 964 tint.get (c);
965
964 if (!has_shade 966 if (!has_shade
965 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
966 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
967 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
968 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
969 }
970 971
971 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
972 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
973} 977}
974 978
975bool 979bool
976rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
977{ 981{
978 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
979 { 983 {
980 tint = new_tint; 984 tint = new_tint;
981 bg_flags |= BG_TINT_SET;
982 set_tint_shade_flags (); 985 set_tint_shade_flags ();
983 return true; 986 return true;
984 } 987 }
985 988
986 return false; 989 return false;
987} 990}
988 991
989bool 992bool
990rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
991{ 994{
992 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
993 996
994 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
995 if (new_shade < 0) 998 if (new_shade < 0)
996 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
997 1000
… …
1031bool 1034bool
1032rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1033{ 1036{
1034 bool ret = false; 1037 bool ret = false;
1035#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1036 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1037 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1038 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1039 1045
1040 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
… …
1113 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1114 ret = true; 1120 ret = true;
1115 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1116 } 1122 }
1117 } 1123 }
1118 else
1119 {
1120# if XRENDER 1124# if XRENDER
1121 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1122 1128
1123 if (bg_flags & BG_TINT_SET)
1124 tint.get (c); 1129 tint.get (c);
1125 1130
1126 if (shade <= 100) 1131 if (shade <= 100)
1127 { 1132 {
1128 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1129 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1180 ret = true; 1185 ret = true;
1181 1186
1182 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1183 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1184 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1185# endif 1191# endif
1186 }
1187 1192
1188 return ret; 1193 return ret;
1189} 1194}
1190 1195
1191/* 1196/*
… …
1275 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1277 } 1282 }
1278 1283
1279 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1280 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1281 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1282 1287
1283 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1284 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1285 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1286 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1292 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1293 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1294 1299
1295 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1296 { 1301 {
1297 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1298 && (bg_flags & BG_HAS_RENDER_CONV))
1299 { 1303 {
1300 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1301 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1302 } 1306 }
1303 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1304 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1305 { 1308 {
1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1307 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1308 } 1311 }
1309 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1323 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1324 1327
1325 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1326} 1329}
1327# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1328
1329#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1330static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1331# endif
1332 1331
1333bool 1332bool
1334rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1335{ 1334{
1336 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1367 if (result) 1366 if (result)
1368 { 1367 {
1369 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1370 //if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1371 if (1) 1370 if (1)
1372 {
1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1374 if (bg_flags & BG_TINT_SET)
1375 tint.get (c);
1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1377 }
1378 1372
1379 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1380 1374
1381 if (gc) 1375 if (gc)
1382 { 1376 {
… …
1408 1402
1409void 1403void
1410rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1411{ 1405{
1412#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1413 shade = 100; 1409 shade = 100;
1414#endif 1410#endif
1415 1411
1416 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1417#if XRENDER 1413#if XRENDER
… …
1433#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1434 1430
1435#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1436/* based on code from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1437 1433
1438static void 1434static inline void
1439shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1435fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1436{
1437 for (int i = 0; i <= mask >> sh; i++)
1438 {
1439 uint32_t tmp;
1440 tmp = i * high;
1441 tmp += (mask >> sh) * low;
1442 lookup[i] = (tmp / 0xffff) << sh;
1443 }
1444}
1445
1446void
1447rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1440{ 1448{
1441 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1442 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1443 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1444 rgba low; 1452 unsigned short low;
1445 rgba high;
1446 int i;
1447 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1448 1454
1449 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1450 1456
1451 /* for convenience */ 1457 /* for convenience */
… …
1510 break; 1516 break;
1511 default: 1517 default:
1512 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1513 } 1519 }
1514 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1515 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1516 if (shade > 100) 1526 if (shade > 100)
1517 { 1527 {
1518 shade = 200 - shade;
1519
1520 high.r = c.r * shade / 100;
1521 high.g = c.g * shade / 100;
1522 high.b = c.b * shade / 100;
1523
1524 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1525 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1526 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1527 } 1533 }
1528 else 1534 else
1529 { 1535 {
1530 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1531 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1532 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1533 1539
1534 low.r = low.g = low.b = 0; 1540 low = 0;
1535 } 1541 }
1536 1542
1537 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1538 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1539 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1540 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1541 tmp = i * high.r;
1542 tmp += (mask_r>>sh_r) * low.r;
1543 lookup_r[i] = (tmp/65535)<<sh_r;
1544 }
1545 for (i = 0; i <= mask_g>>sh_g; i++)
1546 {
1547 uint32_t tmp;
1548 tmp = i * high.g;
1549 tmp += (mask_g>>sh_g) * low.g;
1550 lookup_g[i] = (tmp/65535)<<sh_g;
1551 }
1552 for (i = 0; i <= mask_b>>sh_b; i++)
1553 {
1554 uint32_t tmp;
1555 tmp = i * high.b;
1556 tmp += (mask_b>>sh_b) * low.b;
1557 lookup_b[i] = (tmp/65535)<<sh_b;
1558 }
1559 1547
1560 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1561 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1562 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1563 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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