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.183 by sf-exg, Sun Dec 25 17:05:53 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])
… …
284 } /* done parsing ops */ 284 } /* done parsing ops */
285 285
286 rxvt_free_strsplit (arr); 286 rxvt_free_strsplit (arr);
287 } 287 }
288 288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
290
289 if (!update) 291 if (!update)
290 { 292 {
291 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
292 x = y = defaultAlign; 294 x = y = defaultAlign;
293 else if (!(geom_flags & YValue)) 295 else if (!(geom_flags & YValue))
… …
372 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
373 { 375 {
374 ShadingInfo as_shade; 376 ShadingInfo as_shade;
375 as_shade.shading = shade; 377 as_shade.shading = shade;
376 378
377 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
378 if (bg_flags & BG_TINT_SET)
379 tint.get (c); 380 tint.get (c);
380 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
381 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
382 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
383 384
384 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
… …
958 rgba c; 959 rgba c;
959 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
960 961
961 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
962 963
963 if (bg_flags & BG_TINT_SET)
964 {
965 tint.get (c); 964 tint.get (c);
965
966 if (!has_shade 966 if (!has_shade
967 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
968 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
969 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
970 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
971 }
972 971
973 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
974 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
975} 977}
976 978
977bool 979bool
978rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
979{ 981{
980 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
981 { 983 {
982 tint = new_tint; 984 tint = new_tint;
983 bg_flags |= BG_TINT_SET;
984 set_tint_shade_flags (); 985 set_tint_shade_flags ();
985 return true; 986 return true;
986 } 987 }
987 988
988 return false; 989 return false;
989} 990}
990 991
991bool 992bool
992rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
993{ 994{
994 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
995 996
996 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
997 if (new_shade < 0) 998 if (new_shade < 0)
998 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
999 1000
… …
1121 } 1122 }
1122 } 1123 }
1123# if XRENDER 1124# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER) 1125 else if (bg_flags & BG_HAS_RENDER)
1125 { 1126 {
1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1127 rgba c;
1127 1128
1128 if (bg_flags & BG_TINT_SET)
1129 tint.get (c); 1129 tint.get (c);
1130 1130
1131 if (shade <= 100) 1131 if (shade <= 100)
1132 { 1132 {
1133 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1134 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1402 1402
1403void 1403void
1404rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1405{ 1405{
1406#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1407 shade = 100; 1409 shade = 100;
1408#endif 1410#endif
1409 1411
1410 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1411#if XRENDER 1413#if XRENDER
… …
1446{ 1448{
1447 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1448 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1450 unsigned short low; 1452 unsigned short low;
1451 rgba high;
1452 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1453 1454
1454 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1455 1456
1456 /* for convenience */ 1457 /* for convenience */
… …
1515 break; 1516 break;
1516 default: 1517 default:
1517 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1518 } 1519 }
1519 1520
1520 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1521 rgba c;
1521 1522
1522 if (bg_flags & BG_TINT_SET)
1523 tint.get (c); 1523 tint.get (c);
1524 1524
1525 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1526 if (shade > 100) 1526 if (shade > 100)
1527 { 1527 {
1528 high.r = c.r * (200 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1529 high.g = c.g * (200 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1530 high.b = c.b * (200 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531 1531
1532 low = 0xffff * (shade - 100) / 100; 1532 low = 0xffff * (shade - 100) / 100;
1533 } 1533 }
1534 else 1534 else
1535 { 1535 {
1536 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1537 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1538 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1539 1539
1540 low = 0; 1540 low = 0;
1541 } 1541 }
1542 1542
1543 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1544 fill_lut (lookup_r, mask_r, sh_r, low, high.r); 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1545 fill_lut (lookup_g, mask_g, sh_g, low, high.g); 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1546 fill_lut (lookup_b, mask_b, sh_b, low, high.b); 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1547 1547
1548 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1549 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1550 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1551 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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